[Dynamic Home] Make a new page for all top level settings

Since we are moving conditionals/suggestions to a different place, there is no need to use DashboardSummary to display top level settings any more. We can simplify a lot of code for top level settings and reduce it to a standard DashboardFragment. - Create a new DashboardFragment + xml for all top level internal items - Add a PreferenceController to provide summary for Network & internet item. - Mark a bunch of things deprecated for future work. Bug: 110405144 Test: robotests Change-Id: I9f778777131c28eb836b722e089e026a59f5ddc6
2018-08-07 18:06:39 -07:00
parent 9980096d33
commit 25d9f3812b
8 changed files with 397 additions and 5 deletions
--- a/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java
+++ b/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.content.Context;
+import android.icu.text.ListFormatter;
+import android.text.BidiFormatter;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TopLevelNetworkEntryPreferenceController extends BasePreferenceController {
+
+    private final WifiMasterSwitchPreferenceController mWifiPreferenceController;
+    private final MobileNetworkPreferenceController mMobileNetworkPreferenceController;
+    private final TetherPreferenceController mTetherPreferenceController;
+
+    public TopLevelNetworkEntryPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        mMobileNetworkPreferenceController = new MobileNetworkPreferenceController(mContext);
+        mTetherPreferenceController = new TetherPreferenceController(
+                mContext, null /* lifecycle */);
+        mWifiPreferenceController = new WifiMasterSwitchPreferenceController(
+                mContext, null /* metrics */);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE_UNSEARCHABLE;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        final String wifiSummary = BidiFormatter.getInstance()
+                .unicodeWrap(mContext.getString(R.string.wifi_settings_title));
+        final String mobileSummary = mContext.getString(
+                R.string.network_dashboard_summary_mobile);
+        final String dataUsageSummary = mContext.getString(
+                R.string.network_dashboard_summary_data_usage);
+        final String hotspotSummary = mContext.getString(
+                R.string.network_dashboard_summary_hotspot);
+
+        final List<String> summaries = new ArrayList<>();
+        if (mWifiPreferenceController.isAvailable()
+                && !TextUtils.isEmpty(wifiSummary)) {
+            summaries.add(wifiSummary);
+        }
+        if (mMobileNetworkPreferenceController.isAvailable() && !TextUtils.isEmpty(mobileSummary)) {
+            summaries.add(mobileSummary);
+        }
+        if (!TextUtils.isEmpty(dataUsageSummary)) {
+            summaries.add(dataUsageSummary);
+        }
+        if (mTetherPreferenceController.isAvailable()
+                && !TextUtils.isEmpty(hotspotSummary)) {
+            summaries.add(hotspotSummary);
+        }
+        return ListFormatter.getInstance().format(summaries);
+    }
+}