Jason Monk
8a7d0744be
Fix crash from dismissing after pause
...
Change-Id: Ic9f655bff5aec5678d975389bc1f391b8d608099
Fixes: 29977187
2016-07-15 13:18:48 -04:00
Jason Monk
d1a54dc62a
Merge \"Make sure to clear out preference cache when done\" into nyc-mr1-dev
...
am: 9b0931e986
2016-07-15 17:05:47 +00:00
Jason Monk
1e03e52f42
Fix up for forget storage screen
...
Change-Id: Iaed41e2df377f1e2cb3026e2bdb69f29f9c2be5b
Fixes: 29904366
2016-07-15 12:58:55 -04:00
Jason Monk
9b0931e986
Merge "Make sure to clear out preference cache when done" into nyc-mr1-dev
2016-07-15 16:55:15 +00:00
Tony Mak
67cf3e6a88
Merge \"Disallow user to block notification from OobConfig\" into nyc-mr1-dev
...
am: 080f794b6e
2016-07-15 16:20:57 +00:00
Esteban Talavera
080f794b6e
Merge "Disallow user to block notification from OobConfig" into nyc-mr1-dev
2016-07-15 16:14:22 +00:00
Jason Monk
af250e18c2
Merge \"Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481 am: e67f458667 -s ours am: 2703570242 am: 2263a64eb8\" into nyc-mr1-dev-plus-aosp
...
am: 767b482697
2016-07-15 14:17:01 +00:00
Jason Monk
2f5d9d6cef
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481 am: e67f458667 -s ours am: 2703570242 am: 3dda853d77
...
am: 52cb1d950f
2016-07-15 14:17:01 +00:00
Android Build Merger (Role)
767b482697
Merge "Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481 am: e67f458667 -s ours am: 2703570242 am: 2263a64eb8" into nyc-mr1-dev-plus-aosp
2016-07-15 14:14:21 +00:00
Jason Monk
52cb1d950f
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481 am: e67f458667 -s ours am: 2703570242
...
am: 3dda853d77
2016-07-15 14:14:08 +00:00
Jason Monk
370b7aa26b
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481 am: e67f458667 -s ours am: 2703570242
...
am: 2263a64eb8
2016-07-15 14:14:07 +00:00
Jason Monk
3dda853d77
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481 am: e67f458667 -s ours
...
am: 2703570242
2016-07-15 14:11:30 +00:00
Jason Monk
2263a64eb8
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481 am: e67f458667 -s ours
...
am: 2703570242
2016-07-15 14:11:29 +00:00
Jason Monk
2703570242
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481
...
am: e67f458667
2016-07-15 14:08:40 +00:00
Jason Monk
e67f458667
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf
...
am: 68d53c0481
2016-07-15 14:05:59 +00:00
Jason Monk
68d53c0481
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b
...
am: 2d21d1b9cf
2016-07-15 14:03:03 +00:00
Jason Monk
2d21d1b9cf
Pre-setup restrictions DO NOT MERGE
...
am: e6ad6e866b
2016-07-15 13:59:59 +00:00
Tony Mak
f869df20c4
Merge \\"Disable instead of hiding add account preference\\" into nyc-mr1-dev am: 8738e406c8
...
am: c76f7fcba1
2016-07-15 03:51:06 +00:00
Tony Mak
c76f7fcba1
Merge \"Disable instead of hiding add account preference\" into nyc-mr1-dev
...
am: 8738e406c8
2016-07-15 03:47:52 +00:00
Tony Mak
8738e406c8
Merge "Disable instead of hiding add account preference" into nyc-mr1-dev
2016-07-15 03:42:07 +00:00
Bill Yi
7c2e01ee55
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 995a5144cf -s ours
...
am: 618ac625cc
2016-07-14 20:34:24 +00:00
Bill Yi
618ac625cc
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: 995a5144cf
2016-07-14 20:26:06 +00:00
TreeHugger Robot
995a5144cf
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-14 20:14:21 +00:00
TreeHugger Robot
8c6822ec57
Merge "Import translations. DO NOT MERGE"
2016-07-14 14:27:13 +00:00
Andrew Sapperstein
513ebfbb02
Merge \\"Open Security Patch Bulletin\\" into nyc-mr1-dev am: 410273210d
...
am: 1d13c973bf
2016-07-14 14:13:06 +00:00
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
