Daniel Nishi
4b042ee3d7
Merge \\"Don\\'t show the Fingerprint suggestion if it is disabled.\\" into nyc-mr1-dev am: 8dc1a7340b
...
am: d2965dfe3d
Change-Id: I550f5d7dc541a87eba408c2bcbc059bd15bd3b56
2016-07-12 21:53:39 +00:00
Daniel Nishi
d2965dfe3d
Merge \"Don\'t show the Fingerprint suggestion if it is disabled.\" into nyc-mr1-dev
...
am: 8dc1a7340b
Change-Id: If6f0c6307b3c617b0c07c5cf9a69899ae893009c
2016-07-12 21:49:33 +00:00
TreeHugger Robot
8dc1a7340b
Merge "Don't show the Fingerprint suggestion if it is disabled." into nyc-mr1-dev
2016-07-12 21:42:04 +00:00
Fan Zhang
af66ed8c20
Merge \\"Use app name as summary in default home app setting.\\" into nyc-mr1-dev am: 0fd709bf44
...
am: f32c1b77f5
Change-Id: Ia5cb092814fb535ebba414ac022c5fcdd019f64a
2016-07-12 21:36:24 +00:00
Fan Zhang
f32c1b77f5
Merge \"Use app name as summary in default home app setting.\" into nyc-mr1-dev
...
am: 0fd709bf44
Change-Id: Ie2ea62621d24f8c2d6867fb6b8f4c3b00c57333d
2016-07-12 21:33:06 +00:00
TreeHugger Robot
0fd709bf44
Merge "Use app name as summary in default home app setting." into nyc-mr1-dev
2016-07-12 21:26:11 +00:00
Daniel Nishi
c9ec8c80bc
Don't show the Fingerprint suggestion if it is disabled.
...
Bug: 27202317
Change-Id: I8e97e47f711961cf127fc2135dd06812236829b8
2016-07-12 13:11:19 -07:00
Fan Zhang
233daf469d
Use app name as summary in default home app setting.
...
Bug: 27834147
Condition: Only use app name as summary if there is only 1 launcher app
installed.
Change-Id: Idb9b55d5618bbdbea6446758f2fcd09d0d6309af
2016-07-12 12:51:31 -07:00
Bill Yi
97765a8f3a
Import translations. DO NOT MERGE am: fdb2a9ab61
-s ours am: f7e4533931
-s ours
...
am: 45aa5c8cd0
-s ours
Change-Id: I40ad8443a92fecb273f5681a4a1d4c3c329107ff
2016-07-12 17:04:12 +00:00
Bill Yi
69430f5ba4
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 7b2e48bc53
-s ours
...
am: 032f398ee8
-s ours
Change-Id: I787147c800d279b420b4429aa045ffe966c300f6
2016-07-12 17:04:09 +00:00
Bill Yi
879d137e5a
Import translations. DO NOT MERGE am: fdb2a9ab61
-s ours am: 60761866e5
-s ours
...
am: 17996bf7aa
-s ours
Change-Id: I0064d9dcddb6e8dcc74394497d2dd01e6c8b433f
2016-07-12 16:53:58 +00:00
Bill Yi
45aa5c8cd0
Import translations. DO NOT MERGE am: fdb2a9ab61
-s ours
...
am: f7e4533931
-s ours
Change-Id: Ie0091e08de1cd14903989b1a133cfeb3ddd2ed3f
2016-07-12 16:53:42 +00:00
Bill Yi
032f398ee8
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: 7b2e48bc53
-s ours
Change-Id: Ib90da04c38aec52e7d8932f387ad477ade3807a8
2016-07-12 16:53:41 +00:00
Bill Yi
17996bf7aa
Import translations. DO NOT MERGE am: fdb2a9ab61
-s ours
...
am: 60761866e5
-s ours
Change-Id: I0c8e63469275a91fe0b75b67062bb686cb055d3d
2016-07-12 16:41:10 +00:00
Bill Yi
f7e4533931
Import translations. DO NOT MERGE
...
am: fdb2a9ab61
-s ours
Change-Id: I9e66dac2b329ad2f6065a5208b8da471b14f66e7
2016-07-12 16:35:07 +00:00
Bill Yi
60761866e5
Import translations. DO NOT MERGE
...
am: fdb2a9ab61
-s ours
Change-Id: Ica3d0c2c2fcc40034c93cd26e5596961dff32473
2016-07-12 16:31:39 +00:00
TreeHugger Robot
fabca0c429
Merge "Import translations. DO NOT MERGE"
2016-07-12 16:22:11 +00:00
TreeHugger Robot
7b2e48bc53
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-12 16:18:53 +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
Change-Id: Ieccd75462262f46fbbee9905f8bd772484c61e1f
2016-07-12 15:38:01 +00:00
Mark Salyzyn
fc4fd4a3af
Merge \\\"Settings: add logpersist kernel only selection\\\" am: 3c60540078
am: bd900c98ef
...
am: 364322a81d
Change-Id: I46f8b760043a4cafcb1798479f10a623776a0f7b
2016-07-12 15:35:14 +00:00
Mark Salyzyn
364322a81d
Merge \\"Settings: add logpersist kernel only selection\\" am: 3c60540078
...
am: bd900c98ef
Change-Id: I4fea0151e3bf5fb9d0ee14a333eac4ddaa16c5f3
2016-07-12 15:32:34 +00:00
Mark Salyzyn
bd900c98ef
Merge \"Settings: add logpersist kernel only selection\"
...
am: 3c60540078
Change-Id: Ieefd7e08368174f735b8491f8f01847906e1fd3b
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
Change-Id: I950009a9c50d774b334b5d3603beba92959e8b7f
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
Change-Id: I34ad6825441eb154fb767e24857119561b2855ed
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
Change-Id: I4f147790ead4cd5e5bf357cd2d9850f6fe619ac3
2016-07-12 13:55:56 +00:00
Tony Mak
872933b55b
Visualize password requirements and their fulfillment am: 0bbcdccdbf
...
am: 83f3117749
Change-Id: Ifbebb87d524899d35a69de538920b46c324dc86f
2016-07-12 13:55:55 +00:00
Tony Mak
e7ab5e6a02
Remove KeyboardView in ChooseLockPassword
...
am: 9c26c9dba6
Change-Id: I740daffa8a7e9c4d0fa686dc22043a9de518f473
2016-07-12 13:52:31 +00:00
Tony Mak
83f3117749
Visualize password requirements and their fulfillment
...
am: 0bbcdccdbf
Change-Id: Iad89b5aa1a94c12edeebf42be6c8c380f27bd4ff
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
Change-Id: I6cd3f076c95e4f5548cb46b10ce06408cbd754bd
2016-07-12 07:07:45 +00:00
Tony Mak
df0dffe527
Update work challenge strings
...
am: 9a8e5a7f25
Change-Id: I767c864b9e96df909b03c5e0ce449125f89c3f83
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
Change-Id: I7c782fad5fadf139aa318d3a77c2b3328fc6a858
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
Change-Id: I9dcfeea4145969759148fba8af8579b37a13182d
2016-07-12 02:44:20 +00:00
Maurice Lam
4ae9e0c27e
Merge \\"Fix PIN screen title\\" into nyc-mr1-dev am: 79321c480f
...
am: 932b49408d
Change-Id: I5e7ecd3f4ad0af36622b16300f46dc155b0339b3
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
Change-Id: I6452514f23d954db0d965b8b71cc03f710c30791
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
Change-Id: Ifa9a9082decbd61e735dd648c6bde5cb51b86a65
2016-07-12 02:44:18 +00:00
Maurice Lam
d776f53ecd
Merge \"Update button styles for fingerprint\" into nyc-mr1-dev
...
am: 68d65abaaa
Change-Id: I718eb92c675f186b1450c378ce1c6589a862862b
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
Change-Id: Ib2424c72c045fe6932c11cb1a8e386c695910e01
2016-07-12 01:32:45 +00:00
Doris Ling
1de7559bdc
Merge \"Disable Gestures Settings by default.\" into nyc-mr1-dev
...
am: 709aa539c8
Change-Id: I164c244613a9d58b7e2f5ec37d144385d577ccdd
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
Change-Id: Ia2c432d0692a9a7bf9fd3f1277f79d25d4e1ead9
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
Bill Yi
c649d28cec
Import translations. DO NOT MERGE
...
Change-Id: I7b972f861006fd59590ca433f16f6f794c792161
Auto-generated-cl: translation import
2016-07-11 12:53:47 -07:00