MotoActions: Use common style from devicesettings

Change-Id: I613b106fec0b6580d08a0a580988007807958db2
This commit is contained in:
dianlujitao 2022-02-01 17:29:29 +08:00 committed by Nolen Johnson
parent d84b79e801
commit 97a3a03979
4 changed files with 4 additions and 35 deletions

View File

@ -40,7 +40,7 @@
android:name=".DozePreferenceActivity"
android:exported="false"
android:label="@string/ambient_display_gestures_title"
android:theme="@style/MotoActions">
android:theme="@style/Theme.Main">
<intent-filter>
<action android:name="com.android.settings.action.IA_SETTINGS" />
</intent-filter>
@ -56,7 +56,7 @@
android:name=".ActionsPreferenceActivity"
android:exported="false"
android:label="@string/moto_gestures_panel_title"
android:theme="@style/MotoActions">
android:theme="@style/Theme.Main">
<intent-filter>
<action android:name="com.android.settings.action.IA_SETTINGS" />
</intent-filter>

View File

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 The CyanogenMod Project
Copyright (C) 2017 The LineageOS 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.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<style name="MotoActions" parent="@android:style/Theme.DeviceDefault.Settings">
<item name="preferenceTheme">@style/SettingsPreference</item>
</style>
<!-- Preferences -->
<style name="SettingsPreference">
<item name="allowDividerAbove">false</item>
<item name="allowDividerBelow">false</item>
<item name="singleLineTitle">false</item>
</style>
</resources>

View File

@ -15,8 +15,7 @@
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/com.android.settings">
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
android:key="actions_key"

View File

@ -14,8 +14,7 @@
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/com.android.settings">
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
android:key="ambient_display_key"