Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a7d60d1 authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Fix action bar background not wide enough on tablets" into oc-dev am: 8cd4b454 

am: 30dd9788

Change-Id: I2f63be40765bb8d2acd6c9c06809420f53eaa032
parents c109797d 30dd9788

src/com/android/settings/applications/AppHeaderController.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.Intent;

import android.content.pm.PackageInfo;

import android.content.pm.PackageInfo;

import android.content.pm.ResolveInfo;

import android.content.pm.ResolveInfo;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.os.UserHandle;

import android.os.UserHandle;

import android.support.annotation.IntDef;

import android.support.annotation.IntDef;
@@ -217,9 +218,8 @@ public class AppHeaderController { 
            Log.w(TAG, "No actionbar, cannot style actionbar.");

            Log.w(TAG, "No actionbar, cannot style actionbar.");

            return this;

            return this;

        }

        }

        final Drawable appHeaderBackground =

        actionBar.setBackgroundDrawable(

                mAppHeader.findViewById(R.id.app_snippet).getBackground();

                new ColorDrawable(Utils.getColorAttr(activity, android.R.attr.colorSecondary)));

        actionBar.setBackgroundDrawable(appHeaderBackground);

        actionBar.setElevation(0);

        actionBar.setElevation(0);





        return this;

        return this;

tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ import android.content.Intent; 
import android.content.pm.ActivityInfo;

import android.content.pm.ActivityInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageInfo;

import android.content.pm.ResolveInfo;

import android.content.pm.ResolveInfo;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.ColorDrawable;

import android.os.UserHandle;

import android.os.UserHandle;

import android.support.v7.preference.Preference;

import android.support.v7.preference.Preference;

import android.view.LayoutInflater;

import android.view.LayoutInflater;
@@ -310,10 +310,11 @@ public class AppHeaderControllerTest { 
        mController.styleActionBar(mActivity);

        mController.styleActionBar(mActivity);





        verify(actionBar).setElevation(0);

        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

    @Test

    public void initAppHeaderController_appHeaderNull_useFragmentContext() {

    public void initAppHeaderController_appHeaderNull_useFragmentContext() {

        mController = new AppHeaderController(mContext, mFragment, null);

        mController = new AppHeaderController(mContext, mFragment, null);