Doris Ling
89b315568a
resolve merge conflicts of 161093b to master
...
Change-Id: I14c74be54ca216b1f1e369685516a821a94ab30a
2016-07-13 11:18:28 -07:00
Mark Salyzyn
d98dc9f70e
Merge \\\"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\\\" am: a1b40f0267 am: 455006c9ca
...
am: 2e6a8bb8f8
2016-07-13 18:09:12 +00:00
Mark Salyzyn
2e6a8bb8f8
Merge \\"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\\" am: a1b40f0267
...
am: 455006c9ca
2016-07-13 18:05:34 +00:00
Mark Salyzyn
455006c9ca
Merge \"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\"
...
am: a1b40f0267
2016-07-13 18:02:20 +00:00
Treehugger Robot
a1b40f0267
Merge "Settings: trampoline persist.logd.logpersistd to logd.logpersistd"
2016-07-13 17:45:45 +00:00
Doris Ling
161093bb0a
Merge \"Reduce the number of times that dataset changed is triggerd in DashboardAdapter\" into nyc-mr1-dev
...
am: 8c50ced07c
2016-07-13 17:25:16 +00:00
Fan Zhang
5df6364d89
Cross fade escalation card when content changes.
...
Fixes: 30079520
Whenever escalation card needs to change content:
- Instead of rebuilding entire data set, rebuild just escalation data.
- Instead of notify entire data set change, only notify the position
change for escalation card.
This triggers the cross-fade animation in RecyclerView's
DefaultItemAnimator.
Change-Id: Ia19593d852fa6a1c366aecf9330d8274d7295e85
2016-07-13 10:23:52 -07:00
Fan Zhang
55c6ea25f4
Tweak layouts to make support UI look better.
...
Fixes: 30087623
- Removed some padding and hide empty textviews.
Change-Id: Id8476aa3870d796c5f5a34c2f3fa6db34918691b
2016-07-13 10:19:56 -07:00
Doris Ling
8c50ced07c
Merge "Reduce the number of times that dataset changed is triggerd in DashboardAdapter" into nyc-mr1-dev
2016-07-13 17:13:05 +00:00
Daniel Nishi
efd2761eea
Merge \\"Log when the storage manager is toggled on and off.\\" into nyc-mr1-dev am: 3cd686d4a9
...
am: 6ae5203e7a
2016-07-13 16:47:28 +00:00
Daniel Nishi
6ae5203e7a
Merge \"Log when the storage manager is toggled on and off.\" into nyc-mr1-dev
...
am: 3cd686d4a9
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
a708284946
Merge \\"Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED\\" into nyc-mr1-dev am: ec618dc585
...
am: fae757cb1c
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
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
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
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
2016-07-13 00:07:55 +00:00
Maurice Lam
c5ce869127
Merge \"Center find-sensor graphic in landscape\" into nyc-mr1-dev
...
am: 22f5b479b5
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
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
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
2016-07-12 23:51:02 +00:00
Maurice Lam
b07f0cc650
Merge \"Add ripples to negative buttons\" into nyc-mr1-dev
...
am: 95f905b3c0
2016-07-12 23:47:30 +00:00
Doris Ling
cd82ff3092
Merge \"Update preference ordering in Gestures settings.\" into nyc-mr1-dev
...
am: 22176641b2
2016-07-12 23:44:14 +00:00
Doris Ling
0a86720e19
Merge \"Update resource string for gestures settings.\" into nyc-mr1-dev
...
am: 4410b6b663
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
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
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
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
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
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
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
2016-07-12 16:53:58 +00:00
Bill Yi
45aa5c8cd0
Import translations. DO NOT MERGE am: fdb2a9ab61 -s ours
...
am: f7e4533931
2016-07-12 16:53:42 +00:00
Bill Yi
032f398ee8
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: 7b2e48bc53
2016-07-12 16:53:41 +00:00
