TreeHugger Robot
fabca0c429
Merge "Import translations. DO NOT MERGE"
2016-07-12 16:22:11 +00:00
Abodunrinwa Toki
b84bde64c8
Merge "InputSettings: Fix incorrect keyboard list on rotation."
2016-07-12 15:51:27 +00:00
Mark Salyzyn
f8cbe75385
Merge \\\\"Settings: add logpersist kernel only selection\\\\" am: 3c60540078 am: bd900c98ef am: 364322a81d
...
am: fc4fd4a3af
2016-07-12 15:38:01 +00:00
Mark Salyzyn
fc4fd4a3af
Merge \\\"Settings: add logpersist kernel only selection\\\" am: 3c60540078 am: bd900c98ef
...
am: 364322a81d
2016-07-12 15:35:14 +00:00
Mark Salyzyn
364322a81d
Merge \\"Settings: add logpersist kernel only selection\\" am: 3c60540078
...
am: bd900c98ef
2016-07-12 15:32:34 +00:00
Mark Salyzyn
bd900c98ef
Merge \"Settings: add logpersist kernel only selection\"
...
am: 3c60540078
2016-07-12 15:29:51 +00:00
Treehugger Robot
3c60540078
Merge "Settings: add logpersist kernel only selection"
2016-07-12 15:24:10 +00:00
Mark Salyzyn
338377b3a0
Settings: add logpersist kernel only selection
...
Bug: 28936216
Bug: 29831823
Change-Id: I9bfbb2717c2d4d39bfda6b92221a38985a4f4973
2016-07-12 07:22:41 -07:00
Julia Reynolds
dfe0da7511
Merge \\"Correct logic for showing overide dnd field.\\" into nyc-mr1-dev am: 42d2fda721
...
am: 8f98525de1
2016-07-12 14:11:13 +00:00
Julia Reynolds
8f98525de1
Merge \"Correct logic for showing overide dnd field.\" into nyc-mr1-dev
...
am: 42d2fda721
2016-07-12 14:08:26 +00:00
Julia Reynolds
42d2fda721
Merge "Correct logic for showing overide dnd field." into nyc-mr1-dev
2016-07-12 14:03:12 +00:00
Tony Mak
b1d8883254
Remove KeyboardView in ChooseLockPassword am: 9c26c9dba6
...
am: e7ab5e6a02
2016-07-12 13:55:56 +00:00
Tony Mak
872933b55b
Visualize password requirements and their fulfillment am: 0bbcdccdbf
...
am: 83f3117749
2016-07-12 13:55:55 +00:00
Tony Mak
e7ab5e6a02
Remove KeyboardView in ChooseLockPassword
...
am: 9c26c9dba6
2016-07-12 13:52:31 +00:00
Tony Mak
83f3117749
Visualize password requirements and their fulfillment
...
am: 0bbcdccdbf
2016-07-12 13:52:31 +00:00
Tony Mak
9c26c9dba6
Remove KeyboardView in ChooseLockPassword
...
1. We actually use user installed keyboard
2. Request focus on the edittext instead of the keyboard
Bug: 24900754
Change-Id: I6257a592ad34875d46c5c05349098b891ef37d98
2016-07-12 13:06:26 +00:00
Tony Mak
0bbcdccdbf
Visualize password requirements and their fulfillment
...
1. Aggregate policies and generate the requirements
2. When user modifies the password, check is each requirement fulfilled
Update the view accordingly.
Change-Id: I962ed3b81ce844006be1024a493e94ce52a3fdec
Fix: 24900754
2016-07-12 11:19:45 +01:00
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
Bill Yi
587cf294ab
Import translations. DO NOT MERGE
...
Change-Id: I7301c5c603d06ed12259525123c2a39697918364
Auto-generated-cl: translation import
2016-07-11 11:54:08 -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
Julia Reynolds
2c1eb80b1d
Correct logic for showing overide dnd field.
...
Change-Id: Iae1d053d3816ccdae9f6d9bc6a16622b50e07440
Fixes: 29995563
2016-07-11 09:10:11 -04: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
