commit bd0dd5d886df52cf251ffeaf8e81381a00dcb195
author Edgar Wang <edgarwang@google.com> Fri Jan 29 03:01:28 2021 +0800
committer Edgar Wang <edgarwang@google.com> Fri Jan 29 12:10:58 2021 +0000
tree fa3d795a52cd6d71114bf7d0392824137db0e36f
parent 3b414eb10b57907c35b05016f70f30cfd2ae60d9

Rearrange System settings

- Fork system_dashboard_fragment_v2 for dev.
- Reorder the preference
- Remove summary

Bug: 174965365
Test: manual & robotest
Change-Id: Icc994f3b2e38ad54958deb5c9f80b6cd085029f0

src/com/android/settings/gestures/GesturesSettingPreferenceController.java

diff --git a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
index 9d4d538..e01bc88 100644
--- a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
+++ b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
@@ -21,12 +21,14 @@
 import android.hardware.display.AmbientDisplayConfiguration;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
 
 import androidx.annotation.NonNull;
 
 import com.android.settings.R;
 import com.android.settings.aware.AwareFeatureProvider;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.AbstractPreferenceController;
 
@@ -86,6 +88,10 @@
 
     @Override
     public CharSequence getSummary() {
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            return null;
+        }
+
         if (!mFeatureProvider.isSensorAvailable(mContext)) {
             return "";
         }