Commit Graph

28520 Commits

Author SHA1 Message Date
Mike Tsao
28ca7419c9 Merge \"Rename Night display to Night Light\" into nyc-mr1-dev
am: 6d0ed88746

Change-Id: Ie3a3782361b0dd5ffe5697f2730b39b9a3aa0e19
2016-07-13 23:36:50 +00:00
TreeHugger Robot
6d0ed88746 Merge "Rename Night display to Night Light" into nyc-mr1-dev 2016-07-13 22:01:19 +00:00
Doris Ling
a0ded7042d Merge \"Change launch method for preference Display->Ambient Display.\" into nyc-mr1-dev
am: ea7e1b5d97

Change-Id: Idd7fd7cc03b1a52d713312def40f11b6974f1cdb
2016-07-13 21:18:08 +00:00
Doris Ling
ea7e1b5d97 Merge "Change launch method for preference Display->Ambient Display." into nyc-mr1-dev 2016-07-13 21:13:53 +00:00
Daniel Nishi
a2f07b0475 Merge \"Update summary and title strings for Settings Suggestions\" into nyc-mr1-dev
am: 5d8b432137

Change-Id: I0852939447039fdaefa14a151bba0f60aa4b6f43
2016-07-13 21:12:53 +00:00
Matthew Fritze
5d8b432137 Merge "Update summary and title strings for Settings Suggestions" into nyc-mr1-dev 2016-07-13 21:03:34 +00:00
Matthew Fritze
989a536667 Merge \"Update Safety & Regulatory Information link text\" into nyc-mr1-dev
am: 38415ff361

Change-Id: Ica24c00e555414bdc6c60e687975add88f8c9b8e
2016-07-13 20:56:30 +00:00
Matthew Fritze
38415ff361 Merge "Update Safety & Regulatory Information link text" into nyc-mr1-dev 2016-07-13 20:52:45 +00:00
Fan Zhang
7d1ef4ca3c Merge \"Cross fade escalation card when content changes.\" into nyc-mr1-dev
am: b10df69a84

Change-Id: I2fe2f2ab2cad15e1ee60ba7dafb3ccd7fd349604
2016-07-13 19:51:35 +00:00
TreeHugger Robot
b10df69a84 Merge "Cross fade escalation card when content changes." into nyc-mr1-dev 2016-07-13 19:46:02 +00:00
Mike Tsao
36dc6a8b28 Rename Night display to Night Light
Bug: 30069874
Bug: 29584858

Renames generic "Night display" to "Night Light." Also changes feature
description to emphasize suitability for reading at night.

Change-Id: Ib54a22d7683853d7aadf4fe48795aaaa990b0333
2016-07-13 12:31:38 -07:00
Fan Zhang
060287a805 Merge \"Tweak layouts to make support UI look better.\" into nyc-mr1-dev
am: 8b47c12550

Change-Id: I29e31e40f60f160e26c1ec17afb4cb60cbe90b7a
2016-07-13 18:57:40 +00:00
TreeHugger Robot
8b47c12550 Merge "Tweak layouts to make support UI look better." into nyc-mr1-dev 2016-07-13 18:51:54 +00:00
Doris Ling
a8046161be Change launch method for preference Display->Ambient Display.
Change to launch using intent to maintain the activity title when
launching Moves from Display->Ambient Display.

Bug: 30034039
Change-Id: I7e8df04a5c6722320b342e09ea1977b5ba7a8ded
2016-07-13 11:51:36 -07:00
Mark Salyzyn
d98dc9f70e Merge \\\"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\\\" am: a1b40f0267 am: 455006c9ca
am: 2e6a8bb8f8

Change-Id: I67e73fbe05e88580d41bae73436e53a325655634
2016-07-13 18:09:12 +00:00
Mark Salyzyn
2e6a8bb8f8 Merge \\"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\\" am: a1b40f0267
am: 455006c9ca

Change-Id: Ia486d98338a1fdc60103324c99a46b31883af932
2016-07-13 18:05:34 +00:00
Mark Salyzyn
455006c9ca Merge \"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\"
am: a1b40f0267

Change-Id: I38e4c7756a2ea617053656558d8223458d898a28
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

Change-Id: I0989b7f8e122d5221757b57b1866d536a1657ae3
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
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
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
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
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