Commit Graph

29953 Commits

Author SHA1 Message Date
TreeHugger Robot
6d0ed88746 Merge "Rename Night display to Night Light" into nyc-mr1-dev 2016-07-13 22:01:19 +00:00
Doris Ling
2ddbc57e2b Merge \\"Change launch method for preference Display->Ambient Display.\\" into nyc-mr1-dev am: ea7e1b5d97
am: a0ded7042d

Change-Id: Ieda7e35a4515cbceb9f5aaba2f45346a62855235
2016-07-13 21:24:53 +00:00
Matthew Fritze
40b1de8f52 Merge \\"Update summary and title strings for Settings Suggestions\\" into nyc-mr1-dev am: 5d8b432137
am: a2f07b0475

Change-Id: I1e5b49528839a66ba9c1f9c52553f6a579cf61e5
2016-07-13 21:24:45 +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
d50ff42d86 Merge \\"Update Safety & Regulatory Information link text\\" into nyc-mr1-dev am: 38415ff361
am: 989a536667

Change-Id: I907c7f5aa7519aab4e8f6b1030ca7d24929ff90f
2016-07-13 20:59:35 +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
0bd87d71b8 Add content description to escalation card title.
Bug: 30079904

In strings like "We're here for you 24/7", to avoid talkback read 24/7
as 24/7ths, we need to provide a custom content description.

Change-Id: If51586d97a376e7a859658d7a6dc48108094ddc2
2016-07-13 13:47:04 -07:00
Fan Zhang
6cd15aa33d Merge \\"Cross fade escalation card when content changes.\\" into nyc-mr1-dev am: b10df69a84
am: 7d1ef4ca3c

Change-Id: I64c941be24fba33b7ce5087e83d71e4492a5b4ec
2016-07-13 19:57:09 +00:00
Mike Tsao
a49178a487 Change "ringer volume" to "ring volume"
Bug: 29565896

Changes all occurrences of "ringer volume" to "ring volume" in
Settings string file, including in comments.

Change-Id: Iad197dbbbbec16120fcd3ac835c1647a7f4c0c32
2016-07-13 12:52:32 -07: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
06890df24a Merge \\"Tweak layouts to make support UI look better.\\" into nyc-mr1-dev am: 8b47c12550
am: 060287a805

Change-Id: I37f654617bf210dd6601b2f6bfc23edc6e821880
2016-07-13 19:08:51 +00: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
4aaacb08e9 Merge \\\\"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\\\\" am: a1b40f0267 am: 455006c9ca am: 2e6a8bb8f8
am: d98dc9f70e

Change-Id: Id1d031f74f132f277397ca1f04c15f6aaae70b36
2016-07-13 18:26:01 +00:00
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

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
efd2761eea Merge \\"Log when the storage manager is toggled on and off.\\" into nyc-mr1-dev am: 3cd686d4a9
am: 6ae5203e7a

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

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
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