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

Apply the correct theme to DockPreference

Browse Source 
Set the preference context to apply correct theme to preference.

Bug: 110016611
Test: m -j SettingsRoboTests RunSettingsRoboTests
Change-Id: Ifb680fdc0ff40f86886f91320b4187e9873efbf4
This commit is contained in:
Ivan Chiang
2018-06-12 13:46:13 +08:00
parent a927f53f3d
commit 71ae12a1de
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
View File

@@ -76,9 +76,11 @@ public class ConnectedDeviceGroupController extends BasePreferenceController
mPreferenceGroup = (PreferenceGroup) screen.findPreference(KEY); mPreferenceGroup = (PreferenceGroup) screen.findPreference(KEY);
mPreferenceGroup.setVisible(false); mPreferenceGroup.setVisible(false);
mBluetoothDeviceUpdater.setPrefContext(screen.getContext()); final Context context = screen.getContext();
mBluetoothDeviceUpdater.setPrefContext(context);
mBluetoothDeviceUpdater.forceUpdate(); mBluetoothDeviceUpdater.forceUpdate();
mConnectedUsbDeviceUpdater.initUsbPreference(screen.getContext()); mConnectedUsbDeviceUpdater.initUsbPreference(context);
mConnectedDockUpdater.setPreferenceContext(context);
mConnectedDockUpdater.forceUpdate(); mConnectedDockUpdater.forceUpdate();
} }
} }

5
src/com/android/settings/connecteddevice/SavedDeviceGroupController.java
View File

@@ -75,8 +75,11 @@ public class SavedDeviceGroupController extends BasePreferenceController
if (isAvailable()) { if (isAvailable()) {
mPreferenceGroup = (PreferenceGroup) screen.findPreference(KEY); mPreferenceGroup = (PreferenceGroup) screen.findPreference(KEY);
mPreferenceGroup.setVisible(false); mPreferenceGroup.setVisible(false);
mBluetoothDeviceUpdater.setPrefContext(screen.getContext());
final Context context = screen.getContext();
mBluetoothDeviceUpdater.setPrefContext(context);
mBluetoothDeviceUpdater.forceUpdate(); mBluetoothDeviceUpdater.forceUpdate();
mSavedDockUpdater.setPreferenceContext(context);
mSavedDockUpdater.forceUpdate(); mSavedDockUpdater.forceUpdate();
} }
} }

7
src/com/android/settings/connecteddevice/dock/DockUpdater.java
View File

@@ -15,6 +15,7 @@
*/ */
package com.android.settings.connecteddevice.dock; package com.android.settings.connecteddevice.dock;
import android.annotation.NonNull;
import android.content.Context; import android.content.Context;
/** /**
@@ -40,4 +41,10 @@ public interface DockUpdater {
*/ */
default void forceUpdate() { default void forceUpdate() {
} }
/**
* Set the context to generate the {@link Preference}, so it could get the correct theme.
*/
default void setPreferenceContext(@NonNull Context preferenceContext) {
}
} }