PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: c905662743

Change-Id: Iea22293c41c88fbd9c0a20e71bcfc3972fba17c0
This commit is contained in:
Doris Ling
2017-09-02 00:46:36 +00:00
committed by android-build-merger
parent 2e47a32605 c905662743
commit 87ca13d446
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/widget/EntityHeaderController.java
View File

@@ -336,6 +336,7 @@ public class EntityHeaderController {
final Intent intent = resolveIntent( final Intent intent = resolveIntent(
new Intent(Intent.ACTION_APPLICATION_PREFERENCES).setPackage(mPackageName)); new Intent(Intent.ACTION_APPLICATION_PREFERENCES).setPackage(mPackageName));
if (intent == null) { if (intent == null) {
button.setImageDrawable(null);
button.setVisibility(View.GONE); button.setVisibility(View.GONE);
return; return;
} }
@@ -348,6 +349,7 @@ public class EntityHeaderController {
mFragment.startActivity(intent); mFragment.startActivity(intent);
} }
}); });
button.setImageResource(R.drawable.ic_settings_24dp);
button.setVisibility(View.VISIBLE); button.setVisibility(View.VISIBLE);
return; return;
} }

12
tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.widget; package com.android.settings.widget;
import android.app.ActionBar; import android.app.ActionBar;
import android.app.Activity; import android.app.Activity;
import android.app.Fragment; import android.app.Fragment;
@@ -30,6 +29,7 @@ import android.os.UserHandle;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.ImageButton;
import android.widget.TextView; import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
@@ -148,8 +148,9 @@ public class EntityHeaderControllerTest {
EntityHeaderController.ActionType.ACTION_NONE); EntityHeaderController.ActionType.ACTION_NONE);
mController.done(mActivity); mController.done(mActivity);
assertThat(appLinks.findViewById(android.R.id.button1).getVisibility()) final ImageButton button1 = appLinks.findViewById(android.R.id.button1);
.isEqualTo(View.VISIBLE); assertThat(button1.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(button1.getDrawable()).isNotNull();
assertThat(appLinks.findViewById(android.R.id.button2).getVisibility()) assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
.isEqualTo(View.GONE); .isEqualTo(View.GONE);
try { try {
@@ -176,8 +177,9 @@ public class EntityHeaderControllerTest {
EntityHeaderController.ActionType.ACTION_NONE); EntityHeaderController.ActionType.ACTION_NONE);
mController.done(mActivity); mController.done(mActivity);
assertThat(appLinks.findViewById(android.R.id.button1).getVisibility()) final ImageButton button1 = appLinks.findViewById(android.R.id.button1);
.isEqualTo(View.GONE); assertThat(button1.getVisibility()).isEqualTo(View.GONE);
assertThat(button1.getDrawable()).isNull();
assertThat(appLinks.findViewById(android.R.id.button2).getVisibility()) assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
.isEqualTo(View.GONE); .isEqualTo(View.GONE);
} }