commit 76ba0f72e4828523690e4994bb02bc8201751eb8
author jackqdyulei <jackqdyulei@google.com> Fri Nov 17 14:14:51 2017 -0800
committer jackqdyulei <jackqdyulei@google.com> Mon Nov 20 15:29:28 2017 -0800
tree d91353b4cd89b2ba79846c3554380c1848c9d703
parent 65ec66e3948ed1bd551e1cf744a260c5b252cb9e

Add feature flag for connected device

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

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 78c9c21..60d16ff 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -789,6 +789,21 @@
                 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)
@@ -810,11 +825,6 @@
                 || 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)
                 || somethingChanged;