diff options
| author | Dinolek <dinolek@o2.pl> | 2017-12-31 01:13:24 +0100 |
|---|---|---|
| committer | Sebastian "Oyster" T <oysterized@gmail.com> | 2017-12-31 12:08:22 +0100 |
| commit | f006bb87392cfd7bb8d3bb0aa8e4e9de4c0ec29f (patch) | |
| tree | b0635c3d8c255e449cfeb4af871e29094bee6e98 | |
| parent | 15e730949e6cca4ae784cbfe231c2f31d29d3844 (diff) | |
doze: Clean up code
| -rw-r--r-- | doze/Android.mk | 6 | ||||
| -rw-r--r-- | doze/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | doze/res/drawable/switchbar_background.xml | 1 | ||||
| -rw-r--r-- | doze/res/layout/doze.xml | 1 | ||||
| -rw-r--r-- | doze/res/xml/doze_settings.xml | 2 |
5 files changed, 4 insertions, 14 deletions
diff --git a/doze/Android.mk b/doze/Android.mk index d2c33a8..99b956e 100644 --- a/doze/Android.mk +++ b/doze/Android.mk @@ -1,4 +1,4 @@ -LOCAL_PATH:= $(call my-dir) +LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional @@ -19,7 +19,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res \ - $(LOCAL_PATH)/../../../../packages/resources/devicesettings/res \ + packages/resources/devicesettings/res \ frameworks/support/v7/preference/res \ frameworks/support/v14/preference/res \ frameworks/support/v7/appcompat/res \ @@ -33,5 +33,3 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags include frameworks/base/packages/SettingsLib/common.mk include $(BUILD_PACKAGE) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/doze/AndroidManifest.xml b/doze/AndroidManifest.xml index 7d84ea0..63f37a0 100644 --- a/doze/AndroidManifest.xml +++ b/doze/AndroidManifest.xml @@ -17,8 +17,6 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.cyanogenmod.settings.doze" - android:versionCode="1" - android:versionName="1.0" android:sharedUserId="android.uid.system"> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> @@ -26,12 +24,8 @@ <protected-broadcast android:name="com.android.systemui.doze.pulse" /> - <uses-sdk - android:minSdkVersion="24" - android:targetSdkVersion="24"/> - <application - android:label="MeizuDoze" + android:label="@string/device_settings_app_name" android:persistent="true"> <receiver android:name=".BootCompletedReceiver"> diff --git a/doze/res/drawable/switchbar_background.xml b/doze/res/drawable/switchbar_background.xml index 45f1578..a0858e6 100644 --- a/doze/res/drawable/switchbar_background.xml +++ b/doze/res/drawable/switchbar_background.xml @@ -18,4 +18,3 @@ android:color="?android:attr/colorControlHighlight"> <item android:drawable="@color/switch_bar_background" /> </ripple> - diff --git a/doze/res/layout/doze.xml b/doze/res/layout/doze.xml index 941cdf6..a7ce3e0 100644 --- a/doze/res/layout/doze.xml +++ b/doze/res/layout/doze.xml @@ -25,4 +25,3 @@ <include layout="@layout/switch_bar" /> </LinearLayout> - diff --git a/doze/res/xml/doze_settings.xml b/doze/res/xml/doze_settings.xml index 66f8039..005c6ae 100644 --- a/doze/res/xml/doze_settings.xml +++ b/doze/res/xml/doze_settings.xml @@ -30,7 +30,7 @@ <PreferenceCategory android:key="proximity_sensor" - android:title="@string/proximity_sensor_title" > + android:title="@string/proximity_sensor_title"> <SwitchPreference android:key="gesture_hand_wave" |