drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
97,827 Commits 1 Branch 0 Tags
Commit Graph

97827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
ef489fe9ed Import translations. DO NOT MERGE 
Change-Id: I4aaf67f3d31f73092284f9ebc09e7f619591cf5e
Auto-generated-cl: translation import
 2012-12-07 11:50:46 -08:00
Baligh Uddin
5885a7349e Import translations. DO NOT MERGE 
Change-Id: If369015db9eff3365982c588ff33f41cf5ef4b93
Auto-generated-cl: translation import
 2012-12-07 11:48:21 -08:00
Craig Mautner
4abf3f987f Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE 
RecentsActivity screenshots are called for very quickly after
WindowStateAnimator prepareSurface(). Without enough delay the
Surface.setLayer call does not propagate to the SurfaceFlinger
and the screenshot is incorrect (black) because it stops sampling
the layers too early.

This fix calls Surface.setSize() for each sampled Surface in
screenshots. setSize forces the SurfaceFlinger to process all
transactions queued before returning from closeTransaction.

Bug 7552304 fixed.

Change-Id: I1911dfa0b09cab713c55f5ba0c612496337a77df

Conflicts:

	services/java/com/android/server/wm/WindowManagerService.java
 2012-12-07 11:21:35 -08:00
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
Robert Greenwalt
4c8b7481cf Fix javadoc break 
Change-Id: Ia69a5cbead61747537269e267dcd8da320d61ba3
 2012-12-07 09:56:50 -08:00
Robert Greenwalt
37b8dfbade Merge "Refactor getPersistedNetworkPreference" 2012-12-07 09:09:06 -08:00
The Android Open Source Project
0e17cf50a6 am 8b52194c: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '8b52194c2ca7db79ba4fe60f9ef802793481f415':
 2012-12-07 07:56:43 -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
Eric Laurent
1e8753e460 am 056017cd: am c56a57f7: am 2b89f73e: Enforce camera shutter sound for Korea. 
* commit '056017cd7d966ae4962f2ebd064a615b3e076a85':
  Enforce camera shutter sound for Korea.
 2012-12-06 23:22:48 -08:00
Jake Hamby
f87f1f6e66 am 5fe4be69: am 6fb126b5: am 91bb0771: Merge "Enable Turkish language encoding for Turkish SIM cards." into jb-mr1.1-dev 
* commit '5fe4be69141ab67b32f99d86cad9817653764417':
  Enable Turkish language encoding for Turkish SIM cards.
 2012-12-06 23:22:44 -08:00
Daniel Sandler
e762482866 am b38ecce2: am 40ddc2bf: am bc305e55: Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev 
* commit 'b38ecce234b0ab32a33f8f65d4f7b1b6f13006cd':
  Fix longstanding nonsense in javadocs.
 2012-12-06 23:22:40 -08:00
Adam Cohen
2f536b18c4 am b9376280: 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 'b93762809beb13f61c6b2f7cb908a4ce81f46c82':
  Making sure to clear state related to views that are being recycled (issue 7650538)
 2012-12-06 23:22:37 -08:00
Andreas Huber
903901af97 am 30676a70: am bb2985aa: am 683028ca: Merge "Make it clear that non-optional MediaFormat keys are required" into jb-mr1.1-dev 
* commit '30676a7031bb80f522fbad5e59973716c4bc6780':
  Make it clear that non-optional MediaFormat keys are required
 2012-12-06 23:22:34 -08:00
Fabrice Di Meglio
aae6b552b3 am 7ee2f778: am 09329186: am b3b2922b: Merge "Fix bug #7649607 Hebrew text is cut off in Settings" into jb-mr1.1-dev 
* commit '7ee2f7785f3f77a4d4f589fe6a488662c9ad7913':
  Fix bug #7649607 Hebrew text is cut off in Settings
 2012-12-06 23:22:31 -08:00
Jim Miller
0386410ead am 5b09fcc7: am 946f6ab4: am 9819a617: Merge "Fix password field focus in keyguard" into jb-mr1.1-dev 
* commit '5b09fcc71664383ba73eb2074e52141d5e6abf9e':
  Fix password field focus in keyguard
 2012-12-06 23:22:27 -08:00
Winson Chung
f90b03771d am f882bc33: am a1bc0979: am 0db59a85: Revert "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)" 
* commit 'f882bc336794909b4c145462cfedc8e28a8494ec':
  Revert "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)"
 2012-12-06 23:22:23 -08:00
Fabrice Di Meglio
fc46484aa1 am 1527cc19: am a4884a12: am 0f3af41f: Merge "Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"" into jb-mr1.1-dev 
* commit '1527cc19ed4934d0c60a275f8a3c8617baf791fe':
  Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"
 2012-12-06 23:22:20 -08:00
Jeff Sharkey
012cfb245e am a4ff88cf: am 1fad16a6: am 3757e234: Merge "Fix baseline alignment of notification times." into jb-mr1.1-dev 
* commit 'a4ff88cf579cc336d54e9d7d8107d90af90bcf98':
  Fix baseline alignment of notification times.
 2012-12-06 23:22:16 -08:00
Victoria Lease
bdcef16b2b am ad5814b5: (-s ours) am bc36b523: am 7b085571: Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev 
* commit 'ad5814b5b118801a6de5147119e58d7494383bce':
  DO NOT MERGE Adjust update interval when expiring location requests.
 2012-12-06 23:22:13 -08:00
Scott Main
cca13f1370 am 1a10de0f: am 23d8835d: am ab3a5d94: am 40f7a513: docs: remove minsdkversion for clarity 
* commit '1a10de0f6be13dcb3630ef1bec86ae0ff6a035e4':
  docs: remove minsdkversion for clarity
 2012-12-06 23:22:09 -08:00
Craig Mautner
ca3088cee8 am 29d4484d: am e771f3a6: am ddd75cb1: Merge "Fix NPE when showing Toast from system process." into jb-mr1.1-dev 
* commit '29d4484dd822d7781da4170f907b8a020eb3e1d0':
  Fix NPE when showing Toast from system process.
 2012-12-06 23:22:05 -08:00
Chris Craik
95a38b92a0 am a9877672: am 780a53df: am 07efb030: Merge "Defer process mode upon draw" into jb-mr1.1-dev 
* commit 'a98776723f12ca1cbe6a8d181a49f179dfd23abd':
  Defer process mode upon draw
 2012-12-06 23:21:58 -08:00
Adam Hampson
002221d34a am fd0b2587: am 6a9d5761: EthernetDataTracker: Start DHCP on Link Up 
* commit 'fd0b25875c3fe005329d412a2500da1951ff6a7b':
  EthernetDataTracker: Start DHCP on Link Up
 2012-12-06 23:21:54 -08: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
Tim Murray
906380a876 Merge "add filters from Gallery to ImageProcessing" 2012-12-06 18:06:25 -08:00
Tim Murray
d7940c89e8 add filters from Gallery to ImageProcessing 
Change-Id: Iaf90f4a9468adde4bc8d94ec3ceed41846f424d0
 2012-12-06 17:19:54 -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
Glenn Kasten
28d4cf50e7 Merge "AudioTrack error checks" 2012-12-06 16:34:48 -08:00
Eric Laurent
2b89f73ef8 Enforce camera shutter sound for Korea. 
Bug 7680515.

Change-Id: Iafd0296aac36bd048e409f42f7e99eb0895d3d26
 2012-12-06 15:58:19 -08:00
Stephen Hines
afa528e438 Merge "Fix app bug related to same input/output bitmap." 2012-12-06 15:22:44 -08:00
Nick Kralevich
a4405ba6ea Add new protected broadcasts 
According to the javadocs for these intents, they are all
protected intents.  It appears the original author forgot
to add them to this file.

Change-Id: I025061716d5707f10939019f2bc5bc3d4d23b04f
 2012-12-06 15:22:11 -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