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
Fan Zhang
7be870325a
Merge \\"Add ripple effect on all preference tiles.\\" into nyc-mr1-dev am: 99da60a35f
...
am: 0780fd8b99
Change-Id: I87eac5dab4a2c1bb46a894e44fa1e75ba31ac49d
2016-07-20 02:54:20 +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
Fan Zhang
0780fd8b99
Merge \"Add ripple effect on all preference tiles.\" into nyc-mr1-dev
...
am: 99da60a35f
Change-Id: I4b089e31df8dd95a4c08d2b845e82f55b522f680
2016-07-20 01:06:40 +00:00
TreeHugger Robot
b57ee0e02f
Merge "Add Night display settings conditional" into nyc-mr1-dev
2016-07-20 01:00:25 +00:00
TreeHugger Robot
99da60a35f
Merge "Add ripple effect on all preference tiles." into nyc-mr1-dev
2016-07-20 00:49:38 +00:00
Matthew Fritze
ae63c3db14
Error colors to point to frameworks instead of hard-coding them
...
Rather than have each instance of the system error color hard code
the argb values, they now point to frameworks/base/core/res/.
Bug: 30021554
Change-Id: I6ec0512c5e69bc822810745b1745fa9feff95150
2016-07-19 16:10:31 -07:00
Fan Zhang
c9fca1a1ee
Add ripple effect on all preference tiles.
...
Bug: 30201359
Change-Id: If02b7b08c05c23a4db3a0455ce12df31c4b7bf42
2016-07-19 16:04:28 -07: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
Andrew Sapperstein
5bf0dcaad4
Merge \\"Fix a bunch of straggler themes.\\" into nyc-mr1-dev am: 85902750a5
...
am: 25e2e0338f
Change-Id: Id764318945fab7b3de344ffcb6a9ad1214241df4
2016-07-19 21:56:16 +00:00
Andrew Sapperstein
25e2e0338f
Merge \"Fix a bunch of straggler themes.\" into nyc-mr1-dev
...
am: 85902750a5
Change-Id: I975563cc36cd9d4011db01c227ef5f32d80e7fd7
2016-07-19 21:52:38 +00:00
Andrew Sapperstein
85902750a5
Merge "Fix a bunch of straggler themes." into nyc-mr1-dev
2016-07-19 21:42:27 +00: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
1cc91467c2
Merge \\\"Pre-setup restrictions\\\" into nyc-dev am: 5a3d1c17f2
am: 3b0bfee337
...
am: 36446521fd
Change-Id: I2e3a1078a93f60c3548db8cde3782b22f5ecf5cc
2016-07-19 20:59:10 +00: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
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