Merge "Set drawable for the entity header app preference button." into oc-mr1-dev

am: 5fe8e76b36 Change-Id: I02625057fd4636f8ce61d5772f7ce4083fb7f81f
2017-09-02 00:41:28 +00:00
parent d3e0d745a8 5fe8e76b36
commit c905662743
2 changed files with 9 additions and 5 deletions
--- a/src/com/android/settings/widget/EntityHeaderController.java
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -336,6 +336,7 @@ public class EntityHeaderController {
                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 @@ public class EntityHeaderController {
                        mFragment.startActivity(intent);
                    }
                });
+                button.setImageResource(R.drawable.ic_settings_24dp);
                button.setVisibility(View.VISIBLE);
                return;
            }