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

Commit a4ae4ec4 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5608765 from fb28f92f to qt-release 

Change-Id: Idf0bc4808b629a5cc6b15f65bad63a7983291401
parents 967830eb fb28f92f

res/drawable/ic_eject_24dp.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ Copyright (C) 2015 The Android Open Source Project 
        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FF000000"

        android:pathData="M5 17h14v2H5zm7,-12L5.33 15h13.34z"/>

src/com/android/settings/deviceinfo/StorageVolumePreference.java

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ public class StorageVolumePreference extends Preference { 
    public void onBindViewHolder(PreferenceViewHolder view) {

        final ImageView unmount = (ImageView) view.findViewById(R.id.unmount);

        if (unmount != null) {

            unmount.setImageTintList(ColorStateList.valueOf(Color.parseColor("#8a000000")));

            unmount.setOnClickListener(mUnmountListener);

        }

src/com/android/settings/wfd/WifiDisplaySettings.java

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem 


        final Context context = getActivity();

        mRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE);

        mRouter.setRouterGroupId(MediaRouter.MIRRORING_GROUP_ID);

        mDisplayManager = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);

        mWifiP2pManager = (WifiP2pManager) context.getSystemService(Context.WIFI_P2P_SERVICE);

        mWifiP2pChannel = mWifiP2pManager.initialize(context, Looper.getMainLooper(), null);
@@ -798,6 +799,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem 
            mContext = context;

            mSummaryLoader = summaryLoader;

            mRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE);

            mRouter.setRouterGroupId(MediaRouter.MIRRORING_GROUP_ID);

        }



        @Override

tests/robotests/assets/grandfather_slice_controller_not_in_xml

+1 −0
Original line number Diff line number Diff line 
com.android.settings.testutils.FakeToggleController

com.android.settings.testutils.FakeSliderController

com.android.settings.testutils.FakeInvalidSliderController

com.android.settings.core.TogglePreferenceControllerTest$FakeToggle

com.android.settings.accessibility.AccessibilitySlicePreferenceController

com.android.settings.network.telephony.MmsMessagePreferenceController