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

115400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jim Miller
5117168815 am 7f210cbb: am 103a734b: Merge "Fix bug where lockout timeout is shown for SIM in keyguard" into klp-dev 
* commit '7f210cbbea61bae3c70e230d84fdae4f1f9d00b3':
  Fix bug where lockout timeout is shown for SIM in keyguard
 2013-10-13 16:02:29 -07:00
Jim Miller
8360bde120 am d04244d4: am 7fa498bf: Merge "Disable the camera and search buttons while we\'re in bouncer mode." into klp-dev 
* commit 'd04244d482b3062b1790a636779785a50243b4cc':
  Disable the camera and search buttons while we're in bouncer mode.
 2013-10-13 16:02:26 -07:00
Vineeta Srivastava
9d325d3339 am b2fc8791: am 158aeaf0: Merge "telephony: redirect call barring MMI code to other purpose" into klp-dev 
* commit 'b2fc8791186589e531bcff42fd275f4f8372a399':
  telephony: redirect call barring MMI code to other purpose
 2013-10-13 16:02:23 -07:00
Jim Miller
7f210cbbea am 103a734b: Merge "Fix bug where lockout timeout is shown for SIM in keyguard" into klp-dev 
* commit '103a734b66b797e58d7d77a8fef6a68b53428930':
  Fix bug where lockout timeout is shown for SIM in keyguard
 2013-10-13 15:57:15 -07:00
Jim Miller
d04244d482 am 7fa498bf: Merge "Disable the camera and search buttons while we\'re in bouncer mode." into klp-dev 
* commit '7fa498bf9bec98a4462c15eb10d5fd0e3c01d3bd':
  Disable the camera and search buttons while we're in bouncer mode.
 2013-10-13 15:57:12 -07:00
Vineeta Srivastava
b2fc879118 am 158aeaf0: Merge "telephony: redirect call barring MMI code to other purpose" into klp-dev 
* commit '158aeaf0884701d071f9929574e8626111556554':
  telephony: redirect call barring MMI code to other purpose
 2013-10-13 15:57:09 -07: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
Aravind Akella
67af9ce31e am c73810de: am 45ca531e: Merge "Adding stepcounter & stepdetector feature strings." into klp-dev 
* commit 'c73810de2fa9184d808719ccdfe5f1a8b9864135':
  Adding stepcounter & stepdetector feature strings.
 2013-10-13 15:55:32 -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
c73810de2f am 45ca531e: Merge "Adding stepcounter & stepdetector feature strings." into klp-dev 
* commit '45ca531e77c6f12062bfa7f3e369172582caebe6':
  Adding stepcounter & stepdetector feature strings.
 2013-10-13 15:50:07 -07: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
d428d64387 am 45d41eba: am f732e37c: Merge "If the panels are disabled, don\'t go opaque on interaction." into klp-dev 
* commit '45d41eba7a36b865a04b6e99b3826bc92dec5cd1':
  If the panels are disabled, don't go opaque on interaction.
 2013-10-13 15:16:29 -07:00
John Spurlock
45d41eba7a am f732e37c: Merge "If the panels are disabled, don\'t go opaque on interaction." into klp-dev 
* commit 'f732e37c1911831a8d26fd228a00063b9b489a42':
  If the panels are disabled, don't go opaque on interaction.
 2013-10-13 15:13:11 -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
7831fd2fdb am 7d3fb2d6: am 881e1a6b: Merge "do not request location from unavailable providers" into klp-dev 
* commit '7d3fb2d6c5539226a3adcd20cee48177dd8dc571':
  do not request location from unavailable providers
 2013-10-13 15:07:51 -07:00
Victoria Lease
7d3fb2d6c5 am 881e1a6b: Merge "do not request location from unavailable providers" into klp-dev 
* commit '881e1a6b9101175efd027bcf3587c9f9c1dfbfaa':
  do not request location from unavailable providers
 2013-10-13 15:06:30 -07: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
6a564f9616 am 7555372f: am 85e5ed63: Merge "Account for translationY when targeting the fast scroller via touch" into klp-dev 
* commit '7555372f019b06f8849e3e56e6921e505592fe23':
  Account for translationY when targeting the fast scroller via touch
 2013-10-13 14:33:04 -07:00
Adam Powell
7555372f01 am 85e5ed63: Merge "Account for translationY when targeting the fast scroller via touch" into klp-dev 
* commit '85e5ed639d58da0ea4fea0b523169fa0f7e81c51':
  Account for translationY when targeting the fast scroller via touch
 2013-10-13 14:30:28 -07:00
Jim Miller
c57b943044 am 0cdab579: am 39eaeb99: Merge "Update clock to use 14dp instead of 12dp for status info." into klp-dev 
* commit '0cdab579a44fdb8900b7490b1d9816f0970c6ebb':
  Update clock to use 14dp instead of 12dp for status info.
 2013-10-13 14:29:34 -07:00
Jim Miller
0cdab579a4 am 39eaeb99: Merge "Update clock to use 14dp instead of 12dp for status info." into klp-dev 
* commit '39eaeb99c35e8d09ef27d040bf49436d13899a16':
  Update clock to use 14dp instead of 12dp for status info.
 2013-10-13 14:26:41 -07: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