Griff Hazen
0b42ff7916
Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev
2015-03-21 23:59:46 +00:00
Jeff Brown
619ce1ce53
am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
...
* commit 'd62163055f983b95a954f1a6c2cbc8e0085a7ab5':
Disable more hotkeys while in setup.
2015-03-20 22:10:54 +00:00
Jeff Brown
38d3feb76c
Disable more hotkeys while in setup.
...
Disables fallback key processing for CALL, CAMERA, and HEADSETHOOK
buttons.
Bug: 19767816
Change-Id: I423103c367e05827c939cd8d8dbecb6012b0e9f0
2015-03-20 13:26:09 -07:00
Bryce Lee
9cd2e62612
Fix wrong intent being passed in PhoneWindowManager.
...
When starting going home for Wear, the intent extra indicating the
intent is coming from a button press must be set. This was lost during
a merge conflict resolution.
Bug: 19832892
Change-Id: I6b77757b34f99dd754194448fdea9165690fc90f
2015-03-19 13:27:26 -07:00
Bryce Lee
8bc23e82af
Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev
2015-03-19 00:14:07 +00:00
Bart Sears
91281bbdde
resolved conflicts for merge of cc86bc0c to lmp-mr1-modular-dev
...
Change-Id: Ifb6c4ec5560c50a4bb91426734d7e05cd0c46e93
2015-03-18 14:12:10 -07:00
Bart Sears
cc86bc0c92
am c2eb5c60: Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev
...
* commit 'c2eb5c602d36d91483c8f24b0c6859e4283724b4':
Prevent activities from being started during setup wizard.
2015-03-18 20:28:59 +00:00
Filip Gruszczynski
7bd2feda9e
Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev
2015-03-17 20:38:35 +00:00
Filip Gruszczynski
17413eb575
Add animation to zeroing burn in protection.
...
Also don't shift immediately after starting ambient mode, but wait until
the first update.
Bug: 19521822
Change-Id: Id0b267d0f30e4533195dcfadbed726db0866e4db
2015-03-17 11:30:12 -07:00
Filip Gruszczynski
9779e128d6
Option for going home when going to sleep for devices without physical button.
...
Bug: 19623388
Change-Id: Iec16f83c64646ded12ec97d4b540510b7f9dfd47
2015-03-16 08:57:17 -07:00
Bryce Lee
8326554788
Add Assist global action for wear to different from VOICE_ASSIST
...
Bug: 19722315
Change-Id: I0b1e5625a2eaabfe0015a4d730b25e84d60a3714
2015-03-14 07:57:48 -07:00
Michael Wright
561d104367
Prevent activities from being started during setup wizard.
...
Bug: 19677145
Change-Id: I1d7ca7b25077652355aa55848f973efa69d4b654
2015-03-13 19:51:28 -07:00
Griff Hazen
a093802171
Allow emulator to select a window outset bottom
...
And clean up some copied around code.
Bug: 17440607
Change-Id: I5cf9c58b49110c4be1a77dc9c410fedc6b99aef3
2015-03-13 10:01:41 -07:00
Mark Renouf
cc2212d2ee
Merge "Adds system property for developer option for force-enable burn-in protection" into lmp-mr1-modular-dev
2015-03-10 16:38:54 +00:00
Bryce Lee
8aeab6c8b9
Allow the keyguard service to be configurable.
...
Change-Id: I811171c228764c3e0e507ad3ce28835ccad9bb31
2015-03-06 15:21:46 -08:00
Mark Renouf
77ac63b00a
Adds system property for developer option for force-enable burn-in protection
...
BUG: 18428140
Change-Id: Ie1b88e84631310541337b4e9b3120c1390d6767b
2015-03-04 20:59:14 +00:00
Bryce Lee
82ae149f5b
Allow press and hold from non-interactive.
...
Bug: 19520133
Change-Id: I3ad50f72499667e9b711057f381144a6c3ae6138
2015-02-27 17:59:16 -08:00
Filip Gruszczynski
d2e8640c2c
Burn in protection.
...
Bug: 19373758
Change-Id: I7242f73acadd21bdee03262b4205c8af0734fccb
2015-02-25 12:22:49 -08:00
Filip Gruszczynski
23958c6e2f
Force translucency from windowIsTranslucent on SwipeDismissLayout.
...
Bug: 18799741
Change-Id: Ifb05869f1bf080d7555d7728dc085c41cc2c277c
2015-02-24 16:59:45 -08:00
Adrian Roos
7131a7d64e
am d245ad24: am 024fd0c6: Disable color view animations when stable insets change
...
* commit 'd245ad24f5e6e8c7b302689467b12718c94f4ced':
Disable color view animations when stable insets change
2015-02-17 18:46:40 +00:00
Adrian Roos
d245ad24f5
am 024fd0c6: Disable color view animations when stable insets change
...
* commit '024fd0c6051e01579018fad0c1a56e9e47b195df':
Disable color view animations when stable insets change
2015-02-17 18:40:01 +00:00
Adrian Roos
024fd0c605
Disable color view animations when stable insets change
...
Prevents color view from showing up on phones when
the orientation changes to landscape. Previously, the
animation was only prevented when the stable inset of a
bar became nonzero; now we disable animations whenever
the nonzeroness changes.
Bug: 19353466
Change-Id: I31b4103fe984d158a98cd446ac2ddbe15a408e49
2015-02-17 10:24:52 -08:00
Bryce Lee
1d97aa4d20
Merge "Allow single press of physical button to go home without sleeping." into lmp-mr1-modular-dev
2015-02-07 00:32:27 +00:00
Bryce Lee
cc8b467c59
Add voice assist action for global actions.
...
Bug: 18919886
Change-Id: Idd74cf6980207deabfb312732a0316a2edf3c176
2015-02-05 18:39:01 -08:00
Bryce Lee
01b0c5f55b
Allow single press of physical button to go home without sleeping.
...
Bug: 18921423
Change-Id: Ic7ee7daeaf1b4e08a7c53451615736ee7a08fb61
2015-02-05 18:24:04 -08:00
Jose Lima
4a40f7cc90
Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev
...
automerge: 1f81973
* commit '1f81973e7d33f2a3f4b0a0e232854283f0f18030':
Fix crash caused by disabling the Options panel on TVs
2015-01-28 20:59:05 +00:00
Jose Lima
bd769a15ab
Fix crash caused by disabling the Options panel on TVs
...
Address more cases where calls to getPanelState may cause a crash when the
options panel is disabled on a platform.
Bug: 19178531
Bug: 18780696
Change-Id: Ib72bb8483e636181788ed3919c4cb9e99a94b7b1
2015-01-28 10:46:39 -08:00
Jose Lima
445768bddf
am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev
...
* commit '3fd8a433a918fc9c57b6d7ff12839a1e028d6dad':
Allow disabling the Options Pannel feature for TVs
2015-01-27 02:58:44 +00:00
Jose Lima
7a22fc62d3
Allow disabling the Options Pannel feature for TVs
...
- Added a config entry in velues-television to disable the options panel
feature for TVs.
- Fixed parts of the code in PhoneWindow that assumed this feature is supposed
to always be available, which was causing exceptions when it was turned off.
Bug: 18780696
Change-Id: I923bd4b5019d634e5352a6e893005133edb475f6
2015-01-26 17:39:49 -08: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
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
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
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
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
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
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
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
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
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