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

115630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
ede9fb7a27 am 8ed80a44: (-s ours) am 5c364f3c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8ed80a44ba554b7d6ed50de8bfc30ceffe8c0690':
  Import translations. DO NOT MERGE
 2013-10-14 09:23:00 -07:00
Baligh Uddin
33dd283532 am f0264ab8: (-s ours) am a0aa64ac: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f0264ab8bcc540986d9019e246f3466082badd4c':
  Import translations. DO NOT MERGE
 2013-10-14 09:22:57 -07:00
Baligh Uddin
2261bef330 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-14 16:22:50 +00:00
Dirk Dougherty
50260360f4 am 86858479: am 00c5db05: Merge "Doc change: fix link to widgets design doc." into klp-dev 
* commit '86858479e53dc39bafce3be418b39e009df44783':
  Doc change: fix link to widgets design doc.
 2013-10-14 09:19:24 -07:00
Baligh Uddin
8ed80a44ba am 5c364f3c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5c364f3c1eba4f0c816cd88942ab5336aed1195d':
  Import translations. DO NOT MERGE
 2013-10-14 09:18:56 -07:00
Baligh Uddin
f0264ab8bc am a0aa64ac: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'a0aa64ac1b5652c3763c6cd58fa6d948dabc8f29':
  Import translations. DO NOT MERGE
 2013-10-14 09:18:52 -07:00
Baligh Uddin
d898bb0003 Import translations. DO NOT MERGE 
Change-Id: Ic05225f9a7ed59b8534c5637187ced07b660252a
Auto-generated-cl: translation import
 2013-10-14 09:16:10 -07:00
Dirk Dougherty
86858479e5 am 00c5db05: Merge "Doc change: fix link to widgets design doc." into klp-dev 
* commit '00c5db059645a8b9a0440097b53944b653d95373':
  Doc change: fix link to widgets design doc.
 2013-10-14 09:15:18 -07:00
Baligh Uddin
5c364f3c1e Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-14 16:14:24 +00:00
Baligh Uddin
a0aa64ac1b Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-14 16:14:14 +00:00
Baligh Uddin
831fa04f5a Import translations. DO NOT MERGE 
Change-Id: I7650da18d849d7ffbab92487bb2f79f32230b7c3
Auto-generated-cl: translation import
 2013-10-14 09:13:14 -07:00
Dirk Dougherty
00c5db0596 Merge "Doc change: fix link to widgets design doc." into klp-dev 2013-10-14 16:12:29 +00:00
Baligh Uddin
1a6f41c1bf Import translations. DO NOT MERGE 
Change-Id: I9a11931ae13cdda6647b145d2ceac071e5f05a54
Auto-generated-cl: translation import
 2013-10-14 09:11:11 -07:00
Daniel Sandler
3393e58d03 am 54d83daa: am 19e8273b: Merge "Don\'t show [!] battery at boot." into klp-dev 
* commit '54d83daa4fcd4794049f6ac5d8f5d27c3958dc6e':
  Don't show [!] battery at boot.
 2013-10-14 07:48:29 -07:00
Daniel Sandler
54d83daa4f am 19e8273b: Merge "Don\'t show [!] battery at boot." into klp-dev 
* commit '19e8273b1a58801778f07e4199d7accb0e5f0198':
  Don't show [!] battery at boot.
 2013-10-14 07:46:19 -07:00
Daniel Sandler
19e8273b1a Merge "Don't show [!] battery at boot." into klp-dev 2013-10-14 14:44:22 +00:00
Daniel Sandler
05021e5e47 Don't show [!] battery at boot. 
Defense in depth:
 1. If there's a sticky battery broadcast waiting around for
    us, apply its information immediately.
 2. If for some reason there is no battery information,
    just don't draw anything.

Bug: 11208146
Change-Id: I43e4b55a90a4ca619816ad0315e329f88b529581
 2013-10-14 10:27:45 -04:00
Craig Mautner
d99384d067 Add null check when determining mOnTopOfHome 
Fixes bug 11198896.

Change-Id: I7b35c8a7156f03f8dab0598b55ef327e593f6427
 2013-10-14 07:09:18 -07:00
Daniel Sandler
5fa473cd47 am 782dbb85: am 69f49434: Merge "Limit transient nav cling to 380dp on large/land devices." into klp-dev 
* commit '782dbb8580ba70c4d6d40b31e2a65665ebec9fee':
  Limit transient nav cling to 380dp on large/land devices.
 2013-10-14 06:56:34 -07:00
Daniel Sandler
782dbb8580 am 69f49434: Merge "Limit transient nav cling to 380dp on large/land devices." into klp-dev 
* commit '69f49434ec7240b3b1195b41348ddedba1bd1e98':
  Limit transient nav cling to 380dp on large/land devices.
 2013-10-14 06:53:26 -07:00
Daniel Sandler
69f49434ec Merge "Limit transient nav cling to 380dp on large/land devices." into klp-dev 2013-10-14 13:50:56 +00:00
Daniel Sandler
b83f5c6a42 Limit transient nav cling to 380dp on large/land devices. 
Bug: 11077915
Change-Id: I141a5f3f565109ae5ac9221053e5a4db36633ca7
 2013-10-14 09:26:43 -04:00
Winson Chung
c07f048dec am 4a913455: am 00f597bc: Adding additional MNC overlays. (Bug 10518893) 
* commit '4a913455e3b170c9ae6fa28dd74a11a7ab5a4d21':
  Adding additional MNC overlays. (Bug 10518893)
 2013-10-14 00:03:22 -07:00
Winson Chung
4a913455e3 am 00f597bc: Adding additional MNC overlays. (Bug 10518893) 
* commit '00f597bc3c27ed70e5c396722dc6c55f4e71f91f':
  Adding additional MNC overlays. (Bug 10518893)
 2013-10-14 00:01:55 -07:00
Winson Chung
00f597bc3c Adding additional MNC overlays. (Bug 10518893) 
Change-Id: I1c314c4e7ce7adf6f4a6f6722b51781f0ce7cd22
 2013-10-13 23:42:59 -07:00
Craig Mautner
10caa3b8b1 am d3b2fa49: am e1db0dd0: Test for task in front must include stack in front. 
* commit 'd3b2fa49492cfe0ee81f0a66887d1e79d3bf0d2d':
  Test for task in front must include stack in front.
 2013-10-13 19:26:52 -07:00
Craig Mautner
d3b2fa4949 am e1db0dd0: Test for task in front must include stack in front. 
* commit 'e1db0dd089456d80a2872fe1a12a179f39240aec':
  Test for task in front must include stack in front.
 2013-10-13 19:24:11 -07:00
Craig Mautner
e1db0dd089 Test for task in front must include stack in front. 
The CL that ensured that a dying task must be in front of the user
(ag/374996) only checked that the task was at the top of /a/ stack,
not on top of the frontmost stack. This checks the stack for being
frontmost before switching to home.

Fixes bug 11208762.

Change-Id: I43f6d380e7a880ec19db03711ada6c7437e15f73
 2013-10-14 02:20:57 +00:00
Adam Powell
5d96f61a92 am c12f46eb: am 5db566f1: Fix updating fast scroll state for data set changes 
* commit 'c12f46ebb9f93016ef11511a3e8038718a016beb':
  Fix updating fast scroll state for data set changes
 2013-10-13 19:04:50 -07:00
Adam Powell
c12f46ebb9 am 5db566f1: Fix updating fast scroll state for data set changes 
* commit '5db566f16a1b8f36e84a9be00cde40482d48466b':
  Fix updating fast scroll state for data set changes
 2013-10-13 19:01:56 -07:00
Adam Powell
5db566f16a Fix updating fast scroll state for data set changes 
Only looking for old/new count changes is incomplete with the current
state of things. The observer's onChanged method will update this in
some cases, stomping the different values needed to trigger a fast
scroller update. Also update the fast scroller if the data change flag
is set.

Also fix the positioning of the legacy text overlay.

Bug 11188512

Change-Id: I35b3915ce49f8494c6d82f6be6d6df7169deddd7
 2013-10-13 18:49:15 -07:00
Christopher Tate
0da1357f98 Log noisily on uid vs user-handle confusion in the settings provider 
Make sure that we catch any attempts to pass a uid to the settings
provider's "for this user" code paths.

Bug 11087584
Bug 11208808

Change-Id: I1cc025b2aade9072b4a61b4499d02c82b0085fa2
 2013-10-13 18:36:08 -07:00
Craig Mautner
59cd8d70dc am 5ab73bec: am 4ebe5780: Merge "Revert "Restore wallpaper positioning between apps."" into klp-dev 
* commit '5ab73becf7a6a8140ddd244edd0b4f0206f072ff':
  Revert "Restore wallpaper positioning between apps."
 2013-10-13 18:31:12 -07:00
Craig Mautner
5ab73becf7 am 4ebe5780: Merge "Revert "Restore wallpaper positioning between apps."" into klp-dev 
* commit '4ebe57804d1421daef81add365cd94a9a8183bc8':
  Revert "Restore wallpaper positioning between apps."
 2013-10-13 18:28:08 -07:00
Craig Mautner
4ebe57804d Merge "Revert "Restore wallpaper positioning between apps."" into klp-dev 2013-10-14 01:25:27 +00:00
Jim Miller
7c4f3b8134 am a55feec8: am f89ff85f: Merge "Hide the camera and search icons when switching to the camera page" into klp-dev 
* commit 'a55feec8d2c982628a7357fcfbfb0102aa693771':
  Hide the camera and search icons when switching to the camera page
 2013-10-13 17:49:03 -07:00
Jim Miller
a55feec8d2 am f89ff85f: Merge "Hide the camera and search icons when switching to the camera page" into klp-dev 
* commit 'f89ff85f6c408df6da8eea0fa9dc602352b3a4e4':
  Hide the camera and search icons when switching to the camera page
 2013-10-13 17:46:10 -07:00
Jim Miller
f89ff85f6c Merge "Hide the camera and search icons when switching to the camera page" into klp-dev 2013-10-14 00:44:13 +00:00
Jim Miller
fadccf1d0e Hide the camera and search icons when switching to the camera page 
Partial fix for bug 11190737

Change-Id: I8b14a0b32cec51fe381f8ef110a13623d8324938
 2013-10-13 17:26:39 -07:00
Jim Miller
91feb766f9 am 43b0ce62: am 05da3280: Merge "Fix warp animation in keyguard" into klp-dev 
* commit '43b0ce62c8322f2d4d3cd9946083968a0f14102c':
  Fix warp animation in keyguard
 2013-10-13 17:12:06 -07:00
Jim Miller
43b0ce62c8 am 05da3280: Merge "Fix warp animation in keyguard" into klp-dev 
* commit '05da328078b71f4aa9a42552f9c2b6713010686e':
  Fix warp animation in keyguard
 2013-10-13 17:09:23 -07:00
Jim Miller
05da328078 Merge "Fix warp animation in keyguard" into klp-dev 2013-10-14 00:06:49 +00:00
Jim Miller
afef5b23a1 Fix warp animation in keyguard 
This fixes a problem where the warp page was remaining onscreen due to a
race between the animation completing and releasing the finger.  The fix
is to track when the page is onscreen or when the warp is still animating
to ensure we hide it when we're done.

Change-Id: Ie53c65d276032da16cd42ec84b23ae812fc7e2eb
 2013-10-13 17:02:11 -07:00
John Spurlock
af97c1fc9c am 5ca56cb9: am 1ae1373a: Merge "Wire up new hideycling ok button to persist setting." into klp-dev 
* commit '5ca56cb9c9c8c770f58299f193e8e6497593b095':
  Wire up new hideycling ok button to persist setting.
 2013-10-13 16:33:53 -07:00
John Spurlock
5ca56cb9c9 am 1ae1373a: Merge "Wire up new hideycling ok button to persist setting." into klp-dev 
* commit '1ae1373aeddbd5f3e090db8d5862a22eab0e4ed6':
  Wire up new hideycling ok button to persist setting.
 2013-10-13 16:30:21 -07:00
John Spurlock
1ae1373aed Merge "Wire up new hideycling ok button to persist setting." into klp-dev 2013-10-13 23:27:20 +00:00
John Spurlock
47e3de2baa Wire up new hideycling ok button to persist setting. 
Otherwise you'll see it every time.

Bug:11077915
Change-Id: I2ec725459f6ec133c1b82e9788a80dede6e87343
 2013-10-13 19:20:04 -04:00
Craig Mautner
7c495cbf68 Revert "Restore wallpaper positioning between apps." 
This reverts commit faf1a40382b61d9cabab82e6e835603511046564.

Bug 10932680 is back where it was.

Change-Id: I5058db837941769f25f09e3fafd9c19ef370df8e
 2013-10-13 23:19:45 +00:00
Dianne Hackborn
f2896e2897 am 9e4403d4: am ef53fcc3: Merge "Fix issue #11199654: Action bar enter animation skips frames when cleared by the system" into klp-dev 
* commit '9e4403d4c676d5c97f39ab4fb2debf1ca2d060ec':
  Fix issue #11199654: Action bar enter animation skips frames when cleared by the system
 2013-10-13 16:09:25 -07:00
Dianne Hackborn
9e4403d4c6 am ef53fcc3: Merge "Fix issue #11199654: Action bar enter animation skips frames when cleared by the system" into klp-dev 
* commit 'ef53fcc3efca382f17cc23dfda6d91b901941173':
  Fix issue #11199654: Action bar enter animation skips frames when cleared by the system
 2013-10-13 16:06:23 -07:00