n5110: merge into common repo kona-common

3 files changed, 13 insertions, 157 deletions

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index f14a5b9..9fc6090 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -20,21 +20,6 @@
 <!-- These resources are around just to allow their values to be customized
      for different hardware and product builds. -->
 <resources>
-    <!-- Allow the menu hard key to be disabled in LockScreen on some devices -->
-    <bool name="config_disableMenuKeyInLockScreen">true</bool>
-
-    <!-- Workaround for devices with broken keyboards -->
-    <bool name="config_forceDisableHardwareKeyboard">true</bool>
-
-    <!-- Boolean to enable stylus gestures -->
-    <bool name="config_stylusGestures">true</bool>
-    
-   <bool name="config_allowAllRotations">true</bool>
-   <integer name="config_lidOpenRotation">-1</integer>
-   <integer name="config_deskDockKeepsScreenOn">0</integer>
-   <integer name="config_lidNavigationAccessibility">1</integer>
-   
-
     <!-- This device is not "voice capable"; it's data-only. -->
     <bool name="config_voice_capable">false</bool>
 
@@ -42,7 +27,14 @@
     <bool name="config_sms_capable">false</bool>
 
     <!-- The default iface on which to monitor data use -->
-    <string name="config_datause_iface">wlan0</string>
+    <string name="config_datause_iface">rmnet0</string>
+    
+    <!-- An Array of "[ConnectivityManager connectionType],
+         [# simultaneous connection types]"  -->
+    <string-array name="radioAttributes">
+        <item>1,1</item>
+        <item>7,1</item>
+    </string-array>
 
     <!-- An Array of "[Connection name],[ConnectivityManager.TYPE_xxxx],
          [associated radio-type],[priority],[restoral-timer(ms)],[dependencyMet]  -->
@@ -56,40 +48,16 @@
         <item>wifi_p2p,13,1,0,-1,true</item>
     </string-array>
 
-    <!-- An Array of "[ConnectivityManager connectionType],
-         [# simultaneous connection types]"  -->
-    <string-array name="radioAttributes">
-        <item>1,1</item>
-        <item>0,1</item>
-        <item>7,1</item>
-    </string-array>
-
-    <!-- List of regexpressions describing the interface (if any) that represent tetherable
-         USB interfaces.  If the device doesn't want to support tething over USB this should
-         be empty.  An example would be "usb.*" -->
-    <string-array translatable="false" name="config_tether_usb_regexs">
-        <item>"rndis0"</item>
-    </string-array>
-	
-    <integer-array name="config_data_usage_network_types">
-        <item>0</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>10</item>
-        <item>11</item>
-        <item>12</item>
-    </integer-array>
-
     <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
     <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
     <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
     <integer-array name="config_tether_upstream_types">
+        <item>0</item>
         <item>1</item>
+        <item>4</item>
+        <item>5</item>
         <item>7</item>
+        <item>9</item>
     </integer-array>
-    
-    <!-- True if the Irda service should be started at system start -->
-    <bool name="config_enableIrdaManagerService">true</bool>
+
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
deleted file mode 100644
index ad5f292..0000000
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2009, 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.
-*/
--->
-
-<device name="Android">
-    <item name="none">0</item>
-    <item name="screen.on">302</item>
-    <item name="screen.full">445.8</item>
-    <item name="bluetooth.active">107.6</item>
-    <item name="bluetooth.on">0.6</item>
-    <item name="wifi.on">0.4</item>
-    <item name="wifi.active">31.0</item>
-    <item name="wifi.scan">6.5</item>
-    <item name="dsp.audio">33.5</item>
-    <item name="dsp.video">624.5</item>
-    <item name="gps.on">0.2</item>
-    <item name="radio.active">140.9</item>
-    <item name="radio.scanning">18.5</item>
-    <array name="radio.on">
-        <value>4.3</value>
-        <value>4.3</value>
-    </array>
-    <array name="cpu.speeds">
-        <value>216000</value>
-        <value>312000</value>
-        <value>456000</value>
-        <value>608000</value>
-        <value>760000</value>
-        <value>816000</value>
-        <value>912000</value>
-        <value>1000000</value>
-    </array>
-    <item name="cpu.idle">2.2</item>
-    <item name="cpu.awake">54.6</item>
-    <array name="cpu.active">
-        <value>100</value>
-        <value>107</value>
-        <value>116</value>
-        <value>123</value>
-        <value>135</value>
-        <value>138</value>
-        <value>142</value>
-        <value>148</value>
-    </array>
-    <item name="battery.capacity">4600</item>
-</device>
diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
deleted file mode 100644
index 30c5bd6..0000000
--- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2011, 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.
-*/
--->
-
-<!-- The <device> element should contain one or more <storage> elements.
-     Exactly one of these should have the attribute primary="true".
-     This storage will be the primary external storage and should have mountPoint="/mnt/sdcard".
-     Each storage should have both a mountPoint and storageDescription attribute.
-     The following attributes are optional:
-
-        primary:    (boolean) this storage is the primary external storage
-        removable:  (boolean) this is removable storage (for example, a real SD card)
-        emulated:   (boolean) the storage is emulated via the FUSE sdcard daemon
-        mtpReserve: (integer) number of megabytes of storage MTP should reserve for free storage
-                     (used for emulated storage that is shared with system's data partition)
-
-      A storage should not have both emulated and removable set to true
--->
-
-<StorageList xmlns:android="http://schemas.android.com/apk/res/android">
-    <storage android:mountPoint="/storage/sdcard0"
-             android:storageDescription="@string/storage_internal"
-             android:primary="true"
-             android:emulated="true"
-             android:mtpReserve="100" />
-
-    <storage android:mountPoint="/storage/sdcard1"
-             android:storageDescription="@string/storage_sd_card"
-             android:primary="false"
-             android:removable="true" />
-
-    <storage android:mountPoint="/storage/usbdisk0"
-             android:storageDescription="@string/storage_usb"
-             android:primary="false"
-             android:removable="true" />
-</StorageList>