commit fb28f92f71bed22d1438fb3c851f2415e54485b3
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 27 16:41:13 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 27 16:41:13 2019 +0000
tree 2a50f1f495885ffcf2e7a7666b5a2def237101c1
parent e30f61f73990b342a5f49253820280809bc89d13
parent 83df51ebf3dc6a327fa81cbace95a7825204badc

Merge "Fix failed test case" into qt-dev

res/drawable/ic_eject_24dp.xml

diff --git a/res/drawable/ic_eject_24dp.xml b/res/drawable/ic_eject_24dp.xml
index 1bb351a..8755ccb 100644
--- a/res/drawable/ic_eject_24dp.xml
+++ b/res/drawable/ic_eject_24dp.xml
@@ -17,7 +17,8 @@
         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

diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
index 0734c0b..6294ab9 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -130,7 +130,6 @@
     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

diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index 2698bf4..981f927 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -136,6 +136,7 @@
 
         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 @@
             mContext = context;
             mSummaryLoader = summaryLoader;
             mRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE);
+            mRouter.setRouterGroupId(MediaRouter.MIRRORING_GROUP_ID);
         }
 
         @Override