commit 3d1f6abd6fe74d8f6239c630c3896cb6cff7ed6b
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Sep 02 03:29:52 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Sep 02 03:29:52 2017 +0000
tree 03152cbe4343299ac4893e43df91b01864a509e2
parent 5fe8e76b362e367fd5abd9dd6f49b088a900b7fd
parent 9be0ce09c9b3eb2e2d0bac038a3f469f087af652

Merge "Make photos/videos storage preference normal." into oc-mr1-dev

src/com/android/settings/widget/EntityHeaderController.java

diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java
index 70b040d..c38ad02 100644
--- a/src/com/android/settings/widget/EntityHeaderController.java
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -336,6 +336,7 @@
                 final Intent intent = resolveIntent(
                         new Intent(Intent.ACTION_APPLICATION_PREFERENCES).setPackage(mPackageName));
                 if (intent == null) {
+                    button.setImageDrawable(null);
                     button.setVisibility(View.GONE);
                     return;
                 }
@@ -348,6 +349,7 @@
                         mFragment.startActivity(intent);
                     }
                 });
+                button.setImageResource(R.drawable.ic_settings_24dp);
                 button.setVisibility(View.VISIBLE);
                 return;
             }

tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
index fc6071e..9c6ee45 100644
--- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.widget;
 
-
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.Fragment;
@@ -30,6 +29,7 @@
 import android.support.v7.preference.Preference;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.ImageButton;
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto;
@@ -148,8 +148,9 @@
                 EntityHeaderController.ActionType.ACTION_NONE);
         mController.done(mActivity);
 
-        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
-                .isEqualTo(View.VISIBLE);
+        final ImageButton button1 = appLinks.findViewById(android.R.id.button1);
+        assertThat(button1.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(button1.getDrawable()).isNotNull();
         assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
                 .isEqualTo(View.GONE);
         try {
@@ -176,8 +177,9 @@
                 EntityHeaderController.ActionType.ACTION_NONE);
         mController.done(mActivity);
 
-        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
-                .isEqualTo(View.GONE);
+        final ImageButton button1 = appLinks.findViewById(android.R.id.button1);
+        assertThat(button1.getVisibility()).isEqualTo(View.GONE);
+        assertThat(button1.getDrawable()).isNull();
         assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
                 .isEqualTo(View.GONE);
     }