Merge "Remove on/off subtext from gesture preferencecontrollers" into qt-dev (f6f4ae6e) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -5697,6 +5697,9 @@
		<!-- Battery saver: Title for battery saver schedule screen [CHAR_LIMIT=40] -->
		<string name="battery_saver_schedule_settings_title">Set a schedule</string>

		<!-- Battery saver: Summary text displayed below "Turn on" button for battery saver [CHAR_LIMIT=40] -->
		<string name="battery_saver_turn_on_summary">Extend battery life</string>

		<!-- Battery Saver: Title for sticky battery saver preference [CHAR_LIMIT=60] -->
		<string name="battery_saver_sticky_title_new">Turn off when fully charged</string>

res/xml/battery_saver_settings.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@
		android:key="battery_saver"
		android:title="@string/battery_saver"
		android:selectable="false"
		android:summary="@string/battery_saver_turn_on_summary"
		settings:textOn="@string/battery_saver_button_turn_on"
		settings:textOff="@string/battery_saver_button_turn_off"
		settings:platform_slice="true"

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -33,13 +33,11 @@ public class DoubleTapPowerPreferenceController extends GesturePreferenceControl
		static final int OFF = 1;

		private static final String PREF_KEY_VIDEO = "gesture_double_tap_power_video";
		private final String mDoubleTapPowerKey;

		private final String SECURE_KEY = CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;

		public DoubleTapPowerPreferenceController(Context context, String key) {
		super(context, key);
		mDoubleTapPowerKey = key;
		}

		public static boolean isSuggestionComplete(Context context, SharedPreferences prefs) {

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import androidx.annotation.VisibleForTesting;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;

		import com.android.settings.R;
		import com.android.settings.core.TogglePreferenceController;
		import com.android.settings.widget.VideoPreference;
		import com.android.settingslib.core.lifecycle.LifecycleObserver;
		@@ -64,12 +63,6 @@ public abstract class GesturePreferenceController extends TogglePreferenceContro
		}
		}

		@Override
		public CharSequence getSummary() {
		return mContext.getText(
		isChecked() ? R.string.gesture_setting_on : R.string.gesture_setting_off);
		}

		@Override
		public void onCreate(Bundle savedInstanceState) {
		if (savedInstanceState != null) {

src/com/android/settings/slices/SliceBuilderUtils.java

+9 −20

Original line number	Diff line number	Diff line
		@@ -189,39 +189,28 @@ public class SliceBuilderUtils {
		*/
		public static CharSequence getSubtitleText(Context context,
		BasePreferenceController controller, SliceData sliceData) {
		final boolean isDynamicSummaryAllowed = controller.useDynamicSliceSummary();
		CharSequence summaryText = controller.getSummary();

		// Priority 1 : User prefers showing the dynamic summary in slice view rather than static
		// summary. Note it doesn't require a valid summary - so we can force some slices to have
		// empty summaries (ex: volume).
		if (isDynamicSummaryAllowed) {
		return summaryText;
		}

		// Priority 2 : Show screen title.
		summaryText = sliceData.getScreenTitle();
		if (isValidSummary(context, summaryText) && !TextUtils.equals(summaryText,
		sliceData.getTitle())) {
		return summaryText;
		if (controller.useDynamicSliceSummary()) {
		return controller.getSummary();
		}

		// Priority 3 : Show dynamic summary from preference controller.
		if (controller != null) {
		summaryText = controller.getSummary();

		// Priority 2: Show summary from slice data.
		CharSequence summaryText = sliceData.getSummary();
		if (isValidSummary(context, summaryText)) {
		return summaryText;
		}
		}

		// Priority 4 : Show summary from slice data.
		summaryText = sliceData.getSummary();
		if (isValidSummary(context, summaryText)) {
		// Priority 3: Show screen title.
		summaryText = sliceData.getScreenTitle();
		if (isValidSummary(context, summaryText) && !TextUtils.equals(summaryText,
		sliceData.getTitle())) {
		return summaryText;
		}

		// Priority 5 : Show empty text.
		// Priority 4: Show empty text.
		return "";
		}