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
36446521fd
Merge \\"Pre-setup restrictions\\" into nyc-dev am: 5a3d1c17f2
...
am: 3b0bfee337
Change-Id: I590a980c4b747d02a7c97768784e7045aea2964f
2016-07-19 20:54:06 +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
3b0bfee337
Merge \"Pre-setup restrictions\" into nyc-dev
...
am: 5a3d1c17f2
Change-Id: I58796967153f15fad0ba853fa428b191ecc08ed2
2016-07-19 20:40:35 +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
Jason Monk
5a3d1c17f2
Merge "Pre-setup restrictions" into nyc-dev
2016-07-19 20:31:15 +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
bd3ac3bf22
Merge "Add Gestures settings to search index." into nyc-mr1-dev
2016-07-19 20:19:05 +00:00
Fan Zhang
b4cdc90ec7
Merge \\"Clarify string translation.\\" into nyc-mr1-dev am: 677cf28f6d
...
am: f465a1b635
Change-Id: I85e0dcbc16915bfe3f2480078576113c31ac0626
2016-07-19 19:37:51 +00:00
Fan Zhang
f465a1b635
Merge \"Clarify string translation.\" into nyc-mr1-dev
...
am: 677cf28f6d
Change-Id: I8513be5787aeae513d44c17221f4b40beb15f92a
2016-07-19 19:35:06 +00:00
TreeHugger Robot
677cf28f6d
Merge "Clarify string translation." into nyc-mr1-dev
2016-07-19 19:30:44 +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
Fan Zhang
9b95b3fc3d
Clarify string translation.
...
Bug: 30196308
Clarify ringtong volume string format and add an example.
Change-Id: I52769d5d274c7502f73ac25e8e1ce9ae6d0b87a5
2016-07-19 09:40:31 -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
Bill Yi
5757ce529f
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: b2f60d2974
-s ours
...
am: 46669d91c6
-s ours
Change-Id: Ie70fca4ec38bcdc1d13b8a7774702fb0423e77a3
2016-07-19 10:04:17 +00:00
Bill Yi
46669d91c6
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: b2f60d2974
-s ours
Change-Id: Ib24f1486b64a2aa2588e0142ae671d3ba79c8232
2016-07-19 09:56:23 +00:00
TreeHugger Robot
b2f60d2974
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-19 09:49:06 +00:00
TreeHugger Robot
8b91ae0caa
Merge "Import translations. DO NOT MERGE"
2016-07-19 09:49:01 +00:00
Maurice Lam
479d2350dd
Merge \\"Lock the orientation for FallbackHome\\" into nyc-mr1-dev am: 78626fadb4
...
am: 0680b8c471
Change-Id: I864634828c41911e26f8765a9500022dc3b65ae8
2016-07-19 02:02:20 +00:00
Maurice Lam
0680b8c471
Merge \"Lock the orientation for FallbackHome\" into nyc-mr1-dev
...
am: 78626fadb4
Change-Id: Ic15676a02afb4c4acf1eacc3975415108ef2b99c
2016-07-19 01:47:34 +00:00
Maurice Lam
78626fadb4
Merge "Lock the orientation for FallbackHome" into nyc-mr1-dev
2016-07-19 01:30:08 +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
Bill Yi
89912fee23
Import translations. DO NOT MERGE
...
Change-Id: I34ef9d17f926e12706029e3825182e6dd0e1c24e
Auto-generated-cl: translation import
2016-07-18 16:43:22 -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
Bill Yi
e2202bff87
Import translations. DO NOT MERGE
...
Change-Id: I7d981db41c95b851c9e98f733b83dc55efb08ec0
Auto-generated-cl: translation import
2016-07-18 15:57:45 -07: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
Andrew Sapperstein
7e15743275
Fix a bunch of straggler themes.
...
They were all stock material themes and are now all using
their DeviceDefault equivalents.
Change-Id: I0013847499c592c801101638168edd7ebf0d721a
Fixes: 30140567
2016-07-18 10:03:52 -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
Abodunrinwa Toki
e7b3ad6726
DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation.
...
This ports I1e4035f4dcff33e6b9a42d448303e962bd87c14b to MR1 dev.
Bug: 28182232
Change-Id: I292b00a21eb80577dbfec6a13f57b326571aefc7
2016-07-18 12:03:38 +01:00
Maurice Lam
6e79c0235f
Lock the orientation for FallbackHome
...
Set FallbackHome's orientation to nosensor in the manifest, so it
will always be shown in the natural device orientation.
Bug: 30040032
Change-Id: I875fa6d112db23273026dbc39b5d32748d7e99f1
2016-07-16 01:21:39 +00:00
Adam Lesinski
f584eaa03a
Update FakeUid with new methods
...
Bug:28931278
Change-Id: I845337633b1840ae66bda065985624aa67b070df
2016-07-15 18:08:29 -07:00