Robin Lee
6598e805c5
am 51c54489: am cd7ceb07: Merge "SystemUI: show owner VPN for restricted profile" into mnc-dev
...
* commit '51c5448949111132b565276b27a2ecd91b0aaf64':
SystemUI: show owner VPN for restricted profile
2015-06-26 21:11:47 +00:00
Robin Lee
51c5448949
am cd7ceb07: Merge "SystemUI: show owner VPN for restricted profile" into mnc-dev
...
* commit 'cd7ceb0711672eabd1de578f2452ddcb8a322f68':
SystemUI: show owner VPN for restricted profile
2015-06-26 20:58:21 +00:00
Robin Lee
cd7ceb0711
Merge "SystemUI: show owner VPN for restricted profile" into mnc-dev
2015-06-26 20:44:57 +00:00
Robin Lee
63204eeafe
SystemUI: show owner VPN for restricted profile
...
Restricted profiles don't have their own VPN configuration - whatever
is in charge of VPN for our USER_OWNER user will have network traffic
routed to it instead.
Bug: 18419023
Bug: 21188177
Change-Id: I7205d90032461c240048a036606c3a7938d0eda2
2015-06-26 10:35:25 -07:00
Selim Cinek
2a2c81a75a
am 018c33ce: am b84ace51: Merge "Fixed a crash where onTouch might have been called too early" into mnc-dev
...
* commit '018c33ce72feeba5e3ab28aa2c2eee5be5c0e3fb':
Fixed a crash where onTouch might have been called too early
2015-06-26 15:46:25 +00:00
Selim Cinek
e4c4d0f919
am db82c17f: am eb4ce1d6: Merge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev
...
* commit 'db82c17fc958ee5fe0683e64a46d5ee4559fd0dc':
Now showing unlocked icon if both trusted and fingerprint running
2015-06-26 15:46:18 +00:00
Selim Cinek
018c33ce72
am b84ace51: Merge "Fixed a crash where onTouch might have been called too early" into mnc-dev
...
* commit 'b84ace51b21b9b1d422e96ed023ef3860ca0710d':
Fixed a crash where onTouch might have been called too early
2015-06-26 15:33:24 +00:00
Selim Cinek
db82c17fc9
am eb4ce1d6: Merge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev
...
* commit 'eb4ce1d6a3bfa99ec57604aa842835a381616346':
Now showing unlocked icon if both trusted and fingerprint running
2015-06-26 15:33:17 +00:00
Selim Cinek
b84ace51b2
Merge "Fixed a crash where onTouch might have been called too early" into mnc-dev
2015-06-26 15:26:29 +00:00
Selim Cinek
eb4ce1d6a3
Merge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev
2015-06-26 15:26:08 +00:00
Selim Cinek
4e6b2d3e7d
Fixed a crash where onTouch might have been called too early
...
Bug: 21906153
Change-Id: I1fbc8b29f9cb0d7d71d6cb81e95a35da2fe9959e
2015-06-25 20:15:33 -04:00
Selim Cinek
2a46d68571
Now showing unlocked icon if both trusted and fingerprint running
...
Bug: 21781452
Change-Id: I7b04975b36f7a135358cdd68c1bdae1e73f22cc0
2015-06-25 19:44:05 -04:00
Jorim Jaggi
8043ea5f8c
am ba654e6c: am 91617a79: Hide assist when launching an activity over an action
...
* commit 'ba654e6c0408951d24d65019626fd6da0e696bac':
Hide assist when launching an activity over an action
2015-06-25 22:55:22 +00:00
Jorim Jaggi
6457e8a223
am 37a2b992: am 7e6571f1: Use long press of KeyButtonView to invoke assist
...
* commit '37a2b9929a1fd9298b64e740a832c29c63b1a414':
Use long press of KeyButtonView to invoke assist
2015-06-25 22:55:16 +00:00
Jorim Jaggi
ba654e6c04
am 91617a79: Hide assist when launching an activity over an action
...
* commit '91617a793ed6a80f3abfd3653b0f74b9321fe0f6':
Hide assist when launching an activity over an action
2015-06-25 22:50:14 +00:00
Jorim Jaggi
37a2b9929a
am 7e6571f1: Use long press of KeyButtonView to invoke assist
...
* commit '7e6571f13da776dca4966dee0159e7741102fca9':
Use long press of KeyButtonView to invoke assist
2015-06-25 22:50:10 +00:00
Jorim Jaggi
91617a793e
Hide assist when launching an activity over an action
...
Also make sure to resume app switches in this case.
Bug: 22071080
Change-Id: Ib30e064f4a5d0768b608e23183a34e326ada32e6
2015-06-25 22:39:53 +00:00
Jorim Jaggi
7e6571f13d
Use long press of KeyButtonView to invoke assist
...
This makes sure that accessibility is handled properly.
Bug: 18778078
Change-Id: I967b387aabff973b5a9fea649a805540ee08eea8
2015-06-25 22:39:21 +00:00
Selim Cinek
81c53e5f55
am 6a75422b: am 0ebd001f: Merge "Fixed a HUN crash with notification children" into mnc-dev
...
* commit '6a75422b6224a51bb7ed8cb72bbee98cd4ca43e7':
Fixed a HUN crash with notification children
2015-06-25 20:00:59 +00:00
Selim Cinek
6a75422b62
am 0ebd001f: Merge "Fixed a HUN crash with notification children" into mnc-dev
...
* commit '0ebd001f3068116b93e8a447f35f01a5b96ec161':
Fixed a HUN crash with notification children
2015-06-25 19:03:37 +00:00
Selim Cinek
0ebd001f30
Merge "Fixed a HUN crash with notification children" into mnc-dev
2015-06-25 18:37:56 +00:00
Winson Chung
73d86f9d39
am 04ececc6: am b49dbeef: Merge "Refactoring recents search bar widget logic." into mnc-dev
...
* commit '04ececc6feb89e522e833ffa417e7c2fb07b6743':
Refactoring recents search bar widget logic.
2015-06-25 18:04:23 +00:00
Winson Chung
04ececc6fe
am b49dbeef: Merge "Refactoring recents search bar widget logic." into mnc-dev
...
* commit 'b49dbeef5253c346a172b7516c4526fa79dadd77':
Refactoring recents search bar widget logic.
2015-06-25 17:35:06 +00:00
Winson Chung
b49dbeef52
Merge "Refactoring recents search bar widget logic." into mnc-dev
2015-06-25 17:24:55 +00:00
Selim Cinek
eaee9c0190
Fixed a HUN crash with notification children
...
Notification children were not properly handled
before when added lead to a crash.
This will fix this bug finally.
Bug: 21868047
Change-Id: I92f2f7e71659de8274711a448e370084d423ca9f
2015-06-25 11:05:52 -04:00
Winson Chung
af3bb69367
Refactoring recents search bar widget logic.
...
Bug: 19062975
Change-Id: I303710598675aeebca8f34ac57de6249462ec033
2015-06-24 18:44:44 -07:00
Selim Cinek
2a0295144a
am 60b716ef: am 3b9fbd2f: Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev
...
* commit '60b716ef006091d335eda01c73cfe322b6208901':
Fixed a bug with encryption where the keyguard was never shown with PIN
2015-06-24 22:39:21 +00:00
Selim Cinek
60b716ef00
am 3b9fbd2f: Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev
...
* commit '3b9fbd2f2de75e53a836d3cb73bcfc25fdb3a67a':
Fixed a bug with encryption where the keyguard was never shown with PIN
2015-06-24 22:25:25 +00:00
Selim Cinek
3b9fbd2f2d
Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev
2015-06-24 22:19:38 +00:00
Winson Chung
5ef494e004
am b7874005: am 6301d802: Merge "Catching launch errors when trying to go Home while Home is updating." into mnc-dev
...
* commit 'b78740052d28369260587b8fcb165558124952fc':
Catching launch errors when trying to go Home while Home is updating.
2015-06-24 21:44:27 +00:00
Winson Chung
b78740052d
am 6301d802: Merge "Catching launch errors when trying to go Home while Home is updating." into mnc-dev
...
* commit '6301d802244f6e6c9fc6084e4bedd20ba0bd3064':
Catching launch errors when trying to go Home while Home is updating.
2015-06-24 21:32:06 +00:00
Winson Chung
6301d80224
Merge "Catching launch errors when trying to go Home while Home is updating." into mnc-dev
2015-06-24 21:21:24 +00:00
Winson Chung
b8f03072d4
Catching launch errors when trying to go Home while Home is updating.
...
Bug: 21442898
Change-Id: I7fc74422b220cb02acb195b5c9121ff72bc16dbe
2015-06-24 14:11:45 -07:00
John Spurlock
14114aea3c
am 4d2c6a5e: am 6b0f384f: Merge "Volume Motion: Initial show and expand transition." into mnc-dev
...
* commit '4d2c6a5e9f458437b73a472ab545af639d72553f':
Volume Motion: Initial show and expand transition.
2015-06-24 19:11:03 +00:00
John Spurlock
4d2c6a5e9f
am 6b0f384f: Merge "Volume Motion: Initial show and expand transition." into mnc-dev
...
* commit '6b0f384f0042c21129466c100e20aec1a325a8da':
Volume Motion: Initial show and expand transition.
2015-06-24 18:55:52 +00:00
John Spurlock
6b0f384f00
Merge "Volume Motion: Initial show and expand transition." into mnc-dev
2015-06-24 18:47:08 +00:00
Chris Wren
4114a8ee01
am f249c3ee: am ccba036d: Merge "don\'t clear notification effects in response to peeks" into mnc-dev
...
* commit 'f249c3ee7be56438a3f9ff287f90c44ed7a56c19':
don't clear notification effects in response to peeks
2015-06-24 18:11:34 +00:00
John Spurlock
22def3d4eb
Volume Motion: Initial show and expand transition.
...
Also re-enable the content collapse layout transition animations,
supported by ensuring the dialog window is tall enough for long
enough to complete the transition, avoiding clipping.
Bug: 21335976
Change-Id: Ibc4cbb1e882c1e11c4406463752afa177fb1e6d7
2015-06-24 14:04:18 -04:00
Chris Wren
f249c3ee7b
am ccba036d: Merge "don\'t clear notification effects in response to peeks" into mnc-dev
...
* commit 'ccba036dd37a99c3beaf1cdf58665109c4931b19':
don't clear notification effects in response to peeks
2015-06-24 17:58:40 +00:00
Chris Wren
ccba036dd3
Merge "don't clear notification effects in response to peeks" into mnc-dev
2015-06-24 17:54:23 +00:00
Chris Wren
1689594851
don't clear notification effects in response to peeks
...
When the heads up appears it generates a visibility event for the panel.
This always clears the notification effects (buzz, beep, blink).
If we suppress that for heads up notifications, we never get another chance.
So we add a new call when we open the shade from the heads up to catch this case.
Bug: 20947591
Change-Id: I233e5346617ca2fce7851bd85154c838849df8f7
2015-06-24 13:21:47 -04:00
Selim Cinek
edd32b8817
Fixed a bug with encryption where the keyguard was never shown with PIN
...
This led to the network being unusable.
We now ensure that the Keyguard is not notified of the SIM PIN
changes until after the initial dismissal logic is done.
In addition, the fullscreen PIN is now always shown immediately
and not until the user swipes up, which was an error before.
Also made sure that the Keyguard Scrim is correctly visible
when shown.
Bug: 21850021
Change-Id: I81804124bae30adf0e17e26cc42f67e48fc446e8
2015-06-24 12:52:19 -04:00
Geoff Mendal
e042f952b3
Import translations. DO NOT MERGE
...
Change-Id: I23e3d5c71af8db285d657cf5dafbebc5c4bbad6b
Auto-generated-cl: translation import
2015-06-24 08:58:21 -05:00
Jason Monk
fd183561e0
am 78b964c2: am 81b46360: Merge "Add metrics to brightness slider" into mnc-dev
...
* commit '78b964c26ca3e5b1601773a762c8c6989069a8cf':
Add metrics to brightness slider
2015-06-23 21:07:14 +00:00
Chris Wren
bf4eb5b58c
am 268292f6: am bb0e985b: Merge "turn off the ligths whenever we see the panel" into mnc-dev
...
* commit '268292f6f0f7eac6f8571429ba59361317b3fd19':
turn off the ligths whenever we see the panel
2015-06-23 21:06:08 +00:00
Chris Wren
b94465bc0d
am fc954121: am 8a4014d2: Merge "Only report top peekingcard as visibile." into mnc-dev
...
* commit 'fc954121ebdb80a841478f959d1262a86ace972d':
Only report top peekingcard as visibile.
2015-06-23 20:46:18 +00:00
Jason Monk
78b964c26c
am 81b46360: Merge "Add metrics to brightness slider" into mnc-dev
...
* commit '81b46360939b70550438da5ed9641d9db559be29':
Add metrics to brightness slider
2015-06-23 20:04:50 +00:00
Jason Monk
81b4636093
Merge "Add metrics to brightness slider" into mnc-dev
2015-06-23 19:56:13 +00:00
Jason Monk
97b87a9929
Add metrics to brightness slider
...
Had to add a way for BrightnessController to know when its the end
of a touch, so that we don't spam the event logs with intermediate
values.
Added visibility to BrightnessDialog as this is what settings
launches.
Bug: 21528168
Change-Id: Ie214b4ddb0c9f9bbe8c4f182f9c59f229963ebc7
2015-06-23 15:54:13 -04:00
Chris Wren
268292f6f0
am bb0e985b: Merge "turn off the ligths whenever we see the panel" into mnc-dev
...
* commit 'bb0e985bed952734f4271672fd804539a66a2d36':
turn off the ligths whenever we see the panel
2015-06-23 19:06:29 +00:00