From 6186c987124146d2deb14febcf5cf698829a12d8 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Wed, 27 Jan 2016 01:03:00 +0100
Subject: [PATCH] Remove broken getDrawable() call, add summary line to about

---
 .../tools/ui/AbstractAboutFragment.java       | 20 +++++++++++++++----
 .../src/main/res/layout/about_root.xml        | 14 +++++++++++--
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractAboutFragment.java b/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractAboutFragment.java
index 5e9771aa..42e0c4fc 100644
--- a/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractAboutFragment.java
+++ b/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractAboutFragment.java
@@ -22,6 +22,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -42,9 +43,7 @@ public abstract class AbstractAboutFragment extends Fragment {
     protected Drawable getIcon() {
         try {
             PackageManager pm = getContext().getPackageManager();
-            Drawable icon = pm.getPackageInfo(getContext().getPackageName(), 0).applicationInfo.loadIcon(pm);
-            if (icon == null) return getContext().getDrawable(android.R.drawable.ic_dialog_alert);
-            return icon;
+            return pm.getPackageInfo(getContext().getPackageName(), 0).applicationInfo.loadIcon(pm);
         } catch (PackageManager.NameNotFoundException e) {
             // Never happens, self package always exists!
             throw new RuntimeException(e);
@@ -73,13 +72,26 @@ public abstract class AbstractAboutFragment extends Fragment {
         }
     }
 
+    protected String getSelfVersion() {
+        return getLibVersion(getContext().getPackageName());
+    }
+
+    protected String getSummary() {
+        return null;
+    }
+
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View aboutRoot = inflater.inflate(R.layout.about_root, container, false);
         ((ImageView) aboutRoot.findViewById(android.R.id.icon)).setImageDrawable(getIcon());
         ((TextView) aboutRoot.findViewById(android.R.id.title)).setText(getAppName());
-        ((TextView) aboutRoot.findViewById(R.id.about_version)).setText(getString(R.string.about_version_str, getLibVersion(getContext().getPackageName())));
+        ((TextView) aboutRoot.findViewById(R.id.about_version)).setText(getString(R.string.about_version_str, getSelfVersion()));
+        String summary = getSummary();
+        if (summary != null) {
+            ((TextView) aboutRoot.findViewById(android.R.id.summary)).setText(summary);
+            aboutRoot.findViewById(android.R.id.summary).setVisibility(View.VISIBLE);
+        }
 
         List<Library> libraries = new ArrayList<Library>();
         libraries.add(new Library(BuildConfig.APPLICATION_ID, getString(R.string.lib_name), getString(R.string.lib_license)));
diff --git a/microg-ui-tools/src/main/res/layout/about_root.xml b/microg-ui-tools/src/main/res/layout/about_root.xml
index 1fe0c283..2dceaa79 100644
--- a/microg-ui-tools/src/main/res/layout/about_root.xml
+++ b/microg-ui-tools/src/main/res/layout/about_root.xml
@@ -31,13 +31,23 @@
 
     <TextView
         android:id="@android:id/title"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
+        android:gravity="center_horizontal"
         android:text="microG UI Demo"
         android:textAppearance="@style/TextAppearance.AppCompat.Headline"
         android:textColor="?attr/colorAccent"/>
 
+    <TextView
+        android:id="@android:id/summary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:visibility="gone"
+        android:text="Summary"
+        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+        android:textColor="?attr/colorAccent"/>
+
     <TextView
         android:id="@+id/about_version"
         android:layout_width="wrap_content"