113463 Commits

Author SHA1 Message Date
Scott Main
9ecc29043f am da5d7027: am 5a99a702: am 4dfe8944: Merge "add docs about managing app memory" into jb-mr2-docs
* commit 'da5d7027a8905dd17f1cb8dd249d0d9320a97fec':
  add docs about managing app memory
2013-10-14 09:59:52 -07:00
Scott Main
da5d7027a8 am 5a99a702: am 4dfe8944: Merge "add docs about managing app memory" into jb-mr2-docs
* commit '5a99a7023ee5f8f054a9e8d10ed78e6c3f30a839':
  add docs about managing app memory
2013-10-14 09:57:11 -07:00
Scott Main
5a99a7023e am 4dfe8944: Merge "add docs about managing app memory" into jb-mr2-docs
* commit '4dfe894440f3b1af62df8e6cb74503c86519c74d':
  add docs about managing app memory
2013-10-14 09:52:07 -07:00
Scott Main
4dfe894440 Merge "add docs about managing app memory" into jb-mr2-docs 2013-10-14 16:49:11 +00:00
Craig Mautner
ea7c1e24a2 Merge "Add null check when determining mOnTopOfHome" into klp-dev 2013-10-14 16:38:48 +00:00
Baligh Uddin
2261bef330 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-14 16:22:50 +00: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
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
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
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
00f597bc3c Adding additional MNC overlays. (Bug 10518893)
Change-Id: I1c314c4e7ce7adf6f4a6f6722b51781f0ce7cd22
2013-10-13 23:42:59 -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
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
Craig Mautner
4ebe57804d Merge "Revert "Restore wallpaper positioning between apps."" into klp-dev 2013-10-14 01:25:27 +00: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
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
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
ef53fcc3ef Merge "Fix issue #11199654: Action bar enter animation skips frames when cleared by the system" into klp-dev 2013-10-13 23:04:13 +00:00
Dianne Hackborn
021d243d6d Fix issue #11199654: Action bar enter animation skips frames when cleared by the system
We have become too aggressive about not allowing windows to draw while windw
animations are running, basically not allowing any drawing in any window when
there is any window animation.  So if you did a relayout while the status bars
were being animated, your window would stop drawing until that status bar
animation was complete.

This change relaxes those rules in two ways:

- A particular window will only be told to stop updating when *it* is
  currently involved in a window animation.  So animations in status bars
  will not stop app windows from update, and vice versa.

- If a window receives input events while it is in the "do not update"
  state, we will immediately terminate that state and start allowing it to
  draw.  If the user is actually interacting with a window, we don't want
  to wait to show feedback.

Change-Id: I72574eec048aee53115b46a78686cf27f42c42f7
2013-10-13 15:56:29 -07:00
Jim Miller
103a734b66 Merge "Fix bug where lockout timeout is shown for SIM in keyguard" into klp-dev 2013-10-13 22:54:21 +00:00
Jim Miller
7fa498bf9b Merge "Disable the camera and search buttons while we're in bouncer mode." into klp-dev 2013-10-13 22:53:37 +00:00
Vineeta Srivastava
158aeaf088 Merge "telephony: redirect call barring MMI code to other purpose" into klp-dev 2013-10-13 22:52:03 +00:00
Aravind Akella
45ca531e77 Merge "Adding stepcounter & stepdetector feature strings." into klp-dev 2013-10-13 22:48:03 +00:00
duho.ro
23ee84ee5e telephony: redirect call barring MMI code to other purpose
Some operators redirect call barring MMI codes to other purpose.
For instance, *333# should be processed as USSD code with Indonesia
Axis SIM and Indonesia Hutchison SIM.  This change is adding an array
for call barring MMI code to config.xml. So, we can redefine the array
for redirecting the call barring MMI codes.

Bug: 10101303

Change-Id: Ib21540a90c64e105cd4bc1864238329d594cd056

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
2013-10-13 15:23:28 -07:00
John Spurlock
f732e37c19 Merge "If the panels are disabled, don't go opaque on interaction." into klp-dev 2013-10-13 22:10:31 +00:00
Victoria Lease
881e1a6b91 Merge "do not request location from unavailable providers" into klp-dev 2013-10-13 22:04:23 +00:00
Adam Powell
85e5ed639d Merge "Account for translationY when targeting the fast scroller via touch" into klp-dev 2013-10-13 21:26:35 +00:00
Jim Miller
39eaeb99c3 Merge "Update clock to use 14dp instead of 12dp for status info." into klp-dev 2013-10-13 21:24:42 +00:00
Jim Miller
94a52da03b Update clock to use 14dp instead of 12dp for status info.
Fixes bug 11195120

Change-Id: Ifa24ad80f64363e2cc815de67d2e99a27eef3425
2013-10-13 14:13:56 -07:00
Adam Powell
d827389684 Account for translationY when targeting the fast scroller via touch
Bug 11188512

Change-Id: Ia8e0088760a18d5862bbe1b904610abd908a190e
2013-10-13 13:35:27 -07:00
Daniel Sandler
ce6d9066b6 Merge "New window cling for immersive mode." into klp-dev 2013-10-13 19:30:29 +00:00
Daniel Sandler
e00ab01977 Merge "Easter egg cleanups." into klp-dev 2013-10-13 19:29:30 +00:00
Daniel Sandler
a953b6d968 New window cling for immersive mode.
Bug: 11077915
Change-Id: I6858259b31301b76dee81d3e6fbc534c1cdea661
2013-10-13 15:28:19 -04:00
Svetoslav Ganov
d914995aad Merge "Printing from secondary user not working." into klp-dev 2013-10-13 19:27:22 +00:00
Svetoslav Ganov
188d095381 Merge "The print dialog in bad state after pressing back from prnt to PDF." into klp-dev 2013-10-13 19:21:18 +00:00
Daniel Sandler
70966ec922 Easter egg cleanups.
Bug: 11171189
Bug: 10240151
Change-Id: Id5a8904bdf6c16302e09f2b48392f99c280a8179
2013-10-13 15:20:52 -04:00
Victoria Lease
b30f38383e do not request location from unavailable providers
This commit prevents a system_server crash when applications attempt
to use the fused location provider on systems that do not have a
network location provider available.

Bug: 10845061
Change-Id: I85b33806e05566e8b68ee2ccc401b1c565fd7b9a
2013-10-13 12:15:40 -07:00
Svetoslav Ganov
65d7b8d0db Merge "The list of active print jobs in print service retunring wrong result." into klp-dev 2013-10-13 19:10:12 +00:00
Adam Powell
18e1214790 Merge "Tighten up the KG transport control layout for stability" into klp-dev 2013-10-13 19:07:43 +00:00