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
a708284946
Merge \\"Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED\\" into nyc-mr1-dev am: ec618dc585
...
am: fae757cb1c
Change-Id: Ie84f55e2bdda60224e828b52398880852577e9d8
2016-07-13 12:40:32 +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
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
TreeHugger Robot
a4e3c14848
Update summary and title strings for Settings Suggestions
...
Setting Suggestion messages have new strings for NDR.
Change-Id: I5e76e669fac91b61a2207bb2937c107c952768c0
Fixes: 30067406
2016-07-12 18:39:19 -07: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
TreeHugger Robot
987eadbd4b
Merge "Request support rules to refresh when account changes." into nyc-mr1-dev
2016-07-13 01:13:01 +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
Maurice Lam
e4722d7822
Merge \\"Center find-sensor graphic in landscape\\" into nyc-mr1-dev am: 22f5b479b5
...
am: c5ce869127
Change-Id: I6b4966047a54f0a56e4db3f558d5307c8f26e3b4
2016-07-13 00:07:55 +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
9af3bbd8a5
Merge \\"Add ripples to negative buttons\\" into nyc-mr1-dev am: 95f905b3c0
...
am: b07f0cc650
Change-Id: I8214ab2c04eea59258c2402285ed9dbdc1ab6946
2016-07-12 23:51:04 +00:00
Doris Ling
336d5bfaa4
Merge \\"Update preference ordering in Gestures settings.\\" into nyc-mr1-dev am: 22176641b2
...
am: cd82ff3092
Change-Id: I605de86a2a218a40598e29c0ae050274e0ed1278
2016-07-12 23:51:03 +00:00
Doris Ling
e95c01705c
Merge \\"Update resource string for gestures settings.\\" into nyc-mr1-dev am: 4410b6b663
...
am: 0a86720e19
Change-Id: I790175513041954dad3583ca1f1d40566e617ebc
2016-07-12 23:51:02 +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
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
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
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
Matthew Fritze
d21e0e914c
Update Safety & Regulatory Information link text
...
The link to Safety & Regulatory Information now reads:
Safety & regulatory manual
Bug: 30037999
Change-Id: Ib72efba96b8a9a9f38bcf9686e2563d1877620a8
2016-07-12 09:47:33 -07: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