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
Tony Mak
2c5a27dc7a
Hide Set Wallpaper in Settings suggestion if it is not allowed
...
Change-Id: I8030389f3fe945c3df241f347d58b8da04622d9e
Fix: 30089761
2016-07-13 17:57:33 +08:00
Fan Zhang
53d077cde2
Merge \\"Request support rules to refresh when account changes.\\" into nyc-mr1-dev am: 987eadbd4b
...
am: 85a11e7f82
Change-Id: If38d026fcdaf782b5ab95084710c03fd56a83b21
2016-07-13 01:29:44 +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
Doris Ling
b76de265a2
Reduce the number of times that dataset changed is triggerd in DashboardAdapter
...
1. Save the suggestion list and the category list into the instance
state so that it will be available on warm start, and avoid the need
to reload the data.
2. Add the condition list to the constructor parameters for
DashboardAdapter, so that it does not need to setConditions()
separately which will trigger notifyDataSetChanged()
Bug: 30055644
Change-Id: Ia04fa3a25b13d2dacf6baf5f412d662a595fb6dd
2016-07-12 18:02:22 -07: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
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
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
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
bd900c98ef
Merge \"Settings: add logpersist kernel only selection\"
...
am: 3c60540078
Change-Id: Ieefd7e08368174f735b8491f8f01847906e1fd3b
2016-07-12 15:29:51 +00:00
Mark Salyzyn
98849ce7ae
Settings: trampoline persist.logd.logpersistd to logd.logpersistd
...
- Deal with trampoline, where we read logd.logpersistd and
logd.logpersistd.buffer, write to persist.logd.logpersistd and
persist.logd.logpersistd.buffer and logd.logpersistd*
- Deal with an as designed requirement that empty values do not
automatically trampoline, to properly communicate state.
- check logd.logpersistd.enable boolean for support
Bug: 28936216
Bug: 29831823
Change-Id: Ib460ca90738ffdee17084349c1035701301c52bc
2016-07-12 07:22:41 -07: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
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
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
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
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
Makoto Onuki
5922902ab3
Merge \"Restore \"reset ShortcutManager rate limiting\" dev option\" into nyc-mr1-dev
...
am: ed9aed1878
Change-Id: If095c72ed03bbae493259479c6b23a862e71db4c
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
Change-Id: I60148caf5e9bd37ae2c0460e6c8a8d6aacf478aa
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
Change-Id: I28cec18b2f9df53b0a48f7668311e1d4120cb636
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
Justin Klaassen
1863ffc982
resolve merge conflicts of 67b3a94 to master
...
Change-Id: I8fabdf019fea12793c54745390ed4669118548d0
2016-07-08 14:40:55 -07:00