Alan Viverette
4ecb5fb288
am 82bdfcfa: Update docs for Window.setElevation(), apply changes immediately automerge: 71922de
...
* commit '82bdfcfadc17b8467a0e3c50843997e7957a9452':
Update docs for Window.setElevation(), apply changes immediately
2015-01-13 02:24:11 +00:00
Alan Viverette
82bdfcfadc
Update docs for Window.setElevation(), apply changes immediately
...
automerge: 71922de
* commit '71922de6c8e407ff24bb1a500cb53bb1a647c758':
Update docs for Window.setElevation(), apply changes immediately
2015-01-13 02:16:32 +00:00
Alan Viverette
71922de6c8
Update docs for Window.setElevation(), apply changes immediately
...
BUG: 18983689
Change-Id: I471104092d6296dc0ba2689da96783be088fbce8
2015-01-12 16:14:02 -08:00
Wale Ogunwale
00c8565614
am 42b0d10a: am 1ea6afe1: Merge "Don\'t allow windows with invalid types to be added." into lmp-mr1-dev
...
* commit '42b0d10a83dae285a3d3af9911aa35a90db203d0':
Don't allow windows with invalid types to be added.
2015-01-12 22:22:05 +00:00
Wale Ogunwale
42b0d10a83
am 1ea6afe1: Merge "Don\'t allow windows with invalid types to be added." into lmp-mr1-dev
...
* commit '1ea6afe1234b04de0f5b3f9ac5802b1c6d42e8ac':
Don't allow windows with invalid types to be added.
2015-01-12 22:15:58 +00:00
Wale Ogunwale
74bf065e43
Don't allow windows with invalid types to be added.
...
Bug: 18950225
Change-Id: Ia7ead72d036c7628e0a97f8fe9fef2a35525e4df
2015-01-12 14:01:25 -08:00
Olawale Ogunwale
59820738fd
am d8aa4660: am da90a9c2: Merge "Do not allow the navigation bar to move if width == height"
...
* commit 'd8aa4660b02b8a4a51e3ddbd347c306c41339576':
Do not allow the navigation bar to move if width == height
2015-01-06 16:56:46 +00:00
Devin Kim
d7b12b44db
Do not allow the navigation bar to move if width == height
...
If width == height and mNavigationBarCanMove is true, the navigation bar
doesn't shows properly. Because wm doesn't know if the device is in landscape
mode or portrait mode.
Change-Id: I2077eacae50e6e498767f5c93b697e0459ad07fe
Signed-off-by: Devin Kim <dojip.kim@lge.com>
2015-01-03 14:09:19 -08:00
Olawale Ogunwale
424924afc1
am f62877d3: Merge "Prevent wrong system ui visibility callback after the user swipe"
...
automerge: fd7819d
* commit 'fd7819dbe0cf2cef9c03b2c4b04a92f0a2a36604':
Prevent wrong system ui visibility callback after the user swipe
2014-12-17 21:51:40 +00:00
Olawale Ogunwale
f62877d305
Merge "Prevent wrong system ui visibility callback after the user swipe"
2014-12-17 21:43:27 +00:00
Yorke Lee
41a42c73e6
am 50d8e5b0: am d3836e9d: Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev
...
* commit '50d8e5b0c067a532f893889ce58125233a12f7fc':
Revert "Allow home to be pressed while in incoming call screen"
2014-12-17 00:38:58 +00:00
Yorke Lee
50d8e5b0c0
am d3836e9d: Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev
...
* commit 'd3836e9df4ee0b22dd115e96abe976730263129d':
Revert "Allow home to be pressed while in incoming call screen"
2014-12-17 00:30:26 +00:00
Yorke Lee
d3836e9df4
Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev
2014-12-17 00:17:02 +00:00
Yorke Lee
4f80324540
Revert "Allow home to be pressed while in incoming call screen"
...
This reverts commit ad84e0637f43311a05e894393be6538909b937fb.
Bug: 18742942
Change-Id: I6c0a1651526a37cca8e27be9fbd36a2f59943366
2014-12-15 23:22:06 +00:00
Jorim Jaggi
4800de0f7c
am 93c736b3: am 613fffcd: Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev
...
* commit '93c736b3daa9b715814dd20892c1f41b5348f575':
Revert "Revert "Attempt to fix keyguard missing bug""
2014-12-15 22:41:50 +00:00
Jorim Jaggi
93c736b3da
am 613fffcd: Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev
...
* commit '613fffcd0f17eecb0231fe24f7abf7936eef8d37':
Revert "Revert "Attempt to fix keyguard missing bug""
2014-12-15 22:35:56 +00:00
Jim Miller
a8800f7c27
Revert "Revert "Attempt to fix keyguard missing bug""
...
This reverts commit 1991590ddd0ca6d3a0cac290b65120c147034dbc
and fixes a bug where we were showing the scrim on devices without keyguard.
Bug: 18468369
Change-Id: Idce1370dadacd09c4a8f1a7fd9728c23b218d19c
2014-12-15 20:12:09 +01:00
Tim Kilbourn
d314333341
am d91985cd: am 2636ccc1: Merge "Revert "Attempt to fix keyguard missing bug"" into lmp-mr1-dev
...
* commit 'd91985cd4306ad3d9f422a7392bc8513f6c59e07':
Revert "Attempt to fix keyguard missing bug"
2014-12-12 18:57:25 +00:00
Tim Kilbourn
d91985cd43
am 2636ccc1: Merge "Revert "Attempt to fix keyguard missing bug"" into lmp-mr1-dev
...
* commit '2636ccc1857264a76db8ddaee600f06fadad3c36':
Revert "Attempt to fix keyguard missing bug"
2014-12-12 18:50:10 +00:00
Tim Kilbourn
1991590ddd
Revert "Attempt to fix keyguard missing bug"
...
This reverts commit a5faf2415d5760d2239f85271b889d655b5c271b.
It prevents the launcher from showing up on Android TV.
Bug: 18724479
2014-12-12 18:33:16 +00:00
Jim Miller
69935f9a05
am 4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev
...
automerge: 0ca6b7f
* commit '0ca6b7f98085c079ccfb4b799fba5f570380a827':
Attempt to fix keyguard missing bug
2014-12-12 04:29:11 +00:00
Jim Miller
0ca6b7f980
am 4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev
...
* commit '4841a787b3380ba045a465e347668729b19f3d79':
Attempt to fix keyguard missing bug
2014-12-11 23:41:03 +00:00
Jim Miller
a5faf2415d
Attempt to fix keyguard missing bug
...
This attempts to fix a bug where the device sometimes shows the home screen
before keyguard starts. The fix ensures we show the scrim when KeyguardServiceDelegate
is created and stays there until KeyguardService connects.
Fixes bug 18468369
Change-Id: Ib560889663c0c4dd84135d949fefc2b9819ce9a1
2014-12-10 15:59:43 -08:00
Craig Mautner
62a7022f7d
am 56f10c26: am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev
...
* commit '56f10c2685dd6f69c57744896e9bc7db129da447':
Handle keyguard dismiss flags correctly
2014-12-03 20:43:40 +00:00
Craig Mautner
56f10c2685
am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev
...
* commit 'a9355bd1c5d80777172103bd4e694972fedf8e54':
Handle keyguard dismiss flags correctly
2014-12-03 19:49:46 +00:00
Craig Mautner
192d60488f
Handle keyguard dismiss flags correctly
...
When FLAG_SHOW_WHEN_LOCKED was set over an unsecure lockscreen the
behavior was incorrect. In such cases the lockscreen was not being
dismissed with or without FLAG_DISMISS_KEYGUARD. This change causes
the lockscreen to be dismissed when FLAG_SHOW_WHEN_LOCKED is set
over an insecure logckscreen.
Fixes bug 18563298.
Change-Id: Iba0d096a59789bf41332e109f1bd3e70834bbb83
2014-12-02 23:24:48 -08:00
Craig Mautner
61a7b7cff5
am e4e7d2cd: am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev
...
* commit 'e4e7d2cdf40407240d63ef4f0a3249e726a1d632':
Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED
2014-12-02 21:27:23 +00:00
Craig Mautner
e4e7d2cdf4
am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev
...
* commit '41ec0400056daa97d40bd4a8225b7d4f0d665598':
Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED
2014-12-02 21:20:17 +00:00
Craig Mautner
ca0a124da0
Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED
...
Windows that had FLAG_SHOW_WHEN_LOCKED and FLAG_DISMISS_KEYGUARD set
would ignore the FLAG_DISMISS_KEYGUARD if the lockscreen was
insecure. This change adds a test for insecure keyguards when the
two flags are set together.
Fixes bug 18563298.
Change-Id: I3027c7ec476d3ac15978f7e6a78b3c2050cbab02
2014-12-02 12:43:18 -08:00
Craig Mautner
0124980e9f
resolved conflicts for merge of 082c0540 to lmp-mr1-dev-plus-aosp
...
Change-Id: I93543a420eba5c6ae860a81a9afd9a2189d88903
2014-11-30 21:16:39 -08:00
Jorim Jaggi
f1e6d2315e
am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev
...
* commit 'c5c2e53779c2c2b6d889bdad5d11d47da9e72789':
Make IKeyguardService interface asynchronous
2014-11-26 18:43:47 +00:00
Jorim Jaggi
d9b91d0d49
resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev
...
Change-Id: I194616c947a3366911e932f4c7111097d3767db3
2014-11-26 15:17:14 +01:00
Jim Miller
ab954546dc
Make IKeyguardService interface asynchronous
...
Add a state callback so lockscreen reports back whenever its state
relevant for PhoneWindowManager changed, instead of synchronously
calling into SysUI which can lead to deadlocks. Directly use
LockPatternUtils for isSecure, and optimize the number of calls to
this method to optimize layout performance.
Bug: 17677097
Change-Id: I5d491fc8884d4f84d9562626b9ea0d5eaa5166fc
2014-11-25 23:22:52 +01:00
tiger_huang
1b33b49723
Prevent showing immersive confirmation unexpectedly
...
By design, if the user presses the power key twice within 5 seconds
(panic), it will show immersive confirmation again at the next time
entering immersive mode.
But there is a bug on calculating the time between pressing the power
key. The time get from event.getDownTime() will stop when the device
is sleeping without being charged.
So here uses SystemClock.elapsedRealtime() instead.
https://code.google.com/p/android/issues/detail?id=80772
Change-Id: I4dca9dc260904f1c5b60464834781e2a82a9bcf4
2014-11-25 12:29:37 +00:00
tiger_huang
c58d756f87
Prevent wrong system ui visibility callback after the user swipe
...
If we return vis without clearing clearable flags, it will be set to
IStatusBarService in updateSystemUiVisibilityLw(), and then be
callbacked to WMS via statusBarVisibilityChanged(), and then be
dispatched to the client; which is wrong because WMS should dispatch
the new value to the client, not the old one.
https://code.google.com/p/android/issues/detail?id=79991
Change-Id: I2a06d1fbe66e854e639d86a39784f8c6a3303674
2014-11-19 11:53:39 +00:00
Adrian Roos
80c23e3c7f
am e672db28: am ed097689: Merge "Add animations for the system bar color views" into lmp-mr1-dev
...
* commit 'e672db2801c3eedbdf548c71dfa6cf048f91315d':
Add animations for the system bar color views
2014-11-18 20:32:28 +00:00
Adrian Roos
e672db2801
am ed097689: Merge "Add animations for the system bar color views" into lmp-mr1-dev
...
* commit 'ed0976897a8d8eb1f7bf55ae25aece84b172cbb4':
Add animations for the system bar color views
2014-11-18 20:26:14 +00:00
Adrian Roos
ed0976897a
Merge "Add animations for the system bar color views" into lmp-mr1-dev
2014-11-18 20:22:27 +00:00
Bryce Lee
8797535100
am e19872a9: am d4e55bdf: am 8f7b84e0: Merge "Always wake device on power key from non interactive immediately." into lmp-sprout-dev
...
* commit 'e19872a983520f4be08fa0b909042f6282b4e417':
Always wake device on power key from non interactive immediately.
2014-11-18 19:22:06 +00:00
Bryce Lee
e19872a983
am d4e55bdf: am 8f7b84e0: Merge "Always wake device on power key from non interactive immediately." into lmp-sprout-dev
...
* commit 'd4e55bdfc50635903e04934785ed82c39257506c':
Always wake device on power key from non interactive immediately.
2014-11-18 19:16:49 +00:00
Bryce Lee
d4e55bdfc5
am 8f7b84e0: Merge "Always wake device on power key from non interactive immediately." into lmp-sprout-dev
...
* commit '8f7b84e037e35db9d3b46873bc1adf712b307cbe':
Always wake device on power key from non interactive immediately.
2014-11-18 19:12:43 +00:00
Bryce Lee
d9268e3f01
Always wake device on power key from non interactive immediately.
...
Bug: 18410573
Change-Id: Ic5ec4a1ac6d5e06fed8eb0c5cc6b2741e03b7f53
2014-11-17 17:40:59 -08:00
Adrian Roos
05054bd6ac
Add animations for the system bar color views
...
Smoothly animates them in and out when their
visibility changes.
Bug: 17882303
Change-Id: I04bf585bb253c655b4be2f5cc2304d5060cb1657
2014-11-17 16:44:14 +01:00
Chong Zhang
fcab74b3ce
am 1c814b5c: Merge "implement HDMI-like demo mode for remote display" into lmp-mr1-dev
...
automerge: 82e9db4
* commit '82e9db49724ae62f7a0adf284c6bc3ae620741c5':
implement HDMI-like demo mode for remote display
2014-11-15 02:49:37 +00:00
Chong Zhang
82e9db4972
am 1c814b5c: Merge "implement HDMI-like demo mode for remote display" into lmp-mr1-dev
...
* commit '1c814b5c61c538c7ef5176b1121e1ea0c65046e6':
implement HDMI-like demo mode for remote display
2014-11-15 02:32:34 +00:00
Chong Zhang
1c814b5c61
Merge "implement HDMI-like demo mode for remote display" into lmp-mr1-dev
2014-11-15 02:25:33 +00:00
Chong Zhang
ae6119ffce
implement HDMI-like demo mode for remote display
...
adding the following two system properties to control remote
display rotation and device orientation lock:
"persist.demo.rotationlock"=true|false
"persist.demo.remoterotation"=landscape|portrait
Bug: 18317603
Change-Id: Id5fe115f895c6a0e72563036b9a98ff3b5037763
2014-11-14 16:39:15 -08:00
Jeff Brown
36ed887fa3
am 3415634c: am 72f1e3b9: am 1cbff0e3: Merge "Improve screen brightness boost behavior." into lmp-sprout-dev
...
* commit '3415634c2e8a8979291dd60b89f2985e31e5e2f4':
Improve screen brightness boost behavior.
2014-11-13 21:09:56 +00:00
Jeff Brown
3415634c2e
am 72f1e3b9: am 1cbff0e3: Merge "Improve screen brightness boost behavior." into lmp-sprout-dev
...
* commit '72f1e3b9c9992bfc3449c5441bc8e50e7b05f083':
Improve screen brightness boost behavior.
2014-11-13 21:05:31 +00:00
Jeff Brown
72f1e3b9c9
am 1cbff0e3: Merge "Improve screen brightness boost behavior." into lmp-sprout-dev
...
* commit '1cbff0e310b0fba6b25ca1c1e14eaefeabdee0d9':
Improve screen brightness boost behavior.
2014-11-13 20:58:15 +00:00