Merge "Handle When received intent extra in System settings need show dialog"

src/com/android/settings/aware/AwareFeatureProvider.java

@@ -18,10 +18,15 @@ package com.android.settings.aware;
 
 import android.content.Context;
 
+import androidx.fragment.app.Fragment;
+
 public interface AwareFeatureProvider {
     /** Returns true if the aware sensor is supported. */
     boolean isSupported(Context context);
 
     /** Returns true if the aware feature is enabled. */
     boolean isEnabled(Context context);
+
+    /** Show information dialog. */
+    void showRestrictionDialog(Fragment parent);
 }

src/com/android/settings/aware/AwareFeatureProviderImpl.java

@@ -18,6 +18,8 @@ package com.android.settings.aware;
 
 import android.content.Context;
 
+import androidx.fragment.app.Fragment;
+
 public class AwareFeatureProviderImpl implements AwareFeatureProvider {
     @Override
     public boolean isSupported(Context context) {
@@ -28,4 +30,8 @@ public class AwareFeatureProviderImpl implements AwareFeatureProvider {
     public boolean isEnabled(Context context) {
         return false;
     }
+
+    @Override
+    public void showRestrictionDialog(Fragment parent) {
+    }
 }

src/com/android/settings/system/SystemDashboardFragment.java

@@ -20,12 +20,14 @@ import android.content.Context;
 import android.os.Bundle;
 import android.provider.SearchIndexableResource;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settingslib.search.SearchIndexable;
@@ -40,6 +42,8 @@ public class SystemDashboardFragment extends DashboardFragment {
 
     private static final String KEY_RESET = "reset_dashboard";
 
+    public static final String EXTRA_SHOW_AWARE_DISABLED = "show_aware_dialog_disabled";
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -49,6 +53,17 @@ public class SystemDashboardFragment extends DashboardFragment {
         if (getVisiblePreferenceCount(screen) == screen.getInitialExpandedChildrenCount() + 1) {
             screen.setInitialExpandedChildrenCount(Integer.MAX_VALUE);
         }
+
+        showRestrictionDialog();
+    }
+
+    @VisibleForTesting
+    public void showRestrictionDialog() {
+        final Bundle args = getArguments();
+        if (args != null && args.getBoolean(EXTRA_SHOW_AWARE_DISABLED, false)) {
+            FeatureFactory.getFactory(getContext()).getAwareFeatureProvider()
+                    .showRestrictionDialog(this);
+        }
     }
 
     @Override