Snap for 5608768 from 08b3d016f4
to qt-c2f2-release
Change-Id: Ia4f932bd9804783e65ec5a707688c574d39d706f
This commit is contained in:
@@ -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"/>
|
||||
|
@@ -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);
|
||||
}
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user