Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee208687 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge "Remove "Device Controls" from Settings" into sc-dev

parents 2f9b5b6a 6e8286fb
Loading
Loading
Loading
Loading
+0 −11
Original line number Diff line number Diff line
@@ -3688,17 +3688,6 @@
                       android:value="com.android.settings.gestures.PowerMenuSettings" />
        </activity>

        <activity android:name="Settings$DeviceControlsSettingsActivity"
                      android:exported="true"
                      android:label="@string/device_controls_sentence">
            <intent-filter>
                <action android:name="android.settings.ACTION_DEVICE_CONTROLS_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                       android:value="com.android.settings.gestures.DeviceControlsSettings" />
        </activity>

        <activity
            android:name="Settings$GestureNavigationSettingsActivity"
            android:label="@string/gesture_settings_activity_title"
+0 −0

Empty file deleted.

+0 −9
Original line number Diff line number Diff line
@@ -12863,9 +12863,6 @@
    <!-- Developer settings: text for the bug report handler selection toast shown if an invalid bug report handler was chosen. [CHAR LIMIT=NONE] -->
    <string name="select_invalid_bug_report_handler_toast_text">This choice is no longer valid. Try again.</string>
    <!-- Device controls name sentence case [CHAR LIMIT=40] -->
    <string name="device_controls_sentence">Device controls</string>
    <!-- Device controls name lower case [CHAR LIMIT=40] -->
    <string name="quick_controls_lower">device controls</string>
@@ -12884,12 +12881,6 @@
    <!-- Power menu setting option cards and passes [CHAR LIMIT=NONE] -->
    <string name="power_menu_cards_passes">Show cards &amp; passes</string>
    <!-- Power menu setting option device controls [CHAR LIMIT=NONE] -->
    <string name="power_menu_device_controls">Show device controls</string>
    <!-- Power menu setting option cards, passes, device controls [CHAR LIMIT=NONE] -->
    <string name="power_menu_cards_passes_device_controls">Show cards, passes, and device controls</string>
    <!-- Power menu setting lock screen category name [CHAR LIMIT=40] -->
    <string name="power_menu_lock_screen_category">Lock screen</string>
+0 −36
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2020 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:app="http://schemas.android.com/apk/res-auto"
    android:title="@string/device_controls_sentence">

    <com.android.settings.widget.VideoPreference
        android:key="device_controls_video"
        app:animation="@raw/gesture_device_controls"
        app:controller="com.android.settings.widget.VideoPreferenceController"/>

    <SwitchPreference
        android:key="gesture_device_controls_switch"
        android:title="@string/device_controls_setting_toggle"
        android:summary="@string/device_controls_setting_subtitle"
        app:keywords="@string/keywords_device_controls"
        app:controller="com.android.settings.gestures.DeviceControlsPreferenceController"
        app:allowDividerAbove="true" />

</PreferenceScreen>
+0 −6
Original line number Diff line number Diff line
@@ -33,12 +33,6 @@
        android:fragment="com.android.settings.gestures.GlobalActionsPanelSettings"
        settings:controller="com.android.settings.gestures.GlobalActionsPanelPreferenceController" />

    <Preference
        android:key="gesture_device_controls_summary"
        android:title="@string/device_controls_sentence"
        android:fragment="com.android.settings.gestures.DeviceControlsSettings"
        settings:controller="com.android.settings.gestures.DeviceControlsPreferenceController" />

    <PreferenceCategory
        android:title="@string/power_menu_lock_screen_category" >

Loading