cleanup overlays for aosp vs. cm

Change-Id: I8fcf25f1f3321341f1b8273de9cade8f354b963c

cm.mk

@@ -10,6 +10,8 @@ $(call inherit-product-if-exists, vendor/cm/config/common_full_tablet_wifionly.m
 # Inherit device configuration for Kindle Fire
 $(call inherit-product, device/amazon/otter/full_otter.mk)
 
+DEVICE_PACKAGE_OVERLAYS += device/amazon/otter/overlay/cm
+
 PRODUCT_NAME := cm_otter
 PRODUCT_DEVICE := otter
 PRODUCT_BRAND := Android

device.mk

@@ -118,7 +118,7 @@ PRODUCT_PROPERTY_OVERRIDES := \
 
 PRODUCT_CHARACTERISTICS := tablet,nosdcard
 
-DEVICE_PACKAGE_OVERLAYS := device/amazon/otter/overlay
+DEVICE_PACKAGE_OVERLAYS := device/amazon/otter/overlay/aosp
 
 # enable Google-specific location features,
 # like NetworkLocationProvider and LocationCollector

overlay/cm/packages/apps/Settings/res/xml/tablet_power_widget.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+        <CheckBoxPreference
+            android:key="pref_airplane_toggle"
+            android:title="@string/title_toggle_airplane"
+            android:defaultValue="false"/>
+
+        <CheckBoxPreference
+            android:key="pref_rotate_toggle"
+            android:title="@string/title_toggle_autorotate"
+            android:defaultValue="true"/>
+
+        <CheckBoxPreference
+            android:key="pref_bluetooth_toggle"
+            android:title="@string/title_toggle_bluetooth"
+            android:defaultValue="false"/>
+
+        <CheckBoxPreference
+            android:key="pref_gps_toggle"
+            android:title="@string/title_toggle_gps"
+            android:defaultValue="false"/>
+
+        <CheckBoxPreference
+            android:key="pref_wifi_toggle"
+            android:title="@string/title_toggle_wifi"
+            android:defaultValue="true"/>
+
+        <CheckBoxPreference
+            android:key="pref_flashlight_toggle"
+            android:title="@string/title_toggle_flashlight"
+            android:defaultValue="false"/>
+
+        <CheckBoxPreference
+            android:key="pref_mobile_data_toggle"
+            android:title="@string/title_toggle_mobiledata"
+            android:defaultValue="false"/>
+
+        <CheckBoxPreference
+            android:key="pref_network_mode_toggle"
+            android:title="@string/title_toggle_networkmode"
+            android:defaultValue="false"/>
+
+        <CheckBoxPreference
+            android:key="pref_sound_toggle"
+            android:title="@string/title_toggle_sound"
+            android:defaultValue="false"/>
+
+        <PreferenceScreen
+            android:key="widget_order"
+            android:title="@string/title_widget_order"
+            android:summary="@string/summary_widget_order"
+            android:fragment="com.android.settings.cyanogenmod.TabletPowerWidget$PowerWidgetOrder" />
+
+</PreferenceScreen>