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

38560 Commits

Author SHA1 Message Date
Adam Powell
7da613fd5d am a52b4792: am d692c2c6: Merge "Fix EventLog string class problem in onOptionMenuSelected" 
* commit 'a52b4792d134c257d0e897dbd39e6c1a53e30bb5':
  Fix EventLog string class problem in onOptionMenuSelected
 2012-12-10 11:43:33 -08:00
Adam Powell
a52b4792d1 am d692c2c6: Merge "Fix EventLog string class problem in onOptionMenuSelected" 
* commit 'd692c2c6856072a3ec8bec4550466d15a9fef8d7':
  Fix EventLog string class problem in onOptionMenuSelected
 2012-12-10 11:41:29 -08:00
Adam Powell
ba534dece2 Merge "Update documentation to mention compatibility versioning" 2012-12-10 11:34:19 -08:00
Adam Powell
d692c2c685 Merge "Fix EventLog string class problem in onOptionMenuSelected" 2012-12-10 11:09:32 -08:00
Adam Powell
2c8cc972c3 Update documentation to mention compatibility versioning 
Mention changes involving MeasureSpec/RelativeLayout/ImageView
behavior changes when apps target SDK > 17.

Change-Id: I232492a76ac048f7b460d28a87bd84cbbec4e4d7
 2012-12-10 11:02:54 -08:00
Nick Kralevich
efafb77500 am c0ffba90: am 261bc704: Merge "convert jint to uint32_t." 
* commit 'c0ffba907f6ab539ced94e089ccb4abbf7c2808f':
  convert jint to uint32_t.
 2012-12-10 10:34:20 -08:00
Nick Kralevich
c0ffba907f am 261bc704: Merge "convert jint to uint32_t." 
* commit '261bc70411ba1dd58654c4eb1c91acbbcfb49060':
  convert jint to uint32_t.
 2012-12-10 10:31:56 -08:00
Nick Kralevich
261bc70411 Merge "convert jint to uint32_t." 2012-12-10 09:44:24 -08:00
Baligh Uddin
f2caaea7af Import translations. DO NOT MERGE 
Change-Id: I8c068e86bbd1f63d7f792406d6e2212e4f01cec5
Auto-generated-cl: translation import
 2012-12-10 09:27:28 -08:00
Baligh Uddin
ca4d4f7c90 Import translations. DO NOT MERGE 
Change-Id: I7bae78f78c7b112e6084791607023cc6154efa27
Auto-generated-cl: translation import
 2012-12-10 09:18:48 -08:00
Baligh Uddin
9f106549bc Import translations. DO NOT MERGE 
Change-Id: Idecee06e6e72dcc9112b92b793af1bb8f8ce3916
Auto-generated-cl: translation import
 2012-12-10 09:16:28 -08:00
zobject
332944f8a0 Fix EventLog string class problem in onOptionMenuSelected 
EventLog function can handle string,integer class and long class. (in android_util_EventLog.cpp)
If menu title string are used bold tag(like <b>test</b>), it'll be android.text.SpannedString.
In onOptionMenuSelected, it is using item.getTitleCondensed() function for writing event log.
therefore any android activity using tag menu string(like <b></b>) can be crashed by IllegalArgumentException.

I found this crash on GMS Application.
change locale chinese -> launch Google+ -> hangout -> menu key -> Invite(expressed chinese) click -> Google+ crash

Change-Id: I0437be81699925e29bf4510eb615ef2424432763
 2012-12-10 23:19:45 +09:00
Tim Hutt
5313c9f027 Hopefully fix PendingIntent.getActivities() documentation wtf. 
The first intent is the key. No wait, last! Or was it first?

I haven't actually read the code, didn't write it, and haven't tested
its behaviour, but surely it can't be both, and last is the only one
that makes sense.

Change-Id: Ie8435981f09be618c93680fb6056afd015090161
 2012-12-10 12:34:19 +00:00
Satoshi Kataoka
6d29d143d9 Merge "Fix an issue on changing the keyboard locale between spellchecking supported language to non-supported language" 2012-12-09 17:34:41 -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
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
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
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
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
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
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
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
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
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
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
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
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