aboutsummaryrefslogtreecommitdiff
path: root/doze/res
diff options
context:
space:
mode:
Diffstat (limited to 'doze/res')
-rw-r--r--doze/res/layout/doze.xml28
-rw-r--r--doze/res/xml/doze_settings.xml9
2 files changed, 8 insertions, 29 deletions
diff --git a/doze/res/layout/doze.xml b/doze/res/layout/doze.xml
deleted file mode 100644
index 941cdf6..0000000
--- a/doze/res/layout/doze.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2014, 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.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_height="match_parent"
- android:layout_width="match_parent">
-
- <include layout="@layout/switch_bar" />
-
-</LinearLayout>
-
diff --git a/doze/res/xml/doze_settings.xml b/doze/res/xml/doze_settings.xml
index fe4fa0a..72823dc 100644
--- a/doze/res/xml/doze_settings.xml
+++ b/doze/res/xml/doze_settings.xml
@@ -15,7 +15,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/ambient_display_title">
+
+ <com.android.settingslib.widget.MainSwitchPreference
+ android:defaultValue="false"
+ android:key="doze_enable"
+ android:title="@string/ambient_display_enable_title" />
<PreferenceCategory
android:key="tilt_sensor"