Further Refactoring, change theme to match pixel (settings)

- Remove package from showing up in settings

- Changed package name so we can do our own thing and not have it
get in the way of the Doze package currently used by Nick and others

- Set OneplusDoze to compile

Change-Id: Ieebf13f88c02d5036a09b5ef83ca1b53bd6999ac

device.mk

@@ -147,7 +147,7 @@ PRODUCT_PACKAGES += \
 
 # Doze mode
 PRODUCT_PACKAGES += \
-    ZukDoze
+    OneplusThreeDoze
 
 # Fingerprint
 PRODUCT_PACKAGES += \

doze/Android.mk

@@ -5,7 +5,7 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := OneplusDoze
+LOCAL_PACKAGE_NAME := OneplusThreeDoze
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
 

doze/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cyanogenmod.settings.doze"
+    package="com.cyanogenmod.oneplusthree.doze"
     android:versionCode="1"
     android:versionName="1.0"
     android:sharedUserId="android.uid.system">
@@ -16,30 +16,24 @@
         android:label="OneplusDoze"
         android:persistent="true">
 
-        <receiver android:name="com.cyanogenmod.settings.doze.BootCompletedReceiver">
+        <receiver android:name="com.cyanogenmod.oneplusthree.doze.BootCompletedReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
 
-        <service android:name="com.cyanogenmod.settings.doze.DozeService"
+        <service android:name="com.cyanogenmod.oneplusthree.doze.DozeService"
                  android:permission="OneplusDozeService">
         </service>
 
         <activity
             android:name=".DozeSettings"
             android:label="@string/ambient_display_title"
-            android:theme="@android:style/Theme.Material.Settings">
+            android:theme="@android:style/Theme.DeviceDefault.Settings">
             <intent-filter>
                 <action android:name="com.android.settings.action.EXTRA_SETTINGS" />
             </intent-filter>
-            <meta-data
-                android:name="com.android.settings.category"
-                android:value="com.android.settings.category.device" />
-            <meta-data
-                android:name="com.android.settings.icon"
-                android:resource="@drawable/ic_settings_doze" />
         </activity>
 
     </application>

doze/proguard.flags

@@ -1,3 +1,3 @@
--keep class com.cyanogenmod.settings.doze.* {
+-keep class com.cyanogenmod.oneplusthree.doze.* {
   *;
 }

doze/src/com/cyanogenmod/settings/doze/BootCompletedReceiver.java → doze/src/com/cyanogenmod/oneplusthree/doze/BootCompletedReceiver.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.settings.doze;
+package com.cyanogenmod.oneplusthree.doze;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

doze/src/com/cyanogenmod/settings/doze/DozeService.java → doze/src/com/cyanogenmod/oneplusthree/doze/DozeService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.settings.doze;
+package com.cyanogenmod.oneplusthree.doze;
 
 import android.app.Service;
 import android.content.BroadcastReceiver;

doze/src/com/cyanogenmod/settings/doze/DozeSettings.java → doze/src/com/cyanogenmod/oneplusthree/doze/DozeSettings.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.settings.doze;
+package com.cyanogenmod.oneplusthree.doze;
 
 import android.app.ActionBar;
 import android.app.Activity;

doze/src/com/cyanogenmod/settings/doze/ProximitySensor.java → doze/src/com/cyanogenmod/oneplusthree/doze/ProximitySensor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.settings.doze;
+package com.cyanogenmod.oneplusthree.doze;
 
 import android.content.Context;
 import android.hardware.Sensor;

doze/src/com/cyanogenmod/settings/doze/TiltSensor.java → doze/src/com/cyanogenmod/oneplusthree/doze/TiltSensor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.settings.doze;
+package com.cyanogenmod.oneplusthree.doze;
 
 import android.content.Context;
 import android.hardware.Sensor;

doze/src/com/cyanogenmod/settings/doze/Utils.java → doze/src/com/cyanogenmod/oneplusthree/doze/Utils.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.settings.doze;
+package com.cyanogenmod.oneplusthree.doze;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;