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

97663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
c092b8d3cf Import translations. DO NOT MERGE 
Change-Id: Ie6f2c7d8008afc642ca538f48d673333f723c086
Auto-generated-cl: translation import
 2012-12-10 09:33:35 -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
Quddus Chong
6f0c7b5068 am 5fe65556: am 3aecb61b: am 47050d35: am 768dba6d: docs: Merged commits for final release of IABv3 docs. 
* commit '5fe65556c532c3d51ede4ad794dc886b382ea42c':
  docs: Merged commits for final release of IABv3 docs.
 2012-12-09 18:55:46 -08:00
Quddus Chong
5fe65556c5 am 3aecb61b: am 47050d35: am 768dba6d: docs: Merged commits for final release of IABv3 docs. 
* commit '3aecb61bebbe038b74b5e0d96acbb7142835127e':
  docs: Merged commits for final release of IABv3 docs.
 2012-12-09 18:53:52 -08:00
Quddus Chong
3aecb61beb am 47050d35: am 768dba6d: docs: Merged commits for final release of IABv3 docs. 
* commit '47050d3578986febcc4b28f901effd6b4b9ae41a':
  docs: Merged commits for final release of IABv3 docs.
 2012-12-09 18:51:35 -08:00
Quddus Chong
47050d3578 am 768dba6d: docs: Merged commits for final release of IABv3 docs. 
* commit '768dba6d8cd6ad56fb6d4e7e30b3260e0d5e0ffd':
  docs: Merged commits for final release of IABv3 docs.
 2012-12-09 18:49:39 -08:00
Quddus Chong
768dba6d8c docs: Merged commits for final release of IABv3 docs. 
Change-Id: Ib7c26052bb1b4de9a44d78817d7012839eaa953a
 2012-12-09 18:24:06 -08: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
Wink Saville
32d1a45476 am 64a98645: am be5316e0: Merge "Use Rlog" 
* commit '64a98645919461deb8a61a6ff4e6336ccb1ab362':
  Use Rlog
 2012-12-08 13:13:44 -08:00
Wink Saville
64a9864591 am be5316e0: Merge "Use Rlog" 
* commit 'be5316e012d98cd3e74f8aff628c88845cc3fb13':
  Use Rlog
 2012-12-08 13:11:45 -08:00
Wink Saville
be5316e012 Merge "Use Rlog" 2012-12-08 12:11:34 -08:00
Wink Saville
22b1e80c24 Use Rlog 
Change-Id: I44919126606cd55f7dce7c942027ed0d914f04bd
 2012-12-08 09:06:51 -08:00
Wink Saville
4c30f12950 am 20ab6d1f: am c43670be: Merge "Add Rlog.java" 
* commit '20ab6d1f02c64a7c428d9059e854fe10b754500a':
  Add Rlog.java
 2012-12-08 08:40:55 -08:00
Wink Saville
20ab6d1f02 am c43670be: Merge "Add Rlog.java" 
* commit 'c43670be2b10d0d89b1bfd2fbbf6f70006d00968':
  Add Rlog.java
 2012-12-08 08:38:43 -08:00
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