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

97697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
c43670be2b Merge "Add Rlog.java" 2012-12-08 08:00:26 -08:00
Adam Powell
e3833c2ba4 Merge "Compatibility measurement hacks when targetSdkVersion <= JB-MR1" 2012-12-07 17:23:24 -08:00
Nick Kralevich
7353cf305e convert jint to uint32_t. 
This works around a compiler bug, and is probably more
correct anyway.

Change-Id: I1c49064bd64c31dafae560e416c665de0449f245
 2012-12-07 16:56:47 -08:00
Adam Powell
7da4b73a23 Compatibility measurement hacks when targetSdkVersion <= JB-MR1 
All three of these are interrelated!

* Allow broken MeasureSpec values. The long-standing implementation
  of MeasureSpec.makeMeasureSpec has been to add both values rather
  than masking/or-ing the values together. Some old code relied on
  this, such as if it mixed up size/mode params.

* Disable ImageView adjustViewBounds allowing the view to grow beyond
  its initial size. A bug in RelativeLayout in the presence of the
  above MeasureSpec fix causes this not to work properly in apps.

* Allow RelativeLayout to send overflowed/bogus MeasureSpec values
  when measured with MeasureSpec.UNSPECIFIED mode. Some apps have
  custom child views that do not properly handle UNSPECIFIED
  measurements, but the exact overflow semantics caused this to
  generate AT_MOST $REALLYBIG MeasureSpecs for those views instead if
  they were placed inside a RelativeLayout in a scrolling container.

Change-Id: I977a5f1ba5637f0cba3d26a70139e2bcd021fc9c
 2012-12-07 16:30:35 -08:00
The Android Automerger
5e6afa5f27 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-07 13:26:16 -08:00
Sascha Prueter
85ae89dcba am 961ce2af: (-s ours) am 2588648b: am 203f69f0: Merge "Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE" into jb-mr1.1-dev 
* commit '961ce2afbf82d4b2a9691f1c1cc75a97ce43fe2b':
  Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE
 2012-12-07 12:42:15 -08:00
Sascha Prueter
961ce2afbf am 2588648b: am 203f69f0: Merge "Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE" into jb-mr1.1-dev 
* commit '2588648b5268526bdc9ed7fb4e9eac36c8c693dc':
  Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE
 2012-12-07 12:40:32 -08:00
Sascha Prueter
2588648b52 am 203f69f0: Merge "Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE" into jb-mr1.1-dev 
* commit '203f69f0998d982205b1c9f550576024654e6bc3':
  Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE
 2012-12-07 12:38:15 -08:00
Sascha Prueter
203f69f099 Merge "Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE" into jb-mr1.1-dev 2012-12-07 12:36:09 -08:00
Adam Powell
cd252d267b am 524962c8: am ff411ddb: Merge "Framework: Use holo alert drawables" 
* commit '524962c8cf796035f7578515ba48080873d46057':
  Framework: Use holo alert drawables
 2012-12-07 12:24:20 -08:00
Adam Powell
461c8534e1 am d9cb3c53: am 8ea5ce15: Merge "Ensure running mTouchModeReset when AbsListView is detached" 
* commit 'd9cb3c538f034c4e5137a2d2827cc72f8fbaf67e':
  Ensure running mTouchModeReset when AbsListView is detached
 2012-12-07 12:24:17 -08:00
Victoria Lease
aefe6f511e am aec22714: am 5b6069ce: Merge "Wrong parameter in LocationManagerService" 
* commit 'aec227148d00e2d0ac438ea538b7e28aea766021':
  Wrong parameter in LocationManagerService
 2012-12-07 12:21:51 -08:00
Adam Powell
524962c8cf am ff411ddb: Merge "Framework: Use holo alert drawables" 
* commit 'ff411ddb40d250f075bfe8c4940931b27079f5cb':
  Framework: Use holo alert drawables
 2012-12-07 12:21:41 -08:00
Adam Powell
d9cb3c538f am 8ea5ce15: Merge "Ensure running mTouchModeReset when AbsListView is detached" 
* commit '8ea5ce15651ebc1249a3b80531773b37e6f49b8d':
  Ensure running mTouchModeReset when AbsListView is detached
 2012-12-07 12:21:37 -08:00
Victoria Lease
aec227148d am 5b6069ce: Merge "Wrong parameter in LocationManagerService" 
* commit '5b6069ce3a87d30960e9ef5870299db90090776b':
  Wrong parameter in LocationManagerService
 2012-12-07 12:18:37 -08:00
Baligh Uddin
849232b4c4 Merge "Import translations. DO NOT MERGE" 2012-12-07 12:10:35 -08:00
Baligh Uddin
c4c10faabd Import translations. DO NOT MERGE 
Change-Id: I961d9eec3384d2ced8ab73b2a60a457a759632ca
Auto-generated-cl: translation import
 2012-12-07 11:58:05 -08:00
Baligh Uddin
b47265a1b6 am d6afe94a: (-s ours) am fa455b47: am ef489fe9: Import translations. DO NOT MERGE 
* commit 'd6afe94a2a9109db30fa5f9fc7182f23d1a08b45':
  Import translations. DO NOT MERGE
 2012-12-07 11:56:26 -08:00
Baligh Uddin
d6afe94a2a am fa455b47: am ef489fe9: Import translations. DO NOT MERGE 
* commit 'fa455b47002bbbc4faadf5d8f965b3fa9738fbf6':
  Import translations. DO NOT MERGE
 2012-12-07 11:54:06 -08:00
Baligh Uddin
41a1d68c88 am 60638629: (-s ours) am 5885a734: Import translations. DO NOT MERGE 
* commit '6063862966c8988dc94f9bcf8e01ed6a817b9e01':
  Import translations. DO NOT MERGE
 2012-12-07 11:53:43 -08:00
Baligh Uddin
fa455b4700 am ef489fe9: Import translations. DO NOT MERGE 
* commit 'ef489fe9ed665ad186d060aa209b581498c46dda':
  Import translations. DO NOT MERGE
 2012-12-07 11:52:58 -08:00
Baligh Uddin
6063862966 am 5885a734: Import translations. DO NOT MERGE 
* commit '5885a7349ee456765d0b63eac9581f9d1ff1685d':
  Import translations. DO NOT MERGE
 2012-12-07 11:51:28 -08:00
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