Doris Ling
8668aa0a8f
Merge \"Get gestures animation preview image in async loader.\" into nyc-mr1-dev
...
am: fd922cabd9
Change-Id: I6975f268808cd5f9521cba6922120c667010023d
2016-07-21 02:47:12 +00:00
Doris Ling
de991f457d
Get gestures animation preview image in async loader.
...
When user scrolls in Gestures Settings, the textureview used for the
animation video will be destroyed if the view is scrolled outside the
screen. When the view is scrolled back in, a slight flicker is seen as
the animation video is not instantly made available on the new surface
texture. We are now retrieving the preview image in an async loader
after the preference is created, so that it will not delay the original
loading of the gestures settings page, but the preview will be made
available while we initialize the animation video in the new surface
texture.
Bug: 29790087
Change-Id: I83f4a5bc4f24b7aab4c0cc851cb524c10e74f328
2016-07-20 18:13:55 -07:00
Tony Mak
563668bebd
Merge \\"Should not report unsuccessful attempt if pattern size < minimal size\\" into nyc-mr1-dev am: 9d83a9fbbb
...
am: 3a681a32a8
Change-Id: Id95c0d1ea210bf153ec26a83fc6789296f0070df
2016-07-20 19:51:26 +00:00
Doris Ling
eacb97e3d7
Merge \\"Combine setCategories() and setSuggestions() in DashboardAdapter.\\" into nyc-mr1-dev am: 7e70fd1166
...
am: b3055b083a
Change-Id: I1c61400fee835a8297d754455596e530b1d006c2
2016-07-20 19:51:24 +00:00
Daniel Nishi
2b2ffa2dd6
Merge \\"Add a help item for the Help & Feedback for the Storage Manager.\\" into nyc-mr1-dev am: dd1c51a3e4
...
am: c354537c37
Change-Id: I76473c677d5b1be97ec78ac084325a6939b02e2e
2016-07-20 19:51:17 +00:00
Michael Wright
40b75a094c
Merge \\"Color transforms are now color modes.\\" into nyc-mr1-dev am: 111e1dc6b3
...
am: 87fca0df00
Change-Id: I0d3290d06d9186bdf0f05061d24a20e474e50116
2016-07-20 19:49:18 +00:00
Tony Mak
3a681a32a8
Merge \"Should not report unsuccessful attempt if pattern size < minimal size\" into nyc-mr1-dev
...
am: 9d83a9fbbb
Change-Id: I1f9f254baebab5b14fe298791e11887dbd4220c6
2016-07-20 19:26:54 +00:00
Tony Mak
9d83a9fbbb
Merge "Should not report unsuccessful attempt if pattern size < minimal size" into nyc-mr1-dev
2016-07-20 19:20:55 +00:00
Julia Reynolds
0bb60ada96
Display days of week in locale order.
...
Change-Id: Id5d5920089a5da1fbdc7802431ca2909f72d7e12
Fixes: 21304061
2016-07-20 15:15:16 -04:00
Abodunrinwa Toki
1fd447e778
Merge \"DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation.\" into nyc-mr1-dev
...
am: 5af83786f7
Change-Id: I786b8815d0e928b7bb54a93e3fb633af1d206916
2016-07-20 18:57:18 +00:00
Doris Ling
b3055b083a
Merge \"Combine setCategories() and setSuggestions() in DashboardAdapter.\" into nyc-mr1-dev
...
am: 7e70fd1166
Change-Id: Id8f655e0a9b29369a57eea3c5140cf47def7cc36
2016-07-20 18:51:17 +00:00
Daniel Nishi
c354537c37
Merge \"Add a help item for the Help & Feedback for the Storage Manager.\" into nyc-mr1-dev
...
am: dd1c51a3e4
Change-Id: I80acbbc35e376f2e353aa955bfd66e4e2a63f71e
2016-07-20 18:51:14 +00:00
Abodunrinwa Toki
5af83786f7
Merge "DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation." into nyc-mr1-dev
2016-07-20 18:50:16 +00:00
Michael Wright
87fca0df00
Merge \"Color transforms are now color modes.\" into nyc-mr1-dev
...
am: 111e1dc6b3
Change-Id: I6536baf47e102331fa87112d4f0b9d15ec432d2a
2016-07-20 18:49:59 +00:00
Doris Ling
7e70fd1166
Merge "Combine setCategories() and setSuggestions() in DashboardAdapter." into nyc-mr1-dev
2016-07-20 18:02:43 +00:00
Chad Brubaker
c92ed2721b
Merge "Dont use FLAG_ENCRYPT for certificates"
2016-07-20 17:37:07 +00:00
Daniel Nishi
dd1c51a3e4
Merge "Add a help item for the Help & Feedback for the Storage Manager." into nyc-mr1-dev
2016-07-20 17:33:40 +00:00
TreeHugger Robot
111e1dc6b3
Merge "Color transforms are now color modes." into nyc-mr1-dev
2016-07-20 17:21:36 +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
Tony Mak
818312d962
Should not report unsuccessful attempt if pattern size < minimal size
...
It is to align the behavior in personal side lock screen.
Change-Id: I811e72405615fbed85c2a4dc6b6cec51e4ad54f0
Fix: 30215101
2016-07-20 09:55:25 +01: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
Daniel Nishi
f21465e14f
Add a help item for the Help & Feedback for the Storage Manager.
...
Bug: 29793176
Change-Id: Ic4104525961e7f173212df54f19857a06c0fac05
2016-07-19 15:47:10 -07:00
Justin Klaassen
d60f09edaf
Add Night display settings conditional
...
Bug: 30043281
Change-Id: I2464cd90f1f7f379aabf123f602e6150a87120cf
2016-07-19 14:31:46 -07:00
Mark Salyzyn
bdbd2d984e
Settings: trampoline persist.logd.logpersistd to logd.logpersistd
...
- Deal with trampoline, where we read logd.logpersistd and
logd.logpersistd.buffer, write to persist.logd.logpersistd and
persist.logd.logpersistd.buffer and logd.logpersistd*
- Deal with an as designed requirement that empty values do not
automatically trampoline, to properly communicate state.
- check logd.logpersistd.enable boolean for support
Bug: 28813587
Bug: 28936216
Bug: 29831823
Change-Id: Ib460ca90738ffdee17084349c1035701301c52bc
2016-07-19 14:02:32 -07:00
Mark Salyzyn
78dd2e2c74
Settings: add logpersist kernel only selection
...
Bug: 28813587
Bug: 28936216
Bug: 29831823
Change-Id: I9bfbb2717c2d4d39bfda6b92221a38985a4f4973
2016-07-19 14:01:41 -07:00
Mark Salyzyn
c8b1c3ec22
Settings: add logpersist selection (actions)
...
- Only add logpersist menu if debuggable.
- Only enable logpersist menu if Logging is On.
- Add selection for Off, All and All minus radio.
- Pop up warning box that persistent storage is to be cleared when
selecting Off (but not if turned off by Logging Size Off or
Disabling Debugger Options).
Bug: 28813587
Bug: 28936216
Change-Id: Ic0a58abdcd6ca41069efb818d1dcef4e3927d2de
2016-07-19 13:59:56 -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
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
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