Merge "Remove silky flag from System for official release" into sc-dev (afcb0497) · Commits · e / os / android_packages_apps_Settings

res/xml/system_dashboard_fragment.xml

+19 −23

Original line number	Diff line number	Diff line
		@@ -18,16 +18,14 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:key="system_dashboard_screen"
		android:title="@string/header_category_system"
		settings:initialExpandedChildrenCount="4">
		android:title="@string/header_category_system">

		<Preference
		android:key="language_input_settings"
		android:title="@string/language_settings"
		android:icon="@drawable/ic_settings_language"
		android:order="-260"
		android:fragment="com.android.settings.language.LanguageAndInputSettings"
		settings:controller="com.android.settings.language.LanguageAndInputPreferenceController"/>
		android:fragment="com.android.settings.language.LanguageAndInputSettings"/>

		<Preference
		android:key="gesture_settings"
		@@ -45,35 +43,33 @@
		android:fragment="com.android.settings.datetime.DateTimeSettings"
		settings:controller="com.android.settings.datetime.DateTimePreferenceController"/>

		<!-- System updates -->
		<Preference
		android:key="reset_dashboard"
		android:title="@string/reset_dashboard_title"
		android:summary="@string/reset_dashboard_summary"
		android:icon="@drawable/ic_restore"
		android:order="-50"
		android:fragment="com.android.settings.system.ResetDashboardFragment"
		settings:controller="com.android.settings.system.ResetPreferenceController"/>
		android:key="additional_system_update_settings"
		android:title="@string/additional_system_update_settings_list_item_title"
		android:order="-59"
		settings:controller="com.android.settings.system.AdditionalSystemUpdatePreferenceController">
		<intent android:action="android.intent.action.MAIN"
		android:targetPackage="@string/additional_system_update"
		android:targetClass="@string/additional_system_update_menu"/>
		</Preference>

		<!-- System updates -->
		<Preference
		android:key="system_update_settings"
		android:title="@string/system_update_settings_list_item_title"
		android:summary="@string/summary_placeholder"
		android:icon="@drawable/ic_system_update"
		android:order="-30"
		android:order="-58"
		settings:keywords="@string/keywords_system_update_settings"
		settings:controller="com.android.settings.system.SystemUpdatePreferenceController">
		<intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS"/>
		</Preference>

		<Preference
		android:key="additional_system_update_settings"
		android:title="@string/additional_system_update_settings_list_item_title"
		android:order="-31"
		settings:controller="com.android.settings.system.AdditionalSystemUpdatePreferenceController">
		<intent android:action="android.intent.action.MAIN"
		android:targetPackage="@string/additional_system_update"
		android:targetClass="@string/additional_system_update_menu"/>
		</Preference>

		android:key="reset_dashboard"
		android:title="@string/reset_dashboard_title"
		android:icon="@drawable/ic_restore"
		android:order="-30"
		android:fragment="com.android.settings.system.ResetDashboardFragment"
		settings:controller="com.android.settings.system.ResetPreferenceController"/>
		</PreferenceScreen>

res/xml/system_dashboard_fragment_v2.xml

deleted100644 → 0

+0 −75

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2021 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.
		-->

		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:key="system_dashboard_screen"
		android:title="@string/header_category_system">

		<Preference
		android:key="language_input_settings"
		android:title="@string/language_settings"
		android:icon="@drawable/ic_settings_language"
		android:order="-260"
		android:fragment="com.android.settings.language.LanguageAndInputSettings"/>

		<Preference
		android:key="gesture_settings"
		android:title="@string/gesture_preference_title"
		android:icon="@drawable/ic_settings_gestures"
		android:order="-250"
		android:fragment="com.android.settings.gestures.GestureSettings"
		settings:controller="com.android.settings.gestures.GesturesSettingPreferenceController"/>

		<Preference
		android:key="date_time_settings"
		android:title="@string/date_and_time"
		android:icon="@drawable/ic_settings_date_time"
		android:order="-240"
		android:fragment="com.android.settings.datetime.DateTimeSettings"
		settings:controller="com.android.settings.datetime.DateTimePreferenceController"/>

		<!-- System updates -->
		<Preference
		android:key="system_update_settings"
		android:title="@string/system_update_settings_list_item_title"
		android:summary="@string/summary_placeholder"
		android:icon="@drawable/ic_system_update"
		android:order="-58"
		settings:keywords="@string/keywords_system_update_settings"
		settings:controller="com.android.settings.system.SystemUpdatePreferenceController">
		<intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS"/>
		</Preference>

		<Preference
		android:key="additional_system_update_settings"
		android:title="@string/additional_system_update_settings_list_item_title"
		android:order="-59"
		settings:controller="com.android.settings.system.AdditionalSystemUpdatePreferenceController">
		<intent android:action="android.intent.action.MAIN"
		android:targetPackage="@string/additional_system_update"
		android:targetClass="@string/additional_system_update_menu"/>
		</Preference>

		<Preference
		android:key="reset_dashboard"
		android:title="@string/reset_dashboard_title"
		android:icon="@drawable/ic_restore"
		android:order="-30"
		android:fragment="com.android.settings.system.ResetDashboardFragment"
		settings:controller="com.android.settings.system.ResetPreferenceController"/>
		</PreferenceScreen>
		No newline at end of file

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

+0 −39

Original line number	Diff line number	Diff line
		@@ -16,19 +16,13 @@

		package com.android.settings.gestures;

		import android.content.ContentResolver;
		import android.content.Context;
		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;

		@@ -85,37 +79,4 @@ public class GesturesSettingPreferenceController extends BasePreferenceControlle
		controllers.add(new PreventRingingParentPreferenceController(context, FAKE_PREF_KEY));
		return controllers;
		}

		@Override
		public CharSequence getSummary() {
		if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
		return null;
		}

		if (!mFeatureProvider.isSensorAvailable(mContext)) {
		return "";
		}
		final ContentResolver contentResolver = mContext.getContentResolver();
		final boolean assistGestureEnabled = Settings.Secure.getInt(
		contentResolver, Settings.Secure.ASSIST_GESTURE_ENABLED, 1) != 0;
		final boolean assistGestureSilenceEnabled = Settings.Secure.getInt(
		contentResolver, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 1) != 0;
		final boolean sensorSupported = mFeatureProvider.isSupported(mContext);

		final CharSequence awareSummary = mAwareFeatureProvider.getGestureSummary(mContext,
		sensorSupported, assistGestureEnabled, assistGestureSilenceEnabled);
		if (!TextUtils.isEmpty(awareSummary)) {
		return awareSummary;
		}

		if (sensorSupported && assistGestureEnabled) {
		return mContext.getText(
		R.string.language_input_gesture_summary_on_with_assist);
		}
		if (assistGestureSilenceEnabled) {
		return mContext.getText(
		R.string.language_input_gesture_summary_on_non_assist);
		}
		return mContext.getText(R.string.language_input_gesture_summary_off);
		}
		}

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

+0 −15

Original line number	Diff line number	Diff line
		@@ -17,11 +17,9 @@ package com.android.settings.system;

		import android.content.Context;
		import android.os.UserManager;
		import android.util.FeatureFlagUtils;

		import com.android.settings.R;
		import com.android.settings.core.BasePreferenceController;
		import com.android.settings.core.FeatureFlags;
		import com.android.settings.network.NetworkResetPreferenceController;

		public class ResetPreferenceController extends BasePreferenceController {
		@@ -42,17 +40,4 @@ public class ResetPreferenceController extends BasePreferenceController {
		return mContext.getResources().getBoolean(R.bool.config_show_reset_dashboard)
		? AVAILABLE : UNSUPPORTED_ON_DEVICE;
		}

		@Override
		public CharSequence getSummary() {
		if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
		return null;
		}

		if (!mNetworkReset.isAvailable() && !mFactpruReset.isAvailable()) {
		return mContext.getText(R.string.reset_dashboard_summary_onlyApps);
		}

		return mContext.getText(R.string.reset_dashboard_summary);
		}
		}

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

+1 −7

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ import android.app.settings.SettingsEnums;
		import android.content.Context;
		import android.os.Bundle;
		import android.provider.SearchIndexableResource;
		import android.util.FeatureFlagUtils;

		import androidx.annotation.VisibleForTesting;
		import androidx.preference.Preference;
		@@ -27,7 +26,6 @@ import androidx.preference.PreferenceGroup;
		import androidx.preference.PreferenceScreen;

		import com.android.settings.R;
		import com.android.settings.core.FeatureFlags;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.search.BaseSearchIndexProvider;
		@@ -77,9 +75,6 @@ public class SystemDashboardFragment extends DashboardFragment {

		@Override
		protected int getPreferenceScreenResId() {
		if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
		return R.xml.system_dashboard_fragment_v2;
		}
		return R.xml.system_dashboard_fragment;
		}

		@@ -110,8 +105,7 @@ public class SystemDashboardFragment extends DashboardFragment {
		public List<SearchIndexableResource> getXmlResourcesToIndex(
		Context context, boolean enabled) {
		final SearchIndexableResource sir = new SearchIndexableResource(context);
		sir.xmlResId = FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME)
		? R.xml.system_dashboard_fragment_v2 : R.xml.system_dashboard_fragment;
		sir.xmlResId = R.xml.system_dashboard_fragment;
		return Arrays.asList(sir);
		}
		};