Tony Mak
13ad7d4078
Update work challenge strings am: 9a8e5a7f25
...
am: df0dffe527
2016-07-12 07:07:45 +00:00
Tony Mak
df0dffe527
Update work challenge strings
...
am: 9a8e5a7f25
2016-07-12 07:04:17 +00:00
Tony Mak
9a8e5a7f25
Update work challenge strings
...
Change-Id: I9c938c9a9547ec92d7ba7b452861db174e421068
Fix: 29358023
2016-07-12 06:59:11 +00:00
Maurice Lam
eb90d7b1f8
Merge \\"Update button styles for fingerprint\\" into nyc-mr1-dev am: 68d65abaaa
...
am: d776f53ecd
2016-07-12 02:44:20 +00:00
Doris Ling
d95ce342de
Merge \\"Disable Gestures Settings by default.\\" into nyc-mr1-dev am: 709aa539c8
...
am: 1de7559bdc
2016-07-12 02:44:20 +00:00
Maurice Lam
4ae9e0c27e
Merge \\"Fix PIN screen title\\" into nyc-mr1-dev am: 79321c480f
...
am: 932b49408d
2016-07-12 02:44:19 +00:00
Makoto Onuki
8fd3c226e0
Merge \\"Restore \\"reset ShortcutManager rate limiting\\" dev option\\" into nyc-mr1-dev am: ed9aed1878
...
am: 5922902ab3
2016-07-12 02:44:18 +00:00
Victor Chang
994b72cd7b
Merge \\"Fix always-on is not turned off when user forgets vpn\\" into nyc-mr1-dev am: 9505b78e29
...
am: d308bbc358
2016-07-12 02:44:18 +00:00
Maurice Lam
d776f53ecd
Merge \"Update button styles for fingerprint\" into nyc-mr1-dev
...
am: 68d65abaaa
2016-07-12 02:01:46 +00:00
Maurice Lam
68d65abaaa
Merge "Update button styles for fingerprint" into nyc-mr1-dev
2016-07-12 01:51:11 +00:00
Doris Ling
e778a6635b
Merge \\"Add handling for gesture settings for double twist for camera flip.\\" into nyc-mr1-dev am: 94c8f7ea7e
...
am: b209123dca
2016-07-12 01:32:45 +00:00
Doris Ling
1de7559bdc
Merge \"Disable Gestures Settings by default.\" into nyc-mr1-dev
...
am: 709aa539c8
2016-07-11 22:28:52 +00:00
Doris Ling
709aa539c8
Merge "Disable Gestures Settings by default." into nyc-mr1-dev
2016-07-11 22:21:25 +00:00
Maurice Lam
932b49408d
Merge \"Fix PIN screen title\" into nyc-mr1-dev
...
am: 79321c480f
2016-07-11 21:45:36 +00:00
Maurice Lam
79321c480f
Merge "Fix PIN screen title" into nyc-mr1-dev
2016-07-11 21:33:04 +00:00
Doris Ling
5edb27501e
Disable Gestures Settings by default.
...
Add a config boolean to determine if the gesture settings is enabled or
not.
Bug: 30022840
Change-Id: Ie7ae8bedbfc128b64999d33a3d626d4e311e5e3e
2016-07-11 12:10:58 -07:00
Makoto Onuki
5922902ab3
Merge \"Restore \"reset ShortcutManager rate limiting\" dev option\" into nyc-mr1-dev
...
am: ed9aed1878
2016-07-11 18:09:18 +00:00
Makoto Onuki
ed9aed1878
Merge "Restore "reset ShortcutManager rate limiting" dev option" into nyc-mr1-dev
2016-07-11 17:54:27 +00:00
Maurice Lam
44f2736f54
Fix PIN screen title
...
Set the header text of the screen after Activity.setTitle is called,
so that the PIN screen will show the PIN text as header, as opposed to
the default which is always "password".
Bug: 30041779
Change-Id: I525bd4e5c51252410fdeb0424329bbfbd86e5b7d
2016-07-11 17:48:09 +00:00
Victor Chang
d308bbc358
Merge \"Fix always-on is not turned off when user forgets vpn\" into nyc-mr1-dev
...
am: 9505b78e29
2016-07-11 14:08:09 +00:00
Victor Chang
9505b78e29
Merge "Fix always-on is not turned off when user forgets vpn" into nyc-mr1-dev
2016-07-11 13:56:08 +00:00
Doris Ling
b209123dca
Merge \"Add handling for gesture settings for double twist for camera flip.\" into nyc-mr1-dev
...
am: 94c8f7ea7e
2016-07-09 00:03:11 +00:00
Doris Ling
94c8f7ea7e
Merge "Add handling for gesture settings for double twist for camera flip." into nyc-mr1-dev
2016-07-08 23:58:47 +00:00
Doris Ling
96167c75c5
Merge \\"Change gesture settings for Ambient Display from nudge to double tap.\\" into nyc-mr1-dev am: 8ba6e6a792
...
am: 67d4b38cc1
2016-07-08 23:42:15 +00:00
Doris Ling
67d4b38cc1
Merge \"Change gesture settings for Ambient Display from nudge to double tap.\" into nyc-mr1-dev
...
am: 8ba6e6a792
2016-07-08 23:23:35 +00:00
Doris Ling
8ba6e6a792
Merge "Change gesture settings for Ambient Display from nudge to double tap." into nyc-mr1-dev
2016-07-08 23:16:36 +00:00
Doris Ling
37d247b1af
Merge \\"Add summary for Settings->Gestures.\\" into nyc-mr1-dev am: f46dabcf0f
...
am: 4dd0373203
2016-07-08 23:11:51 +00:00
Doris Ling
4dd0373203
Merge \"Add summary for Settings->Gestures.\" into nyc-mr1-dev
...
am: f46dabcf0f
2016-07-08 23:03:44 +00:00
Doris Ling
f46dabcf0f
Merge "Add summary for Settings->Gestures." into nyc-mr1-dev
2016-07-08 22:56:45 +00:00
Mark Salyzyn
694a4bbcaa
Merge \\\\"Settings: add logpersist kernel only selection (strings)\\\\" am: fd021e203d -s ours am: a79d854fb6 am: f8da6eca1c
...
am: 9d14c80468
2016-07-08 21:48:55 +00:00
Justin Klaassen
1863ffc982
resolve merge conflicts of 67b3a94 to master
...
Change-Id: I8fabdf019fea12793c54745390ed4669118548d0
2016-07-08 14:40:55 -07:00
Mark Salyzyn
9d14c80468
Merge \\\"Settings: add logpersist kernel only selection (strings)\\\" am: fd021e203d -s ours am: a79d854fb6
...
am: f8da6eca1c
2016-07-08 21:29:15 +00:00
Mark Salyzyn
f8da6eca1c
Merge \\"Settings: add logpersist kernel only selection (strings)\\" am: fd021e203d -s ours
...
am: a79d854fb6
2016-07-08 21:26:51 +00:00
Doris Ling
6607d49202
Change gesture settings for Ambient Display from nudge to double tap.
...
Change the description text and animation video to double tap the device
instead of nudge movement. Also update the summary text in
Display->Ambient Display to match the gesture description.
Bug: 30034987
Change-Id: If95e7a417b472dd677174a8187a83594e06e0eee
2016-07-08 14:24:42 -07:00
Mark Salyzyn
a79d854fb6
Merge \"Settings: add logpersist kernel only selection (strings)\"
...
am: fd021e203d
2016-07-08 21:24:24 +00:00
Justin Klaassen
67b3a94b81
Merge \"Add Night display settings\" into nyc-mr1-dev
...
am: e577ed1b91
2016-07-08 21:15:39 +00:00
Doris Ling
6ae44a03e0
Add summary for Settings->Gestures.
...
Add summary text for gesture settings.
Bug: 30034888
Change-Id: I15128b6e533b279ca5da98bf4f0e042dd93a0d02
2016-07-08 14:14:35 -07:00
Justin Klaassen
e577ed1b91
Merge "Add Night display settings" into nyc-mr1-dev
2016-07-08 21:07:48 +00:00
Mark Salyzyn
fd021e203d
Merge "Settings: add logpersist kernel only selection (strings)"
2016-07-08 21:06:29 +00:00
Fan Zhang
34969b0044
UI updates for support tab. am: 48aab452cb
...
am: 0e2c45b5df
2016-07-08 19:25:11 +00:00
Fan Zhang
0e2c45b5df
UI updates for support tab.
...
am: 48aab452cb
2016-07-08 19:21:26 +00:00
Justin Klaassen
c7cd2982cd
Add Night display settings
...
Bug: 28615069
Change-Id: I2e8a374a00c06c06d419a6ff46cd3b5d544c1d3e
2016-07-08 11:48:02 -07:00
Mark Salyzyn
466abc5f0f
Settings: add logpersist kernel only selection (strings)
...
Bug: 28936216
Bug: 29831823
Change-Id: I4e578bbe2f5bbf936b03fbdac34a225a0432e503
2016-07-08 11:08:05 -07:00
Doris Ling
6b1a2a8cc8
Add handling for gesture settings for double twist for camera flip.
...
Add handling for updating the secure settings for camera double twist
when user updates the on/off toggle, and move
SYSTEM_NAVIGATION_KEYS_ENABLED from Global to Secure.
Bug: 29869445
Change-Id: Iebb937509a661b012688a3eb36efe08d2292ff26
2016-07-08 10:37:16 -07:00
Fan Zhang
48aab452cb
UI updates for support tab.
...
Fixes: 29999181
Fixes: 29397123
- Reduce support tile min height to 48dp.
- Add a 8dp spacer between escalation card and first support tile.
- Show different off-hour support escalation title when support hour is
always avaiable.
Change-Id: I4dacf2b375734c4819b9b19b68fc84faf083c0d4
2016-07-08 10:26:29 -07:00
Makoto Onuki
0651701930
Restore "reset ShortcutManager rate limiting" dev option
...
Bug 30031093
Change-Id: I28cbf56e61937b15eb5806823f40e43d6bac4e72
2016-07-08 09:37:48 -07:00
Fan Zhang
c74925b5dd
Merge \\"Wrap bluetooth edit content in a scrollview.\\" into nyc-mr1-dev am: 96bc7b5d03
...
am: 6e5de35ba4
2016-07-07 21:10:43 +00:00
Fan Zhang
6e5de35ba4
Merge \"Wrap bluetooth edit content in a scrollview.\" into nyc-mr1-dev
...
am: 96bc7b5d03
2016-07-07 21:01:56 +00:00
Fan Zhang
96bc7b5d03
Merge "Wrap bluetooth edit content in a scrollview." into nyc-mr1-dev
2016-07-07 20:30:00 +00:00
Doris Ling
27c6820fb9
Merge \\"Add padding for the animation in the gestures settings.\\" into nyc-mr1-dev am: 1b41dd7f8c
...
am: aca1f81bad
2016-07-07 17:14:51 +00:00
