Mike Tsao
e572577acf
Merge \\"Rename Night display to Night Light\\" into nyc-mr1-dev am: 6d0ed88746
...
am: 28ca7419c9
2016-07-14 00:01:19 +00:00
Fan Zhang
458024f52e
Merge \"Add content description to escalation card title.\" into nyc-mr1-dev
...
am: 31e5d5bb4b
2016-07-13 23:36:52 +00:00
Mike Tsao
0311342bc8
Merge \"Change \"ringer volume\" to \"ring volume\"\" into nyc-mr1-dev
...
am: bb15f3d14f
2016-07-13 23:36:51 +00:00
Mike Tsao
28ca7419c9
Merge \"Rename Night display to Night Light\" into nyc-mr1-dev
...
am: 6d0ed88746
2016-07-13 23:36:50 +00:00
TreeHugger Robot
31e5d5bb4b
Merge "Add content description to escalation card title." into nyc-mr1-dev
2016-07-13 23:29:46 +00:00
Doris Ling
08d34b6a99
Revert equal check in DashboardAdapter.setCondition().
...
1. Remove the equality check for the conditions list which causes
"Airplane mode is on" to be shown always even when airplane mode is
turned off.
2. Also add mIsShowingAll and mSuggestionMode to instance state.
Bug: 30055644
Change-Id: I0709e9a1b0139e80cdb834cb76a9334dce753e14
2016-07-13 16:17:13 -07:00
TreeHugger Robot
bb15f3d14f
Merge "Change "ringer volume" to "ring volume"" into nyc-mr1-dev
2016-07-13 22:13:27 +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
2ddbc57e2b
Merge \\"Change launch method for preference Display->Ambient Display.\\" into nyc-mr1-dev am: ea7e1b5d97
...
am: a0ded7042d
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
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
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
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
2016-07-13 20:59:35 +00:00
Matthew Fritze
989a536667
Merge \"Update Safety & Regulatory Information link text\" into nyc-mr1-dev
...
am: 38415ff361
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
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
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
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
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
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
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
