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

Snap for 5608765 from fb28f92f71 to qt-release

Browse Source 
Change-Id: Idf0bc4808b629a5cc6b15f65bad63a7983291401
This commit is contained in:
android-build-team Robot
2019-05-28 03:07:33 +00:00
parent 967830eb5e fb28f92f71
commit a4ae4ec45a
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/drawable/ic_eject_24dp.xml
View File

@@ -17,7 +17,8 @@ Copyright (C) 2015 The Android Open Source Project
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="24.0" android:viewportWidth="24.0"
android:viewportHeight="24.0"> android:viewportHeight="24.0"
android:tint="?android:attr/colorControlNormal">
<path <path
android:fillColor="#FF000000" android:fillColor="#FF000000"
android:pathData="M5 17h14v2H5zm7,-12L5.33 15h13.34z"/> android:pathData="M5 17h14v2H5zm7,-12L5.33 15h13.34z"/>

1
src/com/android/settings/deviceinfo/StorageVolumePreference.java
View File

@@ -130,7 +130,6 @@ public class StorageVolumePreference extends Preference {
public void onBindViewHolder(PreferenceViewHolder view) { public void onBindViewHolder(PreferenceViewHolder view) {
final ImageView unmount = (ImageView) view.findViewById(R.id.unmount); final ImageView unmount = (ImageView) view.findViewById(R.id.unmount);
if (unmount != null) { if (unmount != null) {
unmount.setImageTintList(ColorStateList.valueOf(Color.parseColor("#8a000000")));
unmount.setOnClickListener(mUnmountListener); unmount.setOnClickListener(mUnmountListener);
} }

2
src/com/android/settings/wfd/WifiDisplaySettings.java
View File

@@ -136,6 +136,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem
final Context context = getActivity(); final Context context = getActivity();
mRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE); mRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE);
mRouter.setRouterGroupId(MediaRouter.MIRRORING_GROUP_ID);
mDisplayManager = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE); mDisplayManager = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
mWifiP2pManager = (WifiP2pManager) context.getSystemService(Context.WIFI_P2P_SERVICE); mWifiP2pManager = (WifiP2pManager) context.getSystemService(Context.WIFI_P2P_SERVICE);
mWifiP2pChannel = mWifiP2pManager.initialize(context, Looper.getMainLooper(), null); mWifiP2pChannel = mWifiP2pManager.initialize(context, Looper.getMainLooper(), null);
@@ -798,6 +799,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem
mContext = context; mContext = context;
mSummaryLoader = summaryLoader; mSummaryLoader = summaryLoader;
mRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE); mRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE);
mRouter.setRouterGroupId(MediaRouter.MIRRORING_GROUP_ID);
} }
@Override @Override

1
tests/robotests/assets/grandfather_slice_controller_not_in_xml
View File

@@ -1,5 +1,6 @@
com.android.settings.testutils.FakeToggleController com.android.settings.testutils.FakeToggleController
com.android.settings.testutils.FakeSliderController com.android.settings.testutils.FakeSliderController
com.android.settings.testutils.FakeInvalidSliderController
com.android.settings.core.TogglePreferenceControllerTest$FakeToggle com.android.settings.core.TogglePreferenceControllerTest$FakeToggle
com.android.settings.accessibility.AccessibilitySlicePreferenceController com.android.settings.accessibility.AccessibilitySlicePreferenceController
com.android.settings.network.telephony.MmsMessagePreferenceController com.android.settings.network.telephony.MmsMessagePreferenceController