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

Add feature flag for connected device

Browse Source 
Add feature flag to toggle connected device between new and old
feature.

ConnectedDeviceDashboardFragment will contain new feature will
ConnectedDeviceDashboardFragment2 will hold old feature.

Bug: 69333961
Test: Build
Change-Id: I0ea932c69dea5242129aab994d5142b1f87fbea0
This commit is contained in:
jackqdyulei
2017-11-17 14:14:51 -08:00
parent 65ec66e394
commit 76ba0f72e4
13 changed files with 297 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/SettingsActivity.java
View File

@@ -789,6 +789,21 @@ public class SettingsActivity extends SettingsDrawerActivity
Utils.isBandwidthControlEnabled() /* enabled */,
isAdmin) || somethingChanged;
final boolean isConnectedDeviceV2Enabled =
Settings.ConnectedDeviceDashboardActivity.isEnabled();
// Enable new connected page if v2 enabled
somethingChanged = setTileEnabled(
new ComponentName(packageName,
Settings.ConnectedDeviceDashboardActivity.class.getName()),
isConnectedDeviceV2Enabled && !UserManager.isDeviceInDemoMode(this) /* enabled */,
isAdmin) || somethingChanged;
// Enable old connected page if v2 disabled
somethingChanged = setTileEnabled(
new ComponentName(packageName,
Settings.ConnectedDeviceDashboardActivityOld.class.getName()),
!isConnectedDeviceV2Enabled && !UserManager.isDeviceInDemoMode(this) /* enabled */,
isAdmin) || somethingChanged;
somethingChanged = setTileEnabled(new ComponentName(packageName,
Settings.SimSettingsActivity.class.getName()),
Utils.showSimCardTile(this), isAdmin)
@@ -809,11 +824,6 @@ public class SettingsActivity extends SettingsDrawerActivity
!UserManager.isDeviceInDemoMode(this), isAdmin)
|| somethingChanged;
somethingChanged = setTileEnabled(new ComponentName(packageName,
Settings.ConnectedDeviceDashboardActivity.class.getName()),
!UserManager.isDeviceInDemoMode(this), isAdmin)
|| somethingChanged;
somethingChanged = setTileEnabled(new ComponentName(packageName,
Settings.DateTimeSettingsActivity.class.getName()),
!UserManager.isDeviceInDemoMode(this), isAdmin)