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

am: c905662743 Change-Id: Iea22293c41c88fbd9c0a20e71bcfc3972fba17c0
2017-09-02 00:46:36 +00:00
parent 2e47a32605 c905662743
commit 87ca13d446
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;
            }