Nick Pelly
2ebd25368a
am da58f393: am bfd125a0: Merge "Fix NPE when public API removeProximityAlert() used before addProximityAlert()." into jb-dev
...
* commit 'da58f39374a716dedc7c4050755b711a9a6bfcf5':
Fix NPE when public API removeProximityAlert() used before addProximityAlert().
2012-06-14 10:34:31 -07:00
Craig Mautner
9d909d31b3
am 129167cf: am 4323d6ea: Merge "Do not hide animating window behind keyguard." into jb-dev
...
* commit '129167cfe641c505fcea6c37a1ed086bbeadf8c1':
Do not hide animating window behind keyguard.
2012-06-14 10:33:11 -07:00
Craig Mautner
0b73f8fbc6
am 719c139d: am f8d05b4e: Merge "Update wallpaper visibility at time of hide/show." into jb-dev
...
* commit '719c139d03c6af0deda004095c6ef9131c4e6be0':
Update wallpaper visibility at time of hide/show.
2012-06-14 10:32:53 -07:00
Winson Chung
58c35bbe34
Merge "Updating AppWidgetHost to receive a callback when any appWidget has changed. (Bug 6602951)"
2012-06-14 10:30:34 -07:00
Nick Pelly
da58f39374
am bfd125a0: Merge "Fix NPE when public API removeProximityAlert() used before addProximityAlert()." into jb-dev
...
* commit 'bfd125a0bf51ce0931d981d7694432868b9f511f':
Fix NPE when public API removeProximityAlert() used before addProximityAlert().
2012-06-14 08:36:30 -07:00
Nick Pelly
bfd125a0bf
Merge "Fix NPE when public API removeProximityAlert() used before addProximityAlert()." into jb-dev
2012-06-14 08:34:13 -07:00
Nick Pelly
01ed75c82f
Fix NPE when public API removeProximityAlert() used before addProximityAlert().
...
Bug: 6313992
Change-Id: I905ad9ea771286727ce4a3a2334f2a0dac967c3d
2012-06-13 16:45:27 -07:00
Craig Mautner
129167cfe6
am 4323d6ea: Merge "Do not hide animating window behind keyguard." into jb-dev
...
* commit '4323d6ea5143a3f2c419b3db28f956755652d78a':
Do not hide animating window behind keyguard.
2012-06-13 15:36:51 -07:00
Winson Chung
7fbd28438c
Updating AppWidgetHost to receive a callback when any appWidget has changed. (Bug 6602951)
...
Change-Id: I76d688b10ee7775b4ebe81259713f2aaf0009d05
2012-06-13 15:29:19 -07:00
Craig Mautner
4323d6ea51
Merge "Do not hide animating window behind keyguard." into jb-dev
2012-06-13 15:27:51 -07:00
Craig Mautner
719c139d03
am f8d05b4e: Merge "Update wallpaper visibility at time of hide/show." into jb-dev
...
* commit 'f8d05b4ea61bb0db32c1a7f93f27a13f67c9ef0c':
Update wallpaper visibility at time of hide/show.
2012-06-13 14:16:49 -07:00
Craig Mautner
f8d05b4ea6
Merge "Update wallpaper visibility at time of hide/show." into jb-dev
2012-06-13 14:09:08 -07:00
Jeff Sharkey
4ab3cd8c31
am ba55c5c5: am 96321890: Merge "Clear identity when snoozing limit." into jb-dev
...
* commit 'ba55c5c57964b1ba126496e8d903d26ab4be1f15':
Clear identity when snoozing limit.
2012-06-13 12:24:31 -07:00
Jeff Sharkey
ba55c5c579
am 96321890: Merge "Clear identity when snoozing limit." into jb-dev
...
* commit '963218905ab31ccd2cf7ff57d372b185624543a4':
Clear identity when snoozing limit.
2012-06-13 12:10:41 -07:00
Jeff Sharkey
963218905a
Merge "Clear identity when snoozing limit." into jb-dev
2012-06-13 12:06:10 -07:00
Craig Mautner
507a2ee12b
Update wallpaper visibility at time of hide/show.
...
Call the Window client method dispatchAppVisibility when hiding or
showing wallpaper rather than wait until the next call to
performLayoutAndPlaceSurfaces.
Fixes bug 6645473.
Change-Id: I363f69f8db0affff92308e11ce52546401959d8f
2012-06-13 08:39:38 -07:00
Jeff Sharkey
6c0b4f393a
Clear identity when snoozing limit.
...
Continues to check MANAGE_NETWORK_POLICY permission. This allows
SystemUI to invoke snoozeLimit() without CONNECTIVITY_INTERNAL.
Bug: 6653091
Change-Id: I464bf62b79f2647c6b6db151251a0036897d0cc0
2012-06-12 21:06:30 -07:00
Craig Mautner
2ec541fa4b
Do not hide animating window behind keyguard.
...
The transition from clock to keyguard when restarting the device
was janky. The cause was that the clock app was animating away
which kept the adjustWallpaperWindowsLocked() method from setting
the keyguard as the new mWallpaperTarget. At the same time the
WindowAnimator saw that the keyguard was readyToDisplay() which
set mForceHiding true causing the clock to become hidden. Since
the clock was mWallpaperTarget the wallpaper was hidden at the
same time.
This fix does not allow mForceHiding to hide an animating
window.
Fixes bug 6649988.
Change-Id: Ie5cb0dfcc987d5ee1ad2351cf520629b8e301a2b
2012-06-12 19:18:21 -07:00
Craig Mautner
9132c25d22
am 1d48ca51: am 1c958102: Merge "Set detached wallpaper on the scale up animation." into jb-dev
...
* commit '1d48ca51de63c43f57ece57aed43a4aa7ce31756':
Set detached wallpaper on the scale up animation.
2012-06-12 19:10:52 -07:00
Craig Mautner
1d48ca51de
am 1c958102: Merge "Set detached wallpaper on the scale up animation." into jb-dev
...
* commit '1c9581023ced89a209fca9c4e40305f8e0859732':
Set detached wallpaper on the scale up animation.
2012-06-12 19:06:46 -07:00
Craig Mautner
1c9581023c
Merge "Set detached wallpaper on the scale up animation." into jb-dev
2012-06-12 19:04:01 -07:00
Jeff Sharkey
554259fe02
am 9eabf916: am f6f7f1d2: Low disk space string change, surface state.
...
* commit '9eabf916dc5d53bc6c765d39cca0847993e73dcf':
Low disk space string change, surface state.
2012-06-12 18:40:24 -07:00
Jeff Sharkey
9eabf916dc
am f6f7f1d2: Low disk space string change, surface state.
...
* commit 'f6f7f1d2dc6e8fad5d6ff9a56af9929488873b4f':
Low disk space string change, surface state.
2012-06-12 18:36:07 -07:00
Amith Yamasani
b8151ecd6e
Add an icon to the user information.
...
Store the icon in the user folder under /data/system,
similar to how the wallpaper is stored.
Change-Id: Id8ccb55b9e2ba7b4c557505a7f69f04eca1518cf
2012-06-12 18:18:29 -07:00
Jeff Sharkey
f6f7f1d2dc
Low disk space string change, surface state.
...
Surface current low disk state through IPackageManager for use in
Settings app.
Bug: 6576409
Change-Id: I9ae9ce99a2faa3015a237036c03567d1ae11628f
2012-06-12 17:12:08 -07:00
Craig Mautner
7dc4c08495
am 12f0104e: am 4d6a0df3: Merge "Do not cancel animations when switching." into jb-dev
...
* commit '12f0104ec729346d078a0afc9a79ab9fc023cce0':
Do not cancel animations when switching.
2012-06-12 15:52:31 -07:00
Craig Mautner
a803371535
Set detached wallpaper on the scale up animation.
...
This keeps the background wallpaper from disappearing when expanding an
app that has a wallpaper background (e.g. clock).
Fixes bug 6649988. The second half of the bug, the first half will be
reissued as a new bug.
Change-Id: I209c9038469e4133586a927c92ef64ae43fb937f
2012-06-12 15:50:45 -07:00
Craig Mautner
12f0104ec7
am 4d6a0df3: Merge "Do not cancel animations when switching." into jb-dev
...
* commit '4d6a0df37930309f8e138499785483d9dcadf7d9':
Do not cancel animations when switching.
2012-06-12 15:48:34 -07:00
Craig Mautner
4d6a0df379
Merge "Do not cancel animations when switching." into jb-dev
2012-06-12 15:45:37 -07:00
Christopher Tate
e9f6b86d1c
am 4d3448db: am 4cabbef8: Merge "Make sure to stop noHistory="true" activities properly" into jb-dev
...
* commit '4d3448db54e274b8c5f10ddef204882320e631ec':
Make sure to stop noHistory="true" activities properly
2012-06-12 14:53:00 -07:00
Christopher Tate
4d3448db54
am 4cabbef8: Merge "Make sure to stop noHistory="true" activities properly" into jb-dev
...
* commit '4cabbef8266c909997cf608d008920f5a2f49937':
Make sure to stop noHistory="true" activities properly
2012-06-12 13:41:31 -07:00
Christopher Tate
4cabbef826
Merge "Make sure to stop noHistory="true" activities properly" into jb-dev
2012-06-12 13:38:56 -07:00
Christopher Tate
5007ddded6
Make sure to stop noHistory="true" activities properly
...
The code was correctly inducing a 'finish' when such an activity was
being stopped, but then was not continuing with the rest of the stop
bookkeeping at that point. In some circumstances this could result
in an inconsistent state, with the activity marked as finishing but
neither in the foreground nor stopped.
Bug 6585403
Change-Id: Ib5c5be885bc6534e099e040d87a8589f7b7454ce
2012-06-12 13:08:18 -07:00
Craig Mautner
adda220b18
am 42db9369: am 78a9b676: Merge "Remove over aggressive optimization." into jb-dev
...
* commit '42db93691896740e47918e212bed7668464a3b9d':
Remove over aggressive optimization.
2012-06-12 13:00:57 -07:00
Craig Mautner
30dd205a6b
am 1c92459a: am 16a61a51: Merge "Revert "Merge errors."" into jb-dev
...
* commit '1c92459a50c6b60550ffd4fceaa2fabeb5418ada':
Revert "Merge errors."
2012-06-12 13:00:53 -07:00
Craig Mautner
fbec92ca1a
am d5759f1c: am 73220fa0: Merge "Merge errors." into jb-dev
...
* commit 'd5759f1c2c8038d6c8275b1ba7dc93a40763088c':
Merge errors.
2012-06-12 13:00:50 -07:00
Michael Jurka
c528b7199a
am 823e2028: am 64dbcd64: Merge "Tweak recents out animation a bit more" into jb-dev
...
* commit '823e20284588f785b96764ba24efb7b8f63895d7':
Tweak recents out animation a bit more
2012-06-12 13:00:43 -07:00
Craig Mautner
69d00187c1
am 0721bde2: am 47adf865: Merge "Fix exposing wallpaper on rotations and other." into jb-dev
...
* commit '0721bde26c73861bb40a5732cb63741d13776e36':
Fix exposing wallpaper on rotations and other.
2012-06-12 13:00:19 -07:00
Chia-chi Yeh
7c727e50f1
am a2becffc: am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev
...
* commit 'a2becffcf2a19889b90256a8479e276081ce6108':
VPN: move VpnDialogs away from system uid.
2012-06-12 12:59:59 -07:00
Craig Mautner
42db936918
am 78a9b676: Merge "Remove over aggressive optimization." into jb-dev
...
* commit '78a9b67691d08e7347ab7bed7708fa09680ee71f':
Remove over aggressive optimization.
2012-06-12 12:43:33 -07:00
Craig Mautner
1c92459a50
am 16a61a51: Merge "Revert "Merge errors."" into jb-dev
...
* commit '16a61a51ffdf0490d3fd201c8679a990723f7d8e':
Revert "Merge errors."
2012-06-12 12:43:29 -07:00
Craig Mautner
d5759f1c2c
am 73220fa0: Merge "Merge errors." into jb-dev
...
* commit '73220fa083f6b2b302434ad081dd062505744ed8':
Merge errors.
2012-06-12 12:43:26 -07:00
Michael Jurka
823e202845
am 64dbcd64: Merge "Tweak recents out animation a bit more" into jb-dev
...
* commit '64dbcd64be34f83e51229891da865ca047b4f5f4':
Tweak recents out animation a bit more
2012-06-12 12:43:17 -07:00
Craig Mautner
0721bde26c
am 47adf865: Merge "Fix exposing wallpaper on rotations and other." into jb-dev
...
* commit '47adf865bddf6c81051d457e04785408d2710f60':
Fix exposing wallpaper on rotations and other.
2012-06-12 12:41:50 -07:00
Chia-chi Yeh
a2becffcf2
am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev
...
* commit 'd667aebfb34085960e2b41a2f52d10ae749ec44c':
VPN: move VpnDialogs away from system uid.
2012-06-12 12:41:12 -07:00
Craig Mautner
9fec779587
Do not cancel animations when switching.
...
Was canceling ongoing animations when starting a new animation which
caused the window of the first animation to restart. This looked
janky. The original cancellation was put in to stop the incorrect
animation being selected when quickly switching between an incoming
app and the homescreen. Reversing the cancellation no longer exposes
the original problem it was put in to fix.
One way to duplicate what this is fixing.
1. Slow down animations to 10x.
2. Run ApiDemos/App/Alert Dialogs/List dialog
3. Tap outside the list dialog and then tap the home button.
Tapping outside the list dialog causes the list dialog to animate
away. Tapping the home button then causes the app to animate away.
Before this fix the list dialog would revert to full size before
the app animates away. With this fix the list dialog continues its
original animation as the app animates away.
Fixes bug 6600726.
Change-Id: I29c940254808a321c3b6c2e4f4b7c78a72b47899
2012-06-12 11:13:41 -07:00
Dianne Hackborn
0ed6f9a01f
am 3430959c: am 569f5bdd: am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread"
...
* commit '3430959c4dce7ff5e4a8bac2f9e1c3f3a8307079':
SystemServer: Looper's getMainLooper to return ServerThread
2012-06-11 16:41:24 -07:00
Dianne Hackborn
3430959c4d
am 569f5bdd: am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread"
...
* commit '569f5bddd2494bdeae07a6b278f6df6cc8579981':
SystemServer: Looper's getMainLooper to return ServerThread
2012-06-11 16:36:52 -07:00
Craig Mautner
0fa77c1e0f
Remove over aggressive optimization.
...
It turns out that sometimes the wallpaper target is migrated to the
bottom of the window stack and then mWallpaperTarget is set to null.
In particular this happens when the launcher all-apps screen is
brought up. When this happens the layer of the wallpaper is
correctly set below the previous wallpaper target.
An optimization in WindowAnimator was keeping the layer update from
propagating to the Surface object. This fix removes that optimization.
Fixes bug 6631717.
Change-Id: I800dd043ce8df83b4e5edbf710503135396bc01e
2012-06-11 16:30:48 -07:00
Craig Mautner
c38869abe5
Revert "Merge errors."
...
This reverts commit b0419a52008e57475ee254def1da20451da22d4c.
2012-06-11 16:30:48 -07:00