Daniel Nishi
6ae5203e7a
Merge \"Log when the storage manager is toggled on and off.\" into nyc-mr1-dev
...
am: 3cd686d4a9
Change-Id: I94a22cadb4c142e5fabeb956d411a794e5c0032a
2016-07-13 16:35:34 +00:00
Daniel Nishi
3cd686d4a9
Merge "Log when the storage manager is toggled on and off." into nyc-mr1-dev
2016-07-13 16:26:06 +00:00
Mahaver Chopra
fae757cb1c
Merge \"Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED\" into nyc-mr1-dev
...
am: ec618dc585
Change-Id: Ide526f716b96a73635853d621bef61d09ff04425
2016-07-13 12:34:04 +00:00
Mahaver Chopra
ec618dc585
Merge "Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED" into nyc-mr1-dev
2016-07-13 12:27:03 +00:00
Fan Zhang
85a11e7f82
Merge \"Request support rules to refresh when account changes.\" into nyc-mr1-dev
...
am: 987eadbd4b
Change-Id: I7ff6ead262c69d18b8a5fc746e58c1a62a23e68a
2016-07-13 01:25:45 +00:00
TreeHugger Robot
987eadbd4b
Merge "Request support rules to refresh when account changes." into nyc-mr1-dev
2016-07-13 01:13:01 +00:00
Maurice Lam
c5ce869127
Merge \"Center find-sensor graphic in landscape\" into nyc-mr1-dev
...
am: 22f5b479b5
Change-Id: I8387a3cb6ae1977404356989449d374979a06214
2016-07-13 00:04:39 +00:00
Maurice Lam
22f5b479b5
Merge "Center find-sensor graphic in landscape" into nyc-mr1-dev
2016-07-13 00:00:54 +00:00
Maurice Lam
b07f0cc650
Merge \"Add ripples to negative buttons\" into nyc-mr1-dev
...
am: 95f905b3c0
Change-Id: Ib15b4ab36db857773607ef3145fcabcac7a28314
2016-07-12 23:47:30 +00:00
Doris Ling
cd82ff3092
Merge \"Update preference ordering in Gestures settings.\" into nyc-mr1-dev
...
am: 22176641b2
Change-Id: Id3f021e78d5fe1d3e4522ae6c56e4a94e429903c
2016-07-12 23:44:14 +00:00
Doris Ling
0a86720e19
Merge \"Update resource string for gestures settings.\" into nyc-mr1-dev
...
am: 4410b6b663
Change-Id: I3e31e6276091c1d8562abf58d3208a842e6a60fe
2016-07-12 23:44:13 +00:00
TreeHugger Robot
95f905b3c0
Merge "Add ripples to negative buttons" into nyc-mr1-dev
2016-07-12 23:43:47 +00:00
Fan Zhang
eadc7dc815
Request support rules to refresh when account changes.
...
Bug: 30079512
When account is added, operation rule can potentially change. Request a
refresh to make sure user sees the latest UI.
Change-Id: I89e9d97bec22d612ca3602d86cc63f8f06355a39
2016-07-12 16:42:40 -07:00
Doris Ling
22176641b2
Merge "Update preference ordering in Gestures settings." into nyc-mr1-dev
2016-07-12 23:38:02 +00:00
Doris Ling
4410b6b663
Merge "Update resource string for gestures settings." into nyc-mr1-dev
2016-07-12 23:37:38 +00:00
Maurice Lam
ea24bbf317
Add ripples to negative buttons
...
For the negative buttons (buttons on the left side) of screen lock setup
and fingerprint setup screens, instead of theming it like a text link,
inherit from the borderless button and set the highlight color to color
accent.
Bug: 29905448
Change-Id: I4a3d28d4a0658740d0cb622e40031ab0ca22e6a0
2016-07-12 21:54:08 +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
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
2aa423dda6
Log when the storage manager is toggled on and off.
...
Bug: 30095915
Change-Id: I9fe16f842f2c2944582ec231803aa957573abead
2016-07-12 13:59:22 -07: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
Doris Ling
1093b24c1b
Update preference ordering in Gestures settings.
...
Swapped the fingerprint swipe and ambient display preference in
Settings->Gestures, and updated the summary text in Display->Ambient
display
Bug: 30073941
Change-Id: Ifc386b4ab9b0e7317f1ee0e477f9670e8a49b0f9
2016-07-12 11:25:47 -07: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
7b2e48bc53
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-12 16:18:53 +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
Mahaver Chopra
6bc19a2e5c
Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED
...
Currently we used global setting to restrict user from enabling oem
unlock. As global settings can be chagned using adb, using user
restrictions instead.
Bug: 29893399
Change-Id: Icaffb080979a447d1e0f7f0d72f92c9db83ac10c
2016-07-12 15:18:49 +01: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
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
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
8a26bfb1a7
Center find-sensor graphic in landscape
...
Center the find-sensor graphic in landscape so it can occupy the
space next to the title as well, preventing it from being cropped
when the font-size and display size is set to maximum.
Bug: 29516872
Change-Id: I3d2a6d0852ec725c99ba5709a97e532cd0338778
2016-07-11 20:14:49 -07: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
a2946481c9
Update resource string for gestures settings.
...
Update the summary text for the gestures settings.
Bug: 30074265
Change-Id: I5e4313f2764aa64af8bd7b984189f2d0782a0a70
2016-07-11 18:38:08 -07: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