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

88236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
8bf6cbb958 am 94195fa6: am 98ec5660: Merge "Re-add default sms_short_codes." into jb-mr1-dev 
* commit '94195fa611331dd7ea771e1e24ca6d50caa0fb89':
  Re-add default sms_short_codes.
 2012-10-02 15:55:05 -07:00
Robert Greenwalt
94195fa611 am 98ec5660: Merge "Re-add default sms_short_codes." into jb-mr1-dev 
* commit '98ec56604dc3d150e47e1605b33a4ae40dbc7f5c':
  Re-add default sms_short_codes.
 2012-10-02 15:52:18 -07:00
Robert Greenwalt
98ec56604d Merge "Re-add default sms_short_codes." into jb-mr1-dev 2012-10-02 15:49:58 -07:00
Scott Main
b169179b82 am 328dc142: am a22f081a: am b847f0b5: am 04c63a40: docs: android training - Data Storage 
* commit '328dc142a251b2891f37453876513b968fbe1925':
  docs: android training - Data Storage
 2012-10-02 15:38:19 -07:00
Irfan Sheriff
8ddb79c4a3 am 566b259a: am de9627f9: Merge "Add operator name to network notification" into jb-mr1-dev 
* commit '566b259ac068525938d74eb880422d48e7693536':
  Add operator name to network notification
 2012-10-02 15:36:26 -07:00
Scott Main
328dc142a2 am a22f081a: am b847f0b5: am 04c63a40: docs: android training - Data Storage 
* commit 'a22f081ab41072b5aa8caa3d1179d2ad27a877f7':
  docs: android training - Data Storage
 2012-10-02 15:35:54 -07:00
Scott Main
a22f081ab4 am b847f0b5: am 04c63a40: docs: android training - Data Storage 
* commit 'b847f0b578d861647be4908fc3a8d575ba4d726b':
  docs: android training - Data Storage
 2012-10-02 15:34:12 -07:00
Irfan Sheriff
566b259ac0 am de9627f9: Merge "Add operator name to network notification" into jb-mr1-dev 
* commit 'de9627f965ca7fbd93b655d35794c52263d021b2':
  Add operator name to network notification
 2012-10-02 15:34:06 -07:00
Irfan Sheriff
de9627f965 Merge "Add operator name to network notification" into jb-mr1-dev 2012-10-02 15:31:21 -07:00
Scott Main
b847f0b578 am 04c63a40: docs: android training - Data Storage 
* commit '04c63a4098293dd00aeaf561b05a33c04a8d7853':
  docs: android training - Data Storage
 2012-10-02 15:31:18 -07:00
Scott Main
04c63a4098 docs: android training - Data Storage 
Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429
 2012-10-02 15:06:22 -07:00
The Android Open Source Project
5025f2c46a am 29915f7f: am 09f090b3: am e81e42d7: (-s ours) Reconcile with jb-release - do not merge 
* commit '29915f7f731641b08f5045092c4c7223a79436b0':
  Show plmn in emergency call allowed mode.
 2012-10-02 14:54:22 -07:00
The Android Open Source Project
29915f7f73 am 09f090b3: am e81e42d7: (-s ours) Reconcile with jb-release - do not merge 
* commit '09f090b377cbe2332340580daf4adf4d2502d004':
  Show plmn in emergency call allowed mode.
 2012-10-02 14:51:23 -07:00
The Android Open Source Project
09f090b377 am e81e42d7: (-s ours) Reconcile with jb-release - do not merge 
* commit 'e81e42d7a6bb1bc7b29d0a7d475f750b524e3fec':
  Show plmn in emergency call allowed mode.
 2012-10-02 14:49:12 -07:00
The Android Open Source Project
e81e42d7a6 Reconcile with jb-release - do not merge 
Change-Id: Ie81134aa556b0deb90dcba3d914d58558f3600a9
 2012-10-02 14:47:41 -07:00
Romain Guy
70c68ea553 am 77bcaaad: am 8257124c: Merge "Draw stroked rectangle as meshes instead of textures Bug #7233734" into jb-mr1-dev 
* commit '77bcaaad5c04dc42d66b7f15d8f2377077c2c52c':
  Draw stroked rectangle as meshes instead of textures Bug #7233734
 2012-10-02 14:34:39 -07:00
Romain Guy
77bcaaad5c am 8257124c: Merge "Draw stroked rectangle as meshes instead of textures Bug #7233734" into jb-mr1-dev 
* commit '8257124cffe2825f123abd2b209422727c8f3053':
  Draw stroked rectangle as meshes instead of textures Bug #7233734
 2012-10-02 14:32:07 -07:00
Romain Guy
8257124cff Merge "Draw stroked rectangle as meshes instead of textures Bug #7233734" into jb-mr1-dev 2012-10-02 14:29:47 -07:00
John Spurlock
fa69c0a555 am de99afcf: am ec9b13dc: Merge "Disable quick settings for users until USER_SETUP_COMPLETE." into jb-mr1-dev 
* commit 'de99afcfdf3afcd06ce4be95ea25ca3246bfb5b7':
  Disable quick settings for users until USER_SETUP_COMPLETE.
 2012-10-02 14:18:26 -07:00
John Spurlock
de99afcfdf am ec9b13dc: Merge "Disable quick settings for users until USER_SETUP_COMPLETE." into jb-mr1-dev 
* commit 'ec9b13dc489ee3d92d985336b500afafadee0cd8':
  Disable quick settings for users until USER_SETUP_COMPLETE.
 2012-10-02 14:17:03 -07:00
John Spurlock
ec9b13dc48 Merge "Disable quick settings for users until USER_SETUP_COMPLETE." into jb-mr1-dev 2012-10-02 14:15:23 -07:00
Jim Miller
32626e0208 am fbf1d170: am c6e570db: Merge "Fix camera disambiguation in secure keyguard" into jb-mr1-dev 
* commit 'fbf1d17004f1e48c9b400980817f160cbc0904c5':
  Fix camera disambiguation in secure keyguard
 2012-10-02 14:04:25 -07:00
Jeff Sharkey
3509e37316 am f63ca02f: am c12dd973: Merge "Migrate more System and Secure settings to Global." into jb-mr1-dev 
* commit 'f63ca02f9fce6aedd7a03e9f8a95e2e2d6bf9eac':
  Migrate more System and Secure settings to Global.
 2012-10-02 14:04:22 -07:00
Chris Wren
097891f2d6 am eb3a02da: am 6ac833c9: Merge "re-use status bar DateView in QuickSettings." into jb-mr1-dev 
* commit 'eb3a02da03ac273b3f752737789b4219eed5ca63':
  re-use status bar DateView in QuickSettings.
 2012-10-02 14:04:19 -07:00
Irfan Sheriff
b8aad91f05 Add operator name to network notification 
Bug: 7087564
Change-Id: Ibe7a09fc6858dfea5f65092777bbd6ca82177043
 2012-10-02 14:01:28 -07:00
Jim Miller
fbf1d17004 am c6e570db: Merge "Fix camera disambiguation in secure keyguard" into jb-mr1-dev 
* commit 'c6e570dbadc3689bc80c0516492a3209d5f6742b':
  Fix camera disambiguation in secure keyguard
 2012-10-02 14:00:28 -07:00
Jeff Sharkey
f63ca02f9f am c12dd973: Merge "Migrate more System and Secure settings to Global." into jb-mr1-dev 
* commit 'c12dd973724f5aab44814b31650b4b47314e952b':
  Migrate more System and Secure settings to Global.
 2012-10-02 14:00:24 -07:00
Chris Wren
eb3a02da03 am 6ac833c9: Merge "re-use status bar DateView in QuickSettings." into jb-mr1-dev 
* commit '6ac833c9e3ccdf586c24ccf18560d5e223ba0734':
  re-use status bar DateView in QuickSettings.
 2012-10-02 14:00:21 -07:00
Jim Miller
c6e570dbad Merge "Fix camera disambiguation in secure keyguard" into jb-mr1-dev 2012-10-02 13:58:01 -07:00
Jeff Sharkey
c12dd97372 Merge "Migrate more System and Secure settings to Global." into jb-mr1-dev 2012-10-02 13:57:30 -07:00
Chris Wren
6ac833c9e3 Merge "re-use status bar DateView in QuickSettings." into jb-mr1-dev 2012-10-02 13:57:30 -07:00
Jeff Sharkey
6e2bee75ce Migrate more System and Secure settings to Global. 
Includes telephony, WindowManager, PackageManager, and debugging
settings.  Update API to point towards moved values.

Bug: 7231764, 7231252, 7231156
Change-Id: I5828747205708872f19f83a5bc821ed0a801cb79
 2012-10-02 13:55:15 -07:00
Michael Jurka
04827755aa am 94424ad3: am fb4a113a: Merge "Fix jump cut when dismissing items in Recents" into jb-mr1-dev 
* commit '94424ad3ed98e6ec86bf619b06367f0eb9f7fa17':
  Fix jump cut when dismissing items in Recents
 2012-10-02 13:55:03 -07:00
Michael Jurka
94424ad3ed am fb4a113a: Merge "Fix jump cut when dismissing items in Recents" into jb-mr1-dev 
* commit 'fb4a113a29f432b69b5ec9e3cc3143674c67ffac':
  Fix jump cut when dismissing items in Recents
 2012-10-02 13:53:02 -07:00
Michael Jurka
fb4a113a29 Merge "Fix jump cut when dismissing items in Recents" into jb-mr1-dev 2012-10-02 13:49:57 -07:00
John Spurlock
919adac28b Disable quick settings for users until USER_SETUP_COMPLETE. 
If the current user has not yet made it through the setup wizard,
disable the quick settings panel entirely.

Use Settings.Secure.USER_SETUP_COMPLETE as the signal.  This is a
per-user setting, so be careful to observe only on the current user's
behalf.

Bug:6712493
Change-Id: I3076a8a550165a9eeccf7fb129d470ef4ddeaed4
 2012-10-02 16:48:24 -04:00
Romain Guy
cf8675ee17 Draw stroked rectangle as meshes instead of textures 
Bug #7233734

Stroked rectangles were rendered using software generated textures
which would lead to slightly misaligned results. Instead, let's use
the new convex path rendering code that will do the right thing
(and save a lot of bandwidth.)

Change-Id: Ib95ff581e56c1ecead97e4919298e6fd146ca167
 2012-10-02 13:33:10 -07:00
Svetoslav Ganov
6a7575194d am cc723173: am 0944d625: Merge "Touch explorer and magnifier do not work well together." into jb-mr1-dev 
* commit 'cc72317334d33fbaffc099e5286b9a3d3c33f904':
  Touch explorer and magnifier do not work well together.
 2012-10-02 13:20:11 -07:00
Svetoslav Ganov
cc72317334 am 0944d625: Merge "Touch explorer and magnifier do not work well together." into jb-mr1-dev 
* commit '0944d625448209185452eb4e800daec49de51986':
  Touch explorer and magnifier do not work well together.
 2012-10-02 13:17:09 -07:00
Svetoslav Ganov
0944d62544 Merge "Touch explorer and magnifier do not work well together." into jb-mr1-dev 2012-10-02 13:14:06 -07:00
Kenny Root
f0771b192c am cee11240: am 07b4339b: Merge "Change androidfw tests to native test target" 
* commit 'cee1124052202c7f2a1956a54e5aa538d82197a7':
  Change androidfw tests to native test target
 2012-10-02 13:10:59 -07:00
Kenny Root
cee1124052 am 07b4339b: Merge "Change androidfw tests to native test target" 
* commit '07b4339b2a2f39c17194b21dc301c0c026a2f197':
  Change androidfw tests to native test target
 2012-10-02 13:08:45 -07:00
Raph Levien
912c37802c am ad3cc4bb: am 217ca3b0: Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." into jb-mr1-dev 
* commit 'ad3cc4bb5eda9b5c56a82e8da0ff3e286bd30cfe':
  Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry...
 2012-10-02 13:07:01 -07:00
Raph Levien
ad3cc4bb5e am 217ca3b0: Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." into jb-mr1-dev 
* commit '217ca3b0d310472e4df1aa4af72769d7c7a5becb':
  Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry...
 2012-10-02 13:04:52 -07:00
Raph Levien
217ca3b0d3 Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." into jb-mr1-dev 2012-10-02 13:02:31 -07:00
Raph Levien
832815cb53 Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry... 
This bug was triggered by user code concurrently mutating the character
array while calling into a drawText method in another thread. When the
value of the array changed, it caused inconsistent state, leading to
assert failures.

This is arguably bad behavior by the user code, but it shouldn't cause a
native crash. The fix is to do a defensive copy of the text into the
key, so the value is guaranteed to remain constant throughout the text
layout process. The change is mostly deletion of code, because there was
an optimization to try to avoid such a copy. That optimization was not
actually effective, however, because the indexOfKey() operation in the
KeyedVector underlying the TextLayoutCache did the copy anyway. Thus,
even though this change looks like it's introducing a copy where there
wasn't one before, the actual performance impact should be nil.

Note that the ability to handle a mutating argument is now part of the
contract for TextLayoutEngine::getValue(), and is now documented. That
contract may change, as the result of future optimization. Also, care
was taken to only use the value after the copy.

Other performance issues with TextLayoutCache are tracked in bug
7271109.

Change-Id: I9c90e8e4d501f3f37e2f22a7851f032808d46fbe
 2012-10-02 12:32:40 -07:00
Michael Jurka
7558d647ca am 5ead8e2e: am f175525b: Merge "Fix bug 7138446: Icon blips in during Recents animation" into jb-mr1-dev 
* commit '5ead8e2ede4333c184964997e6a5b3a1a8036d5c':
  Fix bug 7138446: Icon blips in during Recents animation
 2012-10-02 12:32:38 -07:00
Michael Jurka
5ead8e2ede am f175525b: Merge "Fix bug 7138446: Icon blips in during Recents animation" into jb-mr1-dev 
* commit 'f175525be4107649581259d04711f9ead905d447':
  Fix bug 7138446: Icon blips in during Recents animation
 2012-10-02 12:31:07 -07:00
Michael Jurka
841594b2db Fix jump cut when dismissing items in Recents 
(fixing horizontal scroll view in this CL... whoops).

Bug: 7070897
Change-Id: I3a63799ce7f3d9a50869755ee3289e641fa82fa4
 2012-10-02 21:30:35 +02:00
Michael Jurka
f175525be4 Merge "Fix bug 7138446: Icon blips in during Recents animation" into jb-mr1-dev 2012-10-02 12:28:38 -07:00