Chad Brubaker
c92ed2721b
Merge "Dont use FLAG_ENCRYPT for certificates"
2016-07-20 17:37:07 +00:00
Jason Monk
7db2409581
Merge \\"Protect against work conditional crash\\" into nyc-mr1-dev am: bd6a4f9066
...
am: ff1132470b
Change-Id: I15c8a0c428681cf787dcdc640b0512c974a4710a
2016-07-20 13:37:02 +00:00
Jason Monk
ff1132470b
Merge \"Protect against work conditional crash\" into nyc-mr1-dev
...
am: bd6a4f9066
Change-Id: I6072b6235abb35da9ecac1f41b01cf82e75d868b
2016-07-20 13:33:57 +00:00
Jason Monk
bd6a4f9066
Merge "Protect against work conditional crash" into nyc-mr1-dev
2016-07-20 13:28:13 +00:00
Justin Klaassen
3e2ddff8f7
Merge \\"Add Night display settings conditional\\" into nyc-mr1-dev am: b57ee0e02f
...
am: 5d8b1ca588
Change-Id: I64c13bb813f12cff6786a1021647b65bc226e384
2016-07-20 02:55:05 +00:00
Justin Klaassen
5d8b1ca588
Merge \"Add Night display settings conditional\" into nyc-mr1-dev
...
am: b57ee0e02f
Change-Id: I72715ad005fade9376d036ebe7abfde0c89bd1e5
2016-07-20 01:06:41 +00:00
Justin Klaassen
d60f09edaf
Add Night display settings conditional
...
Bug: 30043281
Change-Id: I2464cd90f1f7f379aabf123f602e6150a87120cf
2016-07-19 14:31:46 -07:00
Jason Monk
01333561c1
Merge \\\"Pre-setup restrictions\\\" into nyc-dev am: 5a3d1c17f2 am: 69ce586155
...
am: ef7473f012
Change-Id: Ib55e973570b0fd439f26c39d273d273d7808e2a1
2016-07-19 20:59:10 +00:00
Jason Monk
ef7473f012
Merge \\"Pre-setup restrictions\\" into nyc-dev am: 5a3d1c17f2
...
am: 69ce586155
Change-Id: I5e57fd8016f45d2bb863896aeee34c8786cf41f0
2016-07-19 20:47:46 +00:00
Jason Monk
69ce586155
Merge \"Pre-setup restrictions\" into nyc-dev
...
am: 5a3d1c17f2
Change-Id: I0bc7e426b0dfc4d233b9caa263e5361f94dbf6f2
2016-07-19 20:39:18 +00:00
Doris Ling
106352620d
Merge \\"Fix janky scrolling for Gestures Settings.\\" into nyc-mr1-dev am: c2733db43f
...
am: a87329dc31
Change-Id: I43edb89244d1f65239b9a3c2f463b8096c44550e
2016-07-19 20:38:49 +00:00
Doris Ling
a87329dc31
Merge \"Fix janky scrolling for Gestures Settings.\" into nyc-mr1-dev
...
am: c2733db43f
Change-Id: I78b884c04ec6fa05fe7a6068260331d8451181cf
2016-07-19 20:35:42 +00:00
Doris Ling
c2733db43f
Merge "Fix janky scrolling for Gestures Settings." into nyc-mr1-dev
2016-07-19 20:30:12 +00:00
Doris Ling
b98a2ed989
Merge \\"Add Gestures settings to search index.\\" into nyc-mr1-dev am: bd3ac3bf22
...
am: 6f975d2430
Change-Id: Ib470169f1269eda4deaf50db5af40a87f1279e05
2016-07-19 20:24:15 +00:00
Doris Ling
6f975d2430
Merge \"Add Gestures settings to search index.\" into nyc-mr1-dev
...
am: bd3ac3bf22
Change-Id: I0d7aa14a24f496aba842d5b70176bc6f44c49c3b
2016-07-19 20:21:45 +00:00
Doris Ling
ffb87f7e2a
Add Gestures settings to search index.
...
Add GestureSettings class to the resource map of
SearchIndeSearchIndexableResources so that the preferences in the
gestures settings will be indexed and showed up as search result.
Bug: 30169776
Change-Id: I51be9e82dc8bce93e2abd13b48ceb3cd051cbcf4
2016-07-19 11:45:03 -07:00
Jason Monk
31678f14e9
Protect against work conditional crash
...
Change-Id: Iba6e7281c622e3ba34fa6bd4672b2380b0329808
Fixes: 30014085
2016-07-19 14:22:14 -04:00
Chad Brubaker
616b3fe9ca
Dont use FLAG_ENCRYPT for certificates
...
Bug: 24966591
Change-Id: Iabe7946a3ef3e64b99f194b0c71c72eca99ea50b
2016-07-19 11:13:46 -07:00
Christopher Wiley
85cb9073c9
Merge \\"Do not use TetherUtil.setWifiTethering\\" into nyc-mr1-dev am: 62edbf484e
...
am: 9170100f6c
Change-Id: If1ddb743ac63cced7ef6a75f8f87d3465051a782
2016-07-19 16:07:26 +00:00
Christopher Wiley
9170100f6c
Merge \"Do not use TetherUtil.setWifiTethering\" into nyc-mr1-dev
...
am: 62edbf484e
Change-Id: I023592acc146cbddb2917556a0fb7c3dade417f4
2016-07-19 16:02:42 +00:00
TreeHugger Robot
62edbf484e
Merge "Do not use TetherUtil.setWifiTethering" into nyc-mr1-dev
2016-07-19 15:55:32 +00:00
Jason Monk
6263c2f6d4
Merge \\"Fix crash from dismissing after pause\\" into nyc-mr1-dev am: 8cb8dd05a2
...
am: 44c13b223f
Change-Id: I155ca86eb959fe9b5553be59842e15639c19d4a2
2016-07-19 14:35:53 +00:00
Jason Monk
44c13b223f
Merge \"Fix crash from dismissing after pause\" into nyc-mr1-dev
...
am: 8cb8dd05a2
Change-Id: I6ffd30d4c9dfa7e1c335a13495c1e7d823066c79
2016-07-19 14:33:16 +00:00
Jason Monk
8cb8dd05a2
Merge "Fix crash from dismissing after pause" into nyc-mr1-dev
2016-07-19 14:28:50 +00:00
Doris Ling
9345e4b3b6
Fix janky scrolling for Gestures Settings.
...
1. Move the media player initialization/cleanup to construstor and
onDetach() of GesturePreference correspondingly, so that it's only
done once instead of every time when a new texture surface is available.
2. Pause the animation video when user scrolls.
Bug: 29790087
Change-Id: I51e6a787f9f2964b6bfc5288f7f5af801ccecc31
2016-07-18 18:13:55 -07:00
Maurice Lam
b9af36fcfb
Merge \\"Support hardware colors for fingerprint video\\" into nyc-mr1-dev am: ebd722ce5b
...
am: c203aeb1c8
Change-Id: I54f7e6f085f658f5b546f1c4d3468509e447bb7b
2016-07-18 23:39:01 +00:00
Maurice Lam
c203aeb1c8
Merge \"Support hardware colors for fingerprint video\" into nyc-mr1-dev
...
am: ebd722ce5b
Change-Id: Ibe34d29438026e2e5bfd233e9a245025a9e66931
2016-07-18 23:36:15 +00:00
Maurice Lam
ebd722ce5b
Merge "Support hardware colors for fingerprint video" into nyc-mr1-dev
2016-07-18 23:24:18 +00:00
Adam Lesinski
d67d205999
Merge \\"Update FakeUid with new methods\\" into nyc-mr1-dev am: 30bef0a063
...
am: fe8e89e2fc
Change-Id: Ifb8f9e5773619509122b5a982b950da90e0d4381
2016-07-18 21:30:00 +00:00
Adam Lesinski
fe8e89e2fc
Merge \"Update FakeUid with new methods\" into nyc-mr1-dev
...
am: 30bef0a063
Change-Id: I3d9e4240c8986fad9ee3c3e3340027e127871d0b
2016-07-18 21:16:03 +00:00
TreeHugger Robot
30bef0a063
Merge "Update FakeUid with new methods" into nyc-mr1-dev
2016-07-18 20:58:15 +00:00
Maurice Lam
5a15745ff6
Support hardware colors for fingerprint video
...
Bug: 28745754
Change-Id: Id86c2a6d882d4c4c4d1981da58de3e4c2059a50c
2016-07-18 13:36:59 -07:00
Christopher Wiley
9d251279ca
Do not use TetherUtil.setWifiTethering
...
This functionality is replaced by ConnectivityManager.startTethering()
and ConnectivityManager.stopTethering().
Bug: 30147602
Test: Can toggle tethering on/off via all of settings, quick settings,
and quick quick settings.
Change-Id: I4d190185c473237982b988f898e76d4997dc401c
2016-07-18 11:17:14 -07:00
Wonsik Kim
1cbb9baf18
Merge \\"Refine fingerprint animation handling\\" into nyc-mr1-dev am: 534d644326
...
am: a1430e0a26
Change-Id: I9e88bc8a6d699da36c25854ce3fe187466257100
2016-07-18 15:42:36 +00:00
Wonsik Kim
a1430e0a26
Merge \"Refine fingerprint animation handling\" into nyc-mr1-dev
...
am: 534d644326
Change-Id: I39dee0085df38c687831057710645277a3d4ac96
2016-07-18 15:39:00 +00:00
Wonsik Kim
534d644326
Merge "Refine fingerprint animation handling" into nyc-mr1-dev
2016-07-18 15:31:18 +00:00
Adam Lesinski
f584eaa03a
Update FakeUid with new methods
...
Bug:28931278
Change-Id: I845337633b1840ae66bda065985624aa67b070df
2016-07-15 18:08:29 -07:00
Matthew Fritze
d5d92f4505
Merge \\"Settings ViewPager now correctly handles RTL mode\\" into nyc-mr1-dev am: b8257e6fee
...
am: b51d45aed0
Change-Id: I654d8fee969fe089b79d77af8135ac9fc3fdc309
2016-07-15 19:29:11 +00:00
Matthew Fritze
b51d45aed0
Merge \"Settings ViewPager now correctly handles RTL mode\" into nyc-mr1-dev
...
am: b8257e6fee
Change-Id: Id867babc43ed918eaf537a89284fe37d9068014d
2016-07-15 19:17:07 +00:00
Matthew Fritze
b8257e6fee
Merge "Settings ViewPager now correctly handles RTL mode" into nyc-mr1-dev
2016-07-15 19:06:48 +00:00
Matthew Fritze
44564126c3
Settings ViewPager now correctly handles RTL mode
...
Previously, the settings and support tabs were incorrectly orderded,
and had inverted transitions on click and on swipe.
Ordering of tabs now correctly displays All Settings as the default,
right tab, and the Support tab to its left. The tab headers also now
function properly in transition, and onclick.
Change-Id: Iab499ee13433cb78941bc33cbb0e99ffe2937174
Fixes: 30079049
2016-07-15 11:55:53 -07:00
Jason Monk
45b27bb389
Merge \\"Fix up for forget storage screen\\" into nyc-mr1-dev am: f83ac369b0
...
am: 61305ee4d9
Change-Id: I0dc63213945ad61531756636bdd68e4cc8a04c3a
2016-07-15 18:49:15 +00:00
Jason Monk
61305ee4d9
Merge \"Fix up for forget storage screen\" into nyc-mr1-dev
...
am: f83ac369b0
Change-Id: Ie64332b1b99fbf0fe03046d9739f6145dc94bd66
2016-07-15 18:39:44 +00:00
TreeHugger Robot
f83ac369b0
Merge "Fix up for forget storage screen" into nyc-mr1-dev
2016-07-15 18:17:55 +00:00
Fyodor Kupolov
d5f80d59c6
Application names are now lazily loaded am: c9b9898e9a
...
am: 8863d4f576
Change-Id: Ib10a45d7295b3e93b68bae595b0f4a1bfc93065f
2016-07-15 17:55:58 +00:00
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