Commit Graph

29318 Commits

Author SHA1 Message Date
Mark Salyzyn
3aee719c59 Settings: add logpersist selection (actions)
am: c8b1c3ec22  -s ours

Change-Id: Ia32d1a251d0fc215c651d47373dac539dcb0c21a
2016-07-22 01:39:52 +00:00
Doris Ling
7b03ae69df Merge "Check for null activity before getting dashboard categories." into nyc-mr1-dev 2016-07-21 20:58:22 +00:00
Fan Zhang
cafe6972a9 Fix crash when starting Settings -> Display -> Font size
Change-Id: I26f81d02e31b0b7c8120395231aa6b81be6be7be
Fixes: 30279736
2016-07-21 13:30:54 -07:00
Doris Ling
b7e650c6f7 Check for null activity before getting dashboard categories.
In DashboardSummary, when async task finishes running, ensure that the
fragment is still associated with the activity before getting the
dashboard categories from the activity.

Change-Id: If23cd27a0d3e3429d900ae41ef6f24ed03b9e8d6
Fixes: 30278854
2016-07-21 12:22:17 -07:00
Sunny Goyal
fe9bf6d9d1 Merge "Updating the shortcut icons for Settings app" into nyc-mr1-dev 2016-07-21 18:27:33 +00:00
Sunny Goyal
b67291a274 Updating the shortcut icons for Settings app
Bug: 30224034
Bug: 30280907
Change-Id: I6ebf85dbf2941c1cf55e443d611655cdb765da66
2016-07-21 11:26:52 -07:00
Makoto Onuki
8e8bcb6900 Improve string comment
Bug 30210359
Bug 30207992

Change-Id: I27f8166b4fbd8f3b3e01c71e1fcc114c2a713231
2016-07-21 10:35:47 -07:00
TreeHugger Robot
2ece9e4894 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-07-21 04:32:48 +00:00
Thierry Strudel
8f3c7dd719 Merge changes from topic 'enable_persist_kernel_log' into nyc-mr1-dev
* changes:
  Settings: trampoline persist.logd.logpersistd to logd.logpersistd
  Settings: add logpersist kernel only selection
  Settings: add logpersist selection (actions)
2016-07-21 04:07:25 +00:00
Bill Yi
1dc5c8bcbf Import translations. DO NOT MERGE
Change-Id: I2135a4c00d05ba973eae29159fa7ab87d4dc8bd4
Auto-generated-cl: translation import
2016-07-20 20:05:32 -07:00
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
TreeHugger Robot
fd922cabd9 Merge "Get gestures animation preview image in async loader." into nyc-mr1-dev 2016-07-21 02:43:37 +00:00
Matthew Fritze
1da5d326a1 Merge \"Revert \"Revert \"Error colors to point to frameworks instead of hard-coding them\"\"\" into nyc-mr1-dev
am: d739ea38fb

Change-Id: I996cd07af5b613d04588f533d979decffb437daa
2016-07-21 01:24:09 +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
Matthew Fritze
21b446cea9 Merge \"Revert \"Error colors to point to frameworks instead of hard-coding them\"\" into nyc-mr1-dev
am: c49c496f1c

Change-Id: Ibf5577a03184aed6ee78704cae48e6d817267873
2016-07-21 01:06:15 +00:00
Matthew Fritze
d739ea38fb Merge "Revert "Revert "Error colors to point to frameworks instead of hard-coding them""" into nyc-mr1-dev 2016-07-21 01:04:26 +00:00
Matthew Fritze
892a54696b Revert "Revert "Error colors to point to frameworks instead of hard-coding them""
This reverts commit f179f845e5.

Change-Id: Ie57507b0d6ca76ba9b77836bc4e133f27a3664c7
2016-07-21 01:03:45 +00:00
Andrew Sapperstein
c49c496f1c Merge "Revert "Error colors to point to frameworks instead of hard-coding them"" into nyc-mr1-dev 2016-07-21 00:57:02 +00:00
Matthew Fritze
f179f845e5 Revert "Error colors to point to frameworks instead of hard-coding them"
This reverts commit ae63c3db14.

Change-Id: I2d3069eb5b23aa7df3fc1efc2eb085b493b5564c
2016-07-21 00:55:21 +00:00
Daniel Nishi
b0bb093519 Merge \"Update the Bluetooth pin pairing view to the new spec.\" into nyc-mr1-dev
am: 391f67e484

Change-Id: Id1f72339ea39ce4d734f9cc869c5c2c2a4ee233d
2016-07-20 23:57:46 +00:00
Daniel Nishi
391f67e484 Merge "Update the Bluetooth pin pairing view to the new spec." into nyc-mr1-dev 2016-07-20 23:52:59 +00:00
Matthew Fritze
4a8695ed1e Merge \"Error colors to point to frameworks instead of hard-coding them\" into nyc-mr1-dev
am: d25148c8f7

Change-Id: Ia69404fbaad8485440b2f45f26820a70976bbf7d
2016-07-20 23:47:28 +00:00
Matthew Fritze
d25148c8f7 Merge "Error colors to point to frameworks instead of hard-coding them" into nyc-mr1-dev 2016-07-20 23:34:42 +00:00
Daniel Nishi
e8869e8a23 Update the Bluetooth pin pairing view to the new spec.
Bug: 30191613
Change-Id: Ib7b5f1758be0af33f6ea60d581a27df4801fc835
2016-07-20 14:17:42 -07: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
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
Fan Zhang
ed9bd61a4c Merge \"Let talkback announce category name in Settings.\" into nyc-mr1-dev
am: 19d0f73c48

Change-Id: I612291219ec34682a50be2bae39a79c7bc320a36
2016-07-20 17:00:04 +00:00
TreeHugger Robot
19d0f73c48 Merge "Let talkback announce category name in Settings." into nyc-mr1-dev 2016-07-20 16:51:13 +00:00
Bill Yi
06dac5c117 Import translations. DO NOT MERGE
am: b5c2131de4  -s ours

Change-Id: I090280543af960bd345e2e7be70a8efd74de979a
2016-07-20 14:45:00 +00:00
Bill Yi
b5c2131de4 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 30202203
Change-Id: Ieb3d22c6a8d1608dce6d9bce23d85f31a75be58a
2016-07-20 07:34:39 -07:00
Bill Yi
9471dbdd6a Import translations. DO NOT MERGE
am: 708c6264ac  -s ours

Change-Id: Icd36c43f8ba611bda0c1c88589cd7b1b86f6e716
2016-07-20 14:15:59 +00:00
Bill Yi
708c6264ac Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 30202203
Change-Id: I3fefeaaa89f3c3707b1e7c84c431689733547ca4
2016-07-20 07:09:37 -07: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
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