Andrew Sapperstein
1d13c973bf
Merge \"Open Security Patch Bulletin\" into nyc-mr1-dev
...
am: 410273210d
2016-07-14 13:59:18 +00:00
TreeHugger Robot
410273210d
Merge "Open Security Patch Bulletin" into nyc-mr1-dev
2016-07-14 13:49:58 +00:00
Tony Mak
6ba9e15c4a
Disallow user to block notification from OobConfig
...
Change-Id: I4680e5c5b596e81ac33d544d0d81de9df3b7587c
Fix: 29632126
2016-07-14 15:32:26 +08:00
Bill Yi
1a0f642c24
Import translations. DO NOT MERGE
...
Change-Id: I9230fd1dacce710c8cb39946a65ed3550b6d2e0a
Auto-generated-cl: translation import
2016-07-13 23:07:59 -07:00
Tony Mak
981e9a96dc
Disable instead of hiding add account preference
...
Bug: 29236399
Change-Id: Ieb1af7f31a54b1502ae99682fc423e37c86a2353
2016-07-14 13:42:50 +08:00
Bill Yi
c4aa423de7
Import translations. DO NOT MERGE
...
Change-Id: Iee62711d055736d027bd044022b952d89a8fd50c
Auto-generated-cl: translation import
2016-07-13 22:23:18 -07:00
Michael Wright
aacf55ab3f
Color transforms are now color modes.
...
We've also standardized on a specific, enumerated set of modes, which
simplifies the code a bit.
Bug: 29044347
Change-Id: I621352954d42ad25f9969b7a88d53defe84dd3b4
2016-07-13 22:12:33 -07:00
Jeff Sharkey
99d9a1d34d
Merge \\"Preemptively add string for direct boot dialogs.\\" into nyc-mr1-dev am: 93cbd71610
...
am: 1a16dd8e0f
2016-07-14 04:36:09 +00:00
Jeff Sharkey
1a16dd8e0f
Merge \"Preemptively add string for direct boot dialogs.\" into nyc-mr1-dev
...
am: 93cbd71610
2016-07-14 04:33:06 +00:00
Jeff Sharkey
93cbd71610
Merge "Preemptively add string for direct boot dialogs." into nyc-mr1-dev
2016-07-14 04:31:36 +00:00
Jeff Sharkey
10b6d4d220
Preemptively add string for direct boot dialogs.
...
Bug: 27196876
Change-Id: Ieb65b4b7b4e075c1de2e502d0272f8f113c1c34b
2016-07-14 04:31:08 +00:00
Doris Ling
86c2c94521
Merge \\"Revert equal check in DashboardAdapter.setCondition().\\" into nyc-mr1-dev am: 3468853cef
...
am: 7072bd2f1c
2016-07-14 03:46:56 +00:00
Doris Ling
7072bd2f1c
Merge \"Revert equal check in DashboardAdapter.setCondition().\" into nyc-mr1-dev
...
am: 3468853cef
2016-07-14 03:42:02 +00:00
Doris Ling
3468853cef
Merge "Revert equal check in DashboardAdapter.setCondition()." into nyc-mr1-dev
2016-07-14 03:34:00 +00:00
Wonsik Kim
52693ab0aa
Refine fingerprint animation handling
...
Release stale SurfaceTexture and MediaPlayer when necessary.
Bug: 30104155
Change-Id: Ife5ba215fb962522cf007cd711a9329b4202cc39
2016-07-14 11:58:47 +09:00
Tony Mak
26e60afdf1
Merge \\"Hide Set Wallpaper in Settings suggestion if it is not allowed\\" into nyc-mr1-dev am: 1a8be1e372
...
am: 494fed5682
2016-07-14 01:48:33 +00:00
Tony Mak
494fed5682
Merge \"Hide Set Wallpaper in Settings suggestion if it is not allowed\" into nyc-mr1-dev
...
am: 1a8be1e372
2016-07-14 01:38:16 +00:00
Andrew Sapperstein
6529c8a53e
Open Security Patch Bulletin
...
When in device settings, in about phone, we show the current
security patch. Now, we'll also fire and intent to open a link
to the security bulletin page so users can see details about
their security patch.
Change-Id: I59c9e6ac0aecb0398992942a0fee4cb0a3cf268e
Fixes: 29828303
2016-07-13 18:27:43 -07:00
Tony Mak
1a8be1e372
Merge "Hide Set Wallpaper in Settings suggestion if it is not allowed" into nyc-mr1-dev
2016-07-14 01:22:52 +00:00
Fan Zhang
810a21843e
Merge \\"Add content description to escalation card title.\\" into nyc-mr1-dev am: 31e5d5bb4b
...
am: 458024f52e
2016-07-14 00:01:21 +00:00
Mike Tsao
3191dbe334
Merge \\"Change \\"ringer volume\\" to \\"ring volume\\"\\" into nyc-mr1-dev am: bb15f3d14f
...
am: 0311342bc8
2016-07-14 00:01:20 +00:00
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
