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

Merge "Fix action bar background not wide enough on tablets" into oc-dev

Browse Source 
am: 8cd4b4541d

Change-Id: I226818d439c7351331ff356e4bc25906a6601b9f
This commit is contained in:
Fan Zhang
2017-04-19 19:39:03 +00:00
committed by android-build-merger
parent 3acabbdee9 8cd4b4541d
commit 30dd978830
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/applications/AppHeaderController.java
View File

@@ -25,6 +25,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.ResolveInfo;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.UserHandle;
import android.support.annotation.IntDef;
@@ -217,9 +218,8 @@ public class AppHeaderController {
Log.w(TAG, "No actionbar, cannot style actionbar.");
return this;
}
final Drawable appHeaderBackground =
mAppHeader.findViewById(R.id.app_snippet).getBackground();
actionBar.setBackgroundDrawable(appHeaderBackground);
actionBar.setBackgroundDrawable(
new ColorDrawable(Utils.getColorAttr(activity, android.R.attr.colorSecondary)));
actionBar.setElevation(0);
return this;

7
tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
View File

@@ -34,7 +34,7 @@ import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageInfo;
import android.content.pm.ResolveInfo;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.ColorDrawable;
import android.os.UserHandle;
import android.support.v7.preference.Preference;
import android.view.LayoutInflater;
@@ -310,10 +310,11 @@ public class AppHeaderControllerTest {
mController.styleActionBar(mActivity);
verify(actionBar).setElevation(0);
verify(actionBar).setBackgroundDrawable(any(Drawable.class));
// Enforce a color drawable as background here, as image based drawables might not be
// wide enough to cover entire action bar.
verify(actionBar).setBackgroundDrawable(any(ColorDrawable.class));
}
@Test
public void initAppHeaderController_appHeaderNull_useFragmentContext() {
mController = new AppHeaderController(mContext, mFragment, null);