From be3b50a8f1691fb3ec681a009b9e778a04833396 Mon Sep 17 00:00:00 2001 From: Kyunglyul Hyun Date: Fri, 24 May 2019 17:48:54 +0900 Subject: [PATCH 1/3] Set media router group id to sync cast status Using media router group id, Settings can sync cast status with Settings. If Settings begins/stops cast (mirrorring), CastTile can know that and Settings also knows when CastTile begins cast. Please refer ag/7669852 to how router group id can be used to synchronize cast status. Bug: 112826114 Bug: 131385091 Bug: 130345243 Test: Manually tested after applying ag/7704172 and this. Change-Id: I78c3c6163e1352b3a8d0801890064369a861fb8a --- src/com/android/settings/wfd/WifiDisplaySettings.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index 2698bf4c03a..981f927ee09 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -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 From 83df51ebf3dc6a327fa81cbace95a7825204badc Mon Sep 17 00:00:00 2001 From: Raff Tsai Date: Mon, 27 May 2019 09:33:02 +0800 Subject: [PATCH 2/3] Fix failed test case Fixes: 133629032 Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.core" Change-Id: I4baf0582a528e3601ca132c15e5078bc0159a352 --- tests/robotests/assets/grandfather_slice_controller_not_in_xml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/robotests/assets/grandfather_slice_controller_not_in_xml b/tests/robotests/assets/grandfather_slice_controller_not_in_xml index 4bc43391fdd..328c7bc35c7 100644 --- a/tests/robotests/assets/grandfather_slice_controller_not_in_xml +++ b/tests/robotests/assets/grandfather_slice_controller_not_in_xml @@ -1,5 +1,6 @@ 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 From e30f61f73990b342a5f49253820280809bc89d13 Mon Sep 17 00:00:00 2001 From: Raff Tsai Date: Mon, 27 May 2019 18:32:35 +0800 Subject: [PATCH 3/3] Fix icon color in dark mode Fixes: 133651524 Test: visual Change-Id: Ic6f05dc491ad1d49b5cc81e294bf91271420d8e2 --- res/drawable/ic_eject_24dp.xml | 3 ++- .../android/settings/deviceinfo/StorageVolumePreference.java | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/drawable/ic_eject_24dp.xml b/res/drawable/ic_eject_24dp.xml index 1bb351a5760..8755ccb4d05 100644 --- a/res/drawable/ic_eject_24dp.xml +++ b/res/drawable/ic_eject_24dp.xml @@ -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"> diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java index 0734c0b66ad..6294ab90a14 100644 --- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java +++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java @@ -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); }