pull request

base/api/current.xml

@@ -76362,7 +76362,7 @@
  type="float"
  transient="false"
  volatile="false"
- value="0.001f"
+ value="0.0010f"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -147450,6 +147450,17 @@
  visibility="public"
 >
 </field>
+<field name="DEFAULT_SCREEN_OFF_TIMEOUT_WIFI"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="600000"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="DEVICE_PROVISIONED"
  type="java.lang.String"
  transient="false"
@@ -147868,6 +147879,17 @@
  visibility="public"
 >
 </field>
+<field name="SCREEN_OFF_TIMEOUT_BACKUP"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;screen_off_timeout_backup&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="SETTINGS_CLASSNAME"
  type="java.lang.String"
  transient="false"

base/core/java/android/inputmethodservice/InputMethodService.java

@@ -1130,6 +1130,7 @@ public void setOnyxContentFrameView() {
 	        }
             if (mOnyxContentFrame != null) {
                 mExtractEditText = (ExtractEditText)onyxView.findViewById(com.android.internal.R.id.onyxInputExtractEditText);
+                mExtractEditText.setLines(2);
                 mExtractEditText.setIME(this);
                 startExtractingText(false);
                 mOnyxContentFrame.removeAllViews();
@@ -1583,6 +1584,7 @@ public void onUpdateSelection(int oldSelStart, int oldSelEnd,
          * @author qingyue
          */
         if (eet != null && !isFullscreenMode()) {
+            eet.setLines(2);
             final int off = mExtractedText.startOffset;
             eet.startInternalChanges();
             newSelStart -= off;
@@ -1822,6 +1824,7 @@ boolean doMovementKey(int keyCode, KeyEvent event, int count) {
          * @author qingyue
          */
         if (eet != null && !isFullscreenMode()) {
+            eet.setLines(2);
             MovementMethod movement = eet.getMovementMethod();
             if (movement != null) {
                 if (count == MOVEMENT_DOWN) {
@@ -2184,6 +2187,7 @@ && isFullscreenMode()) {
          * Initialization mExtractEditText
          */
         if (eet != null && !isFullscreenMode()) {
+            eet.setLines(2);
             mExtractedToken++;
             ExtractedTextRequest req = new ExtractedTextRequest();
             req.token = mExtractedToken;

base/core/java/android/provider/Settings.java

@@ -1327,7 +1327,14 @@ public static void setShowGTalkServiceStatus(ContentResolver cr, boolean flag) {
          * The timeout before the screen turns off.
          */
         public static final String SCREEN_OFF_TIMEOUT = "screen_off_timeout";
-
+
+        /**
+         * The timeout backup when wifi is on.
+         */
+        public static final String SCREEN_OFF_TIMEOUT_BACKUP = "screen_off_timeout_backup";
+
+        public static final int DEFAULT_SCREEN_OFF_TIMEOUT_WIFI = 10 * 60 * 1000; /* 10 minutes */
+
         /**
          * If 0, the compatibility mode is off for all applications.
          * If 1, older applications run under compatibility mode.
@@ -1818,6 +1825,7 @@ public static void setShowGTalkServiceStatus(ContentResolver cr, boolean flag) {
             XEC_DLS_CONTROL,
             DIM_SCREEN,
             SCREEN_OFF_TIMEOUT,
+            SCREEN_OFF_TIMEOUT_BACKUP,
             SCREEN_BRIGHTNESS,
             SCREEN_BRIGHTNESS_MODE,
             VIBRATE_ON,

base/core/java/android/widget/TextView.java

@@ -6544,19 +6544,19 @@ public void onSpanRemoved(Spannable buf, Object what, int s, int e) {
     }
 
     private void makeBlink() {
-        if (!mCursorVisible || !isTextEditable()) {
-            if (mBlink != null) {
-                mBlink.removeCallbacks(mBlink);
-            }
+        //if (!mCursorVisible || !isTextEditable()) {
+        //    if (mBlink != null) {
+        //        mBlink.removeCallbacks(mBlink);
+        //    }
 
-            return;
-        }
+        //    return;
+        //}
 
-        if (mBlink == null)
-            mBlink = new Blink(this);
+        //if (mBlink == null)
+        //    mBlink = new Blink(this);
 
-        mBlink.removeCallbacks(mBlink);
-        mBlink.postAtTime(mBlink, mShowCursor + BLINK);
+        //mBlink.removeCallbacks(mBlink);
+        //mBlink.postAtTime(mBlink, mShowCursor + BLINK);
     }
 
     /**

base/core/res/res/drawable/stat_sys_battery_charge.xml

@@ -24,49 +24,34 @@
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:oneshot="false">
             <item android:drawable="@drawable/stat_sys_battery_charge_anim0" android:duration="2000" />
-            <item android:drawable="@drawable/stat_sys_battery_charge_anim1" android:duration="1000" />
-            <item android:drawable="@drawable/stat_sys_battery_charge_anim2" android:duration="1000" />
-            <item android:drawable="@drawable/stat_sys_battery_charge_anim3" android:duration="1000" />
-            <item android:drawable="@drawable/stat_sys_battery_charge_anim4" android:duration="1000" />
-            <item android:drawable="@drawable/stat_sys_battery_charge_anim5" android:duration="1000" />
         </animation-list>
     </item>
     <item android:maxLevel="29">
         <animation-list
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:oneshot="false">
             <item android:drawable="@drawable/stat_sys_battery_charge_anim1" android:duration="2000" />
-            <item android:drawable="@drawable/stat_sys_battery_charge_anim2" android:duration="1000" />
-            <item android:drawable="@drawable/stat_sys_battery_charge_anim3" android:duration="1000" />
-            <item android:drawable="@drawable/stat_sys_battery_charge_anim4" android:duration="1000" />
-            <item android:drawable="@drawable/stat_sys_battery_charge_anim5" android:duration="1000" />
         </animation-list>
     </item>
     <item android:maxLevel="49">
         <animation-list
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:oneshot="false">
             <item android:drawable="@drawable/stat_sys_battery_charge_anim2" android:duration="2000" />
-            <item android:drawable="@drawable/stat_sys_battery_charge_anim3" android:duration="1000" />
-            <item android:drawable="@drawable/stat_sys_battery_charge_anim4" android:duration="1000" />
-            <item android:drawable="@drawable/stat_sys_battery_charge_anim5" android:duration="1000" />
         </animation-list>
     </item>
     <item android:maxLevel="69">
         <animation-list
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:oneshot="false">
             <item android:drawable="@drawable/stat_sys_battery_charge_anim3" android:duration="2000" />
-            <item android:drawable="@drawable/stat_sys_battery_charge_anim4" android:duration="1000" />
-            <item android:drawable="@drawable/stat_sys_battery_charge_anim5" android:duration="1000" />
         </animation-list>
     </item>
     <item android:maxLevel="89">
         <animation-list
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:oneshot="false">
             <item android:drawable="@drawable/stat_sys_battery_charge_anim4" android:duration="2000" />
-            <item android:drawable="@drawable/stat_sys_battery_charge_anim5" android:duration="1000" />
         </animation-list>
     </item>
     <item android:maxLevel="101" android:drawable="@drawable/stat_sys_battery_charge_anim5" />

base/core/res/res/layout/onyx_input_method_extract_view.xml

@@ -6,7 +6,7 @@
     android:background="@android:drawable/extract_edit_text"
     android:gravity="top"
     android:inputType="text"
-    android:minLines="1"
+    android:lines="2"
     android:scrollbars="vertical" >
 
 </android.inputmethodservice.ExtractEditText>

base/packages/SettingsProvider/res/values/defaults.xml

@@ -18,7 +18,7 @@
 -->
 <resources>
     <bool name="def_dim_screen">true</bool>
-    <integer name="def_screen_off_timeout">60000</integer>
+    <integer name="def_screen_off_timeout">5000</integer>
     <bool name="def_airplane_mode_on">false</bool>
     <!-- Comma-separated list of bluetooth, wifi, and cell. -->
     <string name="def_airplane_mode_radios" translatable="false">cell,bluetooth,wifi</string>

base/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

@@ -1014,10 +1014,12 @@ private void loadSystemSettings(SQLiteDatabase db) {
             loadBooleanSetting(stmt, Settings.System.DIM_SCREEN,
                     R.bool.def_dim_screen);
             loadSetting(stmt, Settings.System.STAY_ON_WHILE_PLUGGED_IN,
-                    "1".equals(SystemProperties.get("ro.kernel.qemu")) ? 1 : 0);
+                    "1".equals(SystemProperties.get("ro.kernel.qemu")) ? 1 : 3);
             loadIntegerSetting(stmt, Settings.System.SCREEN_OFF_TIMEOUT,
                     R.integer.def_screen_off_timeout);
-
+            loadIntegerSetting(stmt, Settings.System.SCREEN_OFF_TIMEOUT_BACKUP,
+                    R.integer.def_screen_off_timeout);
+
             // Set default cdma emergency tone
             loadSetting(stmt, Settings.System.EMERGENCY_TONE, 0);
 

base/packages/SystemUI/res/drawable/status_bar_button.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>   
+<selector xmlns:android="http://schemas.android.com/apk/res/android">   
+    <item android:state_pressed="true"> 
+        <shape>
+            <gradient android:startColor="#c4c4c4" android:endColor="#c4c4c4" />
+            <stroke android:color="#000000" android:width="1dp"/>
+            <corners android:radius="2dip" />
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape>
+            <gradient android:startColor="#c4c4c4" android:endColor="#c4c4c4" />
+            <stroke android:color="#000000" android:width="2dp"/>
+            <corners android:radius="2dip" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient android:startColor="#c4c4c4" android:endColor="#c4c4c4" />
+            <stroke android:color="#000000" android:width="2dp"/>
+            <corners android:radius="2dip" />
+        </shape>
+    </item> 
+</selector>