Jason Monk
4c5f408e26
Merge \\"Make sure to clear out preference cache when done\\" into nyc-mr1-dev am: 9b0931e986
...
am: d1a54dc62a
Change-Id: I07e1c9725cd6880d7b974e318959cb746ab014b4
2016-07-15 17:55:57 +00:00
Esteban Talavera
cd4b145d80
Merge \\"Disallow user to block notification from OobConfig\\" into nyc-mr1-dev am: 080f794b6e
...
am: 67cf3e6a88
Change-Id: I635850140226144c67737689e8312aa935d2d589
2016-07-15 17:55:57 +00:00
Fyodor Kupolov
8863d4f576
Application names are now lazily loaded
...
am: c9b9898e9a
Change-Id: I598a0c4b44508dc96d4d18ffba8c2b53eb120a36
2016-07-15 17:41:14 +00:00
Fyodor Kupolov
c9b9898e9a
Application names are now lazily loaded
...
Previously when SmsApplication.getDefaultApplication was called, application
names were loaded for all candidate apps. The problem with that approach
that names are expensive to load and not always needed.
The implementation has been changed to only load application name when
it's requested by getApplicationName(Context).
Bug: 26237300
Change-Id: Ia711b7db8b979af8f7a1be7eefbce20f3e0ab1df
2016-07-15 17:32:02 +00:00
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
Change-Id: Ifc03fb29a5c4404448e6f1bfb844c7688b7f0810
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
Change-Id: Ia7a8bda97395cb403ba1db94cb9048e1f43ed9e8
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
-s ours
Change-Id: I6f34f765a99bbc84e5db0eac118bf3a214f20fae
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
-s ours
Change-Id: Ibbc9f3b6a1b9dfbb828587b62d0d92ce182f40cb
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
Change-Id: If6f655e274469d80425a15ee429a0455448a19d9
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
Change-Id: I2dadb722e3b46bd11f72e5a125fb80c55ac5c5be
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
Change-Id: I0e3964b7a1b7398ae96a798de892a40d05be0add
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
Change-Id: Ia0abf8f562cbec2afa86d5e85ecf22de190f86d6
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
-s ours
Change-Id: Ic5c066a81be1fe3b884cf1c9ead6c7c276a12fd1
2016-07-15 14:08:40 +00:00
Jason Monk
e67f458667
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b
am: 2d21d1b9cf
...
am: 68d53c0481
Change-Id: Ic501eb9b08f18eb3e9f3e95d64aae511815db268
2016-07-15 14:05:59 +00:00
Jason Monk
68d53c0481
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b
...
am: 2d21d1b9cf
Change-Id: I1fc62827de765434ac88a7cb75d63febb074b565
2016-07-15 14:03:03 +00:00
Jason Monk
2d21d1b9cf
Pre-setup restrictions DO NOT MERGE
...
am: e6ad6e866b
Change-Id: I0bfc276c9bf0e3d6320cc9aa8c77f77899b69e04
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
Change-Id: I5ad4443041ef51f420fa056b8dbcd9af9d8fc5a5
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
Change-Id: Ibe0bfa084e14dece83b19d4e62d50b96928b042a
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
-s ours
Change-Id: Ida6cd86269727680fe966212d2fc5e63c37b48af
2016-07-14 20:34:24 +00:00
Bill Yi
618ac625cc
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: 995a5144cf
-s ours
Change-Id: Ib0b91b99d2bab4eb2a7a5b0f5ea07155c41e02e8
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
Change-Id: Iae823ccfb4acb4c881fcaf176df067dc0dc3e961
2016-07-14 14:13:06 +00:00
Andrew Sapperstein
1d13c973bf
Merge \"Open Security Patch Bulletin\" into nyc-mr1-dev
...
am: 410273210d
Change-Id: Ia0e45925498c66af98a62725a02e1b31892dd01a
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
Change-Id: I9d8b91d4328a081a82402c85a3a911a32263496b
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
Change-Id: I7869dfe57a964aa35a460a6fd8ccf9949709d6d1
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
Change-Id: I276a4b3d4ddfbf0f89b16f9d49657f685d7ed205
2016-07-14 03:46:56 +00:00
Doris Ling
7072bd2f1c
Merge \"Revert equal check in DashboardAdapter.setCondition().\" into nyc-mr1-dev
...
am: 3468853cef
Change-Id: I136422e5b2dccf4f17ab5645bd6af48a1c47dc9a
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
Change-Id: I34d7fc9602adaa3d78d1cc05069ac34d5bf7c6db
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
Change-Id: Ic8a85dbb4b654f6df0bad993a1cce986f60ab193
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
Change-Id: Iddab902a2077e4aece42c3536f2dbb537febdd4c
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
Change-Id: I23928c43b7fd8a74f8bfc049958fed54658fc24e
2016-07-14 00:01:20 +00:00