Adam Powell
ff411ddb40
Merge "Framework: Use holo alert drawables"
2012-12-07 11:20:08 -08:00
Adam Powell
8ea5ce1565
Merge "Ensure running mTouchModeReset when AbsListView is detached"
2012-12-07 11:19:12 -08:00
The Android Open Source Project
8b52194c2c
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I01e19e6776b36fbc73214d51bdf106e4fd84af96
2012-12-07 07:53:02 -08:00
Sangkyu Lee
a607223f34
Ensure running mTouchModeReset when AbsListView is detached
...
mTouchModeReset should be executed when AbsListView is detached from window.
If not, when the AbsListView is re-attaced to window,
the child can retain a pressed state.
You can see this problem easily when you double-touch an item of
option menu very quickly.
Change-Id: I5aaa1fd5b95847efb2f5f1b5ec7cabe8eb85b237
Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
2012-12-07 17:06:15 +09:00
The Android Automerger
c355b831bf
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-06 19:36:10 -08:00
Eric Laurent
056017cd7d
am c56a57f7: am 2b89f73e: Enforce camera shutter sound for Korea.
...
* commit 'c56a57f7d775e7b097c62f9e8fb809467dc5cf0c':
Enforce camera shutter sound for Korea.
2012-12-06 19:00:52 -08:00
Jake Hamby
5fe4be6914
am 6fb126b5: am 91bb0771: Merge "Enable Turkish language encoding for Turkish SIM cards." into jb-mr1.1-dev
...
* commit '6fb126b5bbcf51f50064477f5070fe845cfd5454':
Enable Turkish language encoding for Turkish SIM cards.
2012-12-06 19:00:38 -08:00
Daniel Sandler
b38ecce234
am 40ddc2bf: am bc305e55: Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev
...
* commit '40ddc2bf4062caf5ce64cff69b697a874802ad9a':
Fix longstanding nonsense in javadocs.
2012-12-06 19:00:22 -08:00
Adam Cohen
b93762809b
am 224d2225: am 29cfce7a: Merge "Making sure to clear state related to views that are being recycled (issue 7650538)" into jb-mr1.1-dev
...
* commit '224d22250862d44cca08498630fcb0e7da68912b':
Making sure to clear state related to views that are being recycled (issue 7650538)
2012-12-06 19:00:16 -08:00
Andreas Huber
30676a7031
am bb2985aa: am 683028ca: Merge "Make it clear that non-optional MediaFormat keys are required" into jb-mr1.1-dev
...
* commit 'bb2985aa0e3435a4a945233eebc9ea36769209d2':
Make it clear that non-optional MediaFormat keys are required
2012-12-06 18:59:53 -08:00
Fabrice Di Meglio
7ee2f7785f
am 09329186: am b3b2922b: Merge "Fix bug #7649607 Hebrew text is cut off in Settings" into jb-mr1.1-dev
...
* commit '09329186eaf66b6c03d0ff5cc8df910800649b7d':
Fix bug #7649607 Hebrew text is cut off in Settings
2012-12-06 18:59:32 -08:00
Jim Miller
5b09fcc716
am 946f6ab4: am 9819a617: Merge "Fix password field focus in keyguard" into jb-mr1.1-dev
...
* commit '946f6ab44048138c03f9bcf93451322b4397f8f9':
Fix password field focus in keyguard
2012-12-06 18:59:24 -08:00
Winson Chung
f882bc3367
am a1bc0979: am 0db59a85: Revert "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)"
...
* commit 'a1bc0979a8cd7389ef4f7f4800fc58cd987ffee2':
Revert "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)"
2012-12-06 18:59:19 -08:00
Fabrice Di Meglio
1527cc19ed
am a4884a12: am 0f3af41f: Merge "Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"" into jb-mr1.1-dev
...
* commit 'a4884a12a1a6d833bad2e0d0fb85f2129e0a936f':
Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"
2012-12-06 18:59:10 -08:00
Jeff Sharkey
a4ff88cf57
am 1fad16a6: am 3757e234: Merge "Fix baseline alignment of notification times." into jb-mr1.1-dev
...
* commit '1fad16a6353f912168b130a9e595ac4540487827':
Fix baseline alignment of notification times.
2012-12-06 18:59:06 -08:00
Victoria Lease
ad5814b5b1
am bc36b523: am 7b085571: Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev
...
* commit 'bc36b52372be154994f19a9e767184b2d6b4783a':
DO NOT MERGE Adjust update interval when expiring location requests.
2012-12-06 18:59:01 -08:00
Scott Main
1a10de0f6b
am 23d8835d: am ab3a5d94: am 40f7a513: docs: remove minsdkversion for clarity
...
* commit '23d8835dc112ef0c65fac41cf1a1a00cb6bc776d':
docs: remove minsdkversion for clarity
2012-12-06 18:58:31 -08:00
Craig Mautner
29d4484dd8
am e771f3a6: am ddd75cb1: Merge "Fix NPE when showing Toast from system process." into jb-mr1.1-dev
...
* commit 'e771f3a67cbca9976de6b5df6088f6c007df2914':
Fix NPE when showing Toast from system process.
2012-12-06 18:58:24 -08:00
Chris Craik
a98776723f
am 780a53df: am 07efb030: Merge "Defer process mode upon draw" into jb-mr1.1-dev
...
* commit '780a53dfb5176165286ff4f1483b408e28ad6eb7':
Defer process mode upon draw
2012-12-06 18:58:20 -08:00
Adam Hampson
fd0b25875c
am 6a9d5761: EthernetDataTracker: Start DHCP on Link Up
...
* commit '6a9d57617a9b502c65d62f053ad8bd0309afdc24':
EthernetDataTracker: Start DHCP on Link Up
2012-12-06 18:58:10 -08:00
Mita Yun
ed218c706d
Use asynchronous messages for input method events.
...
Improves the throughput of IME event handling by ensuring that
input events do not get serialized behind UI traversal and
drawing messages such as when the UI is animating.
Added support for creating an asynchronous Handler as part of a
HandlerCaller. It turns out we should be using an asynchronous
Handler not only in IME dispatch but also in accessibility and
wallpaper events where HandlerCaller is used. So fixed those
services to also use an asynchronous Handler.
Change-Id: I0b19140c9d5ca6ee300c1a150c48312fd55ed8eb
2012-12-06 18:11:32 -08:00
Eric Laurent
c56a57f7d7
am 2b89f73e: Enforce camera shutter sound for Korea.
...
* commit '2b89f73ef805022c4e8b9bad545c1aa0421e5586':
Enforce camera shutter sound for Korea.
2012-12-06 16:58:12 -08:00
Eric Laurent
2b89f73ef8
Enforce camera shutter sound for Korea.
...
Bug 7680515.
Change-Id: Iafd0296aac36bd048e409f42f7e99eb0895d3d26
2012-12-06 15:58:19 -08:00
Jake Hamby
6fb126b5bb
am 91bb0771: Merge "Enable Turkish language encoding for Turkish SIM cards." into jb-mr1.1-dev
...
* commit '91bb07718bc005c320477c4bba66e1ee958a9ce2':
Enable Turkish language encoding for Turkish SIM cards.
2012-12-06 15:12:05 -08:00
Jake Hamby
91bb07718b
Merge "Enable Turkish language encoding for Turkish SIM cards." into jb-mr1.1-dev
2012-12-06 15:08:38 -08:00
Alex Yakavenka
7eabbd552d
Add config_speed_up_audio_on_mt_calls option
...
Bug: 7612431
Change-Id: Ia2758f81b78a2576df8dd23c700dba3eaaef8efc
2012-12-06 14:53:58 -08:00
Jake Hamby
37a2163267
Enable Turkish language encoding for Turkish SIM cards.
...
Enable Turkish language encoding for SMS messages. Adds an
MCC-specific config.xml override to enable the Turkish
language tables for Turkish SIM cards. Also modifies
GsmAlphabet.java to load the config.xml values before use,
so the SMSDispatcher will get the current values instead of
caching the boot-time values before the MCC is loaded.
Bug: 7422368
Change-Id: I57cd5fcc1d04a2d0cba3e8b9022078679cf5d4c1
2012-12-06 14:53:44 -08:00
Wink Saville
7ba6a6778e
Add Rlog.java
...
Rlog is like Log except that the destination buffer is
the radio buffer instead of the main buffer.
Change-Id: Ib4ce47abfda31dfc0b9193b10f8f42b225275f61
2012-12-06 13:10:45 -08:00
Victoria Lease
5b6069ce3a
Merge "Wrong parameter in LocationManagerService"
2012-12-06 12:45:46 -08:00
Daniel Sandler
40ddc2bf40
am bc305e55: Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev
...
* commit 'bc305e554427d22420746c66ab67a236c424fec0':
Fix longstanding nonsense in javadocs.
2012-12-06 11:34:40 -08:00
You Kim
87c1b3127e
Wrong parameter in LocationManagerService
...
Fix wrong parameter in removeTestProvider
Change-Id: Ibf93833697c865904f29821e5778853127e5fb00
Signed-off-by: You Kim <you.kim72@gmail.com>
2012-12-07 04:33:05 +09:00
Daniel Sandler
bc305e5544
Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev
2012-12-06 11:31:50 -08:00
Adam Cohen
224d222508
am 29cfce7a: Merge "Making sure to clear state related to views that are being recycled (issue 7650538)" into jb-mr1.1-dev
...
* commit '29cfce7a387c5f1ea92a310398ed4ed213a3cf62':
Making sure to clear state related to views that are being recycled (issue 7650538)
2012-12-06 11:05:31 -08:00
Adam Cohen
29cfce7a38
Merge "Making sure to clear state related to views that are being recycled (issue 7650538)" into jb-mr1.1-dev
2012-12-06 11:02:58 -08:00
Adam Cohen
ff06719077
Making sure to clear state related to views that are being recycled (issue 7650538)
...
Change-Id: I5161ac261f963789537d2066a472cd3036c218aa
2012-12-06 11:01:09 -08:00
Irfan Sheriff
628ba035b3
am 1612e298: Merge "AsyncChannel to support remote death notification and post a disconnect message to the source handler."
...
* commit '1612e29826dfe55f8deca27374046c5931ce5335':
AsyncChannel to support remote death notification and post a disconnect message to the source handler.
2012-12-06 10:59:10 -08:00
The Android Automerger
b97dcaa74c
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-06 10:39:19 -08:00
Irfan Sheriff
46e3807952
am c602187e: Merge "Prevent scanning during DHCP process"
...
* commit 'c602187e51aa6e8c46bffa5fb2603e368d83ea95':
Prevent scanning during DHCP process
2012-12-06 10:39:04 -08:00
Andreas Huber
bb2985aa0e
am 683028ca: Merge "Make it clear that non-optional MediaFormat keys are required" into jb-mr1.1-dev
...
* commit '683028ca0dab7b5cf7afff4501c2372350231bae':
Make it clear that non-optional MediaFormat keys are required
2012-12-06 08:06:17 -08:00
Andreas Huber
683028ca0d
Merge "Make it clear that non-optional MediaFormat keys are required" into jb-mr1.1-dev
2012-12-06 08:04:44 -08:00
Irfan Sheriff
1612e29826
Merge "AsyncChannel to support remote death notification and post a disconnect message to the source handler."
2012-12-05 20:33:37 -08:00
Fabrice Di Meglio
09329186ea
am b3b2922b: Merge "Fix bug #7649607 Hebrew text is cut off in Settings" into jb-mr1.1-dev
...
* commit 'b3b2922b10650551664659eadcf9c43cf9628974':
Fix bug #7649607 Hebrew text is cut off in Settings
2012-12-05 17:20:51 -08:00
Fabrice Di Meglio
b3b2922b10
Merge "Fix bug #7649607 Hebrew text is cut off in Settings" into jb-mr1.1-dev
2012-12-05 17:17:35 -08:00
Jim Miller
946f6ab440
am 9819a617: Merge "Fix password field focus in keyguard" into jb-mr1.1-dev
...
* commit '9819a61745b8eea3b3b7fa3af2c1ba017192cc36':
Fix password field focus in keyguard
2012-12-05 16:42:13 -08:00
Jim Miller
9819a61745
Merge "Fix password field focus in keyguard" into jb-mr1.1-dev
2012-12-05 16:37:52 -08:00
Winson Chung
a1bc0979a8
am 0db59a85: Revert "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)"
...
* commit '0db59a856f9b4a6ae53854a88fea3a3675d572fd':
Revert "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)"
2012-12-05 16:35:01 -08:00
Winson Chung
0db59a856f
Revert "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)"
...
This reverts commit 6cbc2e81742039969e081a9eed02060fb8789e25.
2012-12-05 16:04:23 -08:00
Fabrice Di Meglio
a4884a12a1
am 0f3af41f: Merge "Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"" into jb-mr1.1-dev
...
* commit '0f3af41fbc2845c61676d3dac2c73a10b434be33':
Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"
2012-12-05 15:20:28 -08:00
Fabrice Di Meglio
0f3af41fbc
Merge "Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"" into jb-mr1.1-dev
2012-12-05 15:17:35 -08:00
Jim Miller
42df15e93d
Fix password field focus in keyguard
...
This fixes a bug introduced in Change-Id: I34b7db402401a824f463d35d7546c05dc2979243 where
the top-most view was allowed to capture focus in order to ensure the device handled volume
key events.
This resolves the issue by restoring previous behavior and ensures we still handle media keys,
regardless of focus.
Fixes bug 7676996
Change-Id: Id2d1200be81640e4b4b7b5e3a0af099d6fc2d259
2012-12-05 15:15:00 -08:00