OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoMerge \"Check for null activity before getting dashboard categories.\" into nyc-mr1-dev
Doris Ling [Fri, 22 Jul 2016 01:42:47 +0000 (01:42 +0000)]
Merge \"Check for null activity before getting dashboard categories.\" into nyc-mr1-dev
am: 7b03ae69df

Change-Id: Ic16c06b1ced6c4b9f37d0c5e8fc0ecc5a450044f

8 years agoCheck for null activity before getting dashboard categories.
Doris Ling [Fri, 22 Jul 2016 01:42:47 +0000 (01:42 +0000)]
Check for null activity before getting dashboard categories.
am: b7e650c6f7

Change-Id: I26f8c96189d3390055a7dd02680da57d2c2ed2cb

8 years agoFix crash when starting Settings -> Display -> Font size
Fan Zhang [Fri, 22 Jul 2016 01:42:45 +0000 (01:42 +0000)]
Fix crash when starting Settings -> Display -> Font size
am: cafe6972a9

Change-Id: I19912b25028cac863d990e01cda1b31b40a183d7

8 years agoMerge \"Updating the shortcut icons for Settings app\" into nyc-mr1-dev
Sunny Goyal [Fri, 22 Jul 2016 01:42:44 +0000 (01:42 +0000)]
Merge \"Updating the shortcut icons for Settings app\" into nyc-mr1-dev
am: fe9bf6d9d1

Change-Id: Iaf16d11e30a19fe7a9c58e34d3b15045bd9e3d9a

8 years agoUpdating the shortcut icons for Settings app
Sunny Goyal [Fri, 22 Jul 2016 01:42:44 +0000 (01:42 +0000)]
Updating the shortcut icons for Settings app
am: b67291a274

Change-Id: I7ca2cc1587c561313f6d43217c88119496866847

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
Bill Yi [Fri, 22 Jul 2016 01:42:42 +0000 (01:42 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 2ece9e4894  -s ours

Change-Id: Ie5649d4576ae56c27a75b8fcca8c10124feab9db

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 22 Jul 2016 01:42:42 +0000 (01:42 +0000)]
Import translations. DO NOT MERGE
am: 1dc5c8bcbf  -s ours

Change-Id: I46c2ec6a95f04096b65e4aae83f9264da32f7441

8 years agoMerge changes from topic \'enable_persist_kernel_log\' into nyc-mr1-dev
Mark Salyzyn [Fri, 22 Jul 2016 01:41:49 +0000 (01:41 +0000)]
Merge changes from topic \'enable_persist_kernel_log\' into nyc-mr1-dev
am: 8f3c7dd719

Change-Id: I9d6ee829237cfa831f6ae691df5221c1baacc728

8 years agoSettings: trampoline persist.logd.logpersistd to logd.logpersistd
Mark Salyzyn [Fri, 22 Jul 2016 01:40:55 +0000 (01:40 +0000)]
Settings: trampoline persist.logd.logpersistd to logd.logpersistd
am: bdbd2d984e

Change-Id: I77d76c9c8a85bb4e0c9314943b291eab00669ee0

8 years agoSettings: add logpersist kernel only selection
Mark Salyzyn [Fri, 22 Jul 2016 01:40:24 +0000 (01:40 +0000)]
Settings: add logpersist kernel only selection
am: 78dd2e2c74

Change-Id: I000f5830e70083212607a1f971d83fe9f48d4779

8 years agoSettings: add logpersist selection (actions)
Mark Salyzyn [Fri, 22 Jul 2016 01:39:52 +0000 (01:39 +0000)]
Settings: add logpersist selection (actions)
am: c8b1c3ec22  -s ours

Change-Id: Ia32d1a251d0fc215c651d47373dac539dcb0c21a

8 years agoMerge "Check for null activity before getting dashboard categories." into nyc-mr1-dev
Doris Ling [Thu, 21 Jul 2016 20:58:21 +0000 (20:58 +0000)]
Merge "Check for null activity before getting dashboard categories." into nyc-mr1-dev

8 years agoFix crash when starting Settings -> Display -> Font size
Fan Zhang [Thu, 21 Jul 2016 20:28:19 +0000 (13:28 -0700)]
Fix crash when starting Settings -> Display -> Font size

Change-Id: I26f81d02e31b0b7c8120395231aa6b81be6be7be
Fixes: 30279736

8 years agoCheck for null activity before getting dashboard categories.
Doris Ling [Thu, 21 Jul 2016 19:22:17 +0000 (12:22 -0700)]
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

8 years agoMerge "Updating the shortcut icons for Settings app" into nyc-mr1-dev
Sunny Goyal [Thu, 21 Jul 2016 18:27:33 +0000 (18:27 +0000)]
Merge "Updating the shortcut icons for Settings app" into nyc-mr1-dev

8 years agoUpdating the shortcut icons for Settings app
Sunny Goyal [Thu, 21 Jul 2016 00:18:33 +0000 (17:18 -0700)]
Updating the shortcut icons for Settings app

Bug: 30224034
Bug: 30280907
Change-Id: I6ebf85dbf2941c1cf55e443d611655cdb765da66

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 04:32:47 +0000 (04:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge changes from topic 'enable_persist_kernel_log' into nyc-mr1-dev
Thierry Strudel [Thu, 21 Jul 2016 04:07:22 +0000 (04:07 +0000)]
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)

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 21 Jul 2016 03:05:32 +0000 (20:05 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2135a4c00d05ba973eae29159fa7ab87d4dc8bd4
Auto-generated-cl: translation import

8 years agoMerge \"Get gestures animation preview image in async loader.\" into nyc-mr1-dev
Doris Ling [Thu, 21 Jul 2016 02:47:12 +0000 (02:47 +0000)]
Merge \"Get gestures animation preview image in async loader.\" into nyc-mr1-dev
am: fd922cabd9

Change-Id: I6975f268808cd5f9521cba6922120c667010023d

8 years agoMerge "Get gestures animation preview image in async loader." into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 02:43:37 +0000 (02:43 +0000)]
Merge "Get gestures animation preview image in async loader." into nyc-mr1-dev

8 years agoMerge \"Revert \"Revert \"Error colors to point to frameworks instead of hard-coding...
Matthew Fritze [Thu, 21 Jul 2016 01:24:09 +0000 (01:24 +0000)]
Merge \"Revert \"Revert \"Error colors to point to frameworks instead of hard-coding them\"\"\" into nyc-mr1-dev
am: d739ea38fb

Change-Id: I996cd07af5b613d04588f533d979decffb437daa

8 years agoGet gestures animation preview image in async loader.
Doris Ling [Tue, 19 Jul 2016 22:46:50 +0000 (15:46 -0700)]
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

8 years agoMerge \"Revert \"Error colors to point to frameworks instead of hard-coding them...
Matthew Fritze [Thu, 21 Jul 2016 01:06:15 +0000 (01:06 +0000)]
Merge \"Revert \"Error colors to point to frameworks instead of hard-coding them\"\" into nyc-mr1-dev
am: c49c496f1c

Change-Id: Ibf5577a03184aed6ee78704cae48e6d817267873

8 years agoMerge "Revert "Revert "Error colors to point to frameworks instead of hard-coding...
Matthew Fritze [Thu, 21 Jul 2016 01:04:23 +0000 (01:04 +0000)]
Merge "Revert "Revert "Error colors to point to frameworks instead of hard-coding them""" into nyc-mr1-dev

8 years agoRevert "Revert "Error colors to point to frameworks instead of hard-coding them""
Matthew Fritze [Thu, 21 Jul 2016 01:03:45 +0000 (01:03 +0000)]
Revert "Revert "Error colors to point to frameworks instead of hard-coding them""

This reverts commit f179f845e50837a069383f3b268f643c4d2cfad8.

Change-Id: Ie57507b0d6ca76ba9b77836bc4e133f27a3664c7

8 years agoMerge "Revert "Error colors to point to frameworks instead of hard-coding them""...
Andrew Sapperstein [Thu, 21 Jul 2016 00:57:01 +0000 (00:57 +0000)]
Merge "Revert "Error colors to point to frameworks instead of hard-coding them"" into nyc-mr1-dev

8 years agoRevert "Error colors to point to frameworks instead of hard-coding them"
Matthew Fritze [Thu, 21 Jul 2016 00:55:21 +0000 (00:55 +0000)]
Revert "Error colors to point to frameworks instead of hard-coding them"

This reverts commit ae63c3db14f4ddf89d33df894af53fb066226da3.

Change-Id: I2d3069eb5b23aa7df3fc1efc2eb085b493b5564c

8 years agoMerge \"Update the Bluetooth pin pairing view to the new spec.\" into nyc-mr1-dev
Daniel Nishi [Wed, 20 Jul 2016 23:57:46 +0000 (23:57 +0000)]
Merge \"Update the Bluetooth pin pairing view to the new spec.\" into nyc-mr1-dev
am: 391f67e484

Change-Id: Id1f72339ea39ce4d734f9cc869c5c2c2a4ee233d

8 years agoMerge "Update the Bluetooth pin pairing view to the new spec." into nyc-mr1-dev
Daniel Nishi [Wed, 20 Jul 2016 23:52:59 +0000 (23:52 +0000)]
Merge "Update the Bluetooth pin pairing view to the new spec." into nyc-mr1-dev

8 years agoMerge \"Error colors to point to frameworks instead of hard-coding them\" into nyc...
Matthew Fritze [Wed, 20 Jul 2016 23:47:28 +0000 (23:47 +0000)]
Merge \"Error colors to point to frameworks instead of hard-coding them\" into nyc-mr1-dev
am: d25148c8f7

Change-Id: Ia69404fbaad8485440b2f45f26820a70976bbf7d

8 years agoMerge "Error colors to point to frameworks instead of hard-coding them" into nyc...
Matthew Fritze [Wed, 20 Jul 2016 23:34:40 +0000 (23:34 +0000)]
Merge "Error colors to point to frameworks instead of hard-coding them" into nyc-mr1-dev

8 years agoUpdate the Bluetooth pin pairing view to the new spec.
Daniel Nishi [Tue, 19 Jul 2016 19:41:46 +0000 (12:41 -0700)]
Update the Bluetooth pin pairing view to the new spec.

Bug: 30191613
Change-Id: Ib7b5f1758be0af33f6ea60d581a27df4801fc835

8 years agoMerge \"Should not report unsuccessful attempt if pattern size < minimal size\" into...
Tony Mak [Wed, 20 Jul 2016 19:26:54 +0000 (19:26 +0000)]
Merge \"Should not report unsuccessful attempt if pattern size < minimal size\" into nyc-mr1-dev
am: 9d83a9fbbb

Change-Id: I1f9f254baebab5b14fe298791e11887dbd4220c6

8 years agoMerge "Should not report unsuccessful attempt if pattern size < minimal size" into...
Tony Mak [Wed, 20 Jul 2016 19:20:54 +0000 (19:20 +0000)]
Merge "Should not report unsuccessful attempt if pattern size < minimal size" into nyc-mr1-dev

8 years agoMerge \"DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation.\" into...
Abodunrinwa Toki [Wed, 20 Jul 2016 18:57:18 +0000 (18:57 +0000)]
Merge \"DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation.\" into nyc-mr1-dev
am: 5af83786f7

Change-Id: I786b8815d0e928b7bb54a93e3fb633af1d206916

8 years agoMerge \"Combine setCategories() and setSuggestions() in DashboardAdapter.\" into...
Doris Ling [Wed, 20 Jul 2016 18:51:17 +0000 (18:51 +0000)]
Merge \"Combine setCategories() and setSuggestions() in DashboardAdapter.\" into nyc-mr1-dev
am: 7e70fd1166

Change-Id: Id8f655e0a9b29369a57eea3c5140cf47def7cc36

8 years agoMerge \"Add a help item for the Help & Feedback for the Storage Manager.\" into nyc...
Daniel Nishi [Wed, 20 Jul 2016 18:51:14 +0000 (18:51 +0000)]
Merge \"Add a help item for the Help & Feedback for the Storage Manager.\" into nyc-mr1-dev
am: dd1c51a3e4

Change-Id: I80acbbc35e376f2e353aa955bfd66e4e2a63f71e

8 years agoMerge "DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation." into...
Abodunrinwa Toki [Wed, 20 Jul 2016 18:50:15 +0000 (18:50 +0000)]
Merge "DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation." into nyc-mr1-dev

8 years agoMerge \"Color transforms are now color modes.\" into nyc-mr1-dev
Michael Wright [Wed, 20 Jul 2016 18:49:59 +0000 (18:49 +0000)]
Merge \"Color transforms are now color modes.\" into nyc-mr1-dev
am: 111e1dc6b3

Change-Id: I6536baf47e102331fa87112d4f0b9d15ec432d2a

8 years agoMerge "Combine setCategories() and setSuggestions() in DashboardAdapter." into nyc...
Doris Ling [Wed, 20 Jul 2016 18:02:42 +0000 (18:02 +0000)]
Merge "Combine setCategories() and setSuggestions() in DashboardAdapter." into nyc-mr1-dev

8 years agoMerge "Add a help item for the Help & Feedback for the Storage Manager." into nyc...
Daniel Nishi [Wed, 20 Jul 2016 17:33:40 +0000 (17:33 +0000)]
Merge "Add a help item for the Help & Feedback for the Storage Manager." into nyc-mr1-dev

8 years agoMerge "Color transforms are now color modes." into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 17:21:33 +0000 (17:21 +0000)]
Merge "Color transforms are now color modes." into nyc-mr1-dev

8 years agoMerge \"Let talkback announce category name in Settings.\" into nyc-mr1-dev
Fan Zhang [Wed, 20 Jul 2016 17:00:04 +0000 (17:00 +0000)]
Merge \"Let talkback announce category name in Settings.\" into nyc-mr1-dev
am: 19d0f73c48

Change-Id: I612291219ec34682a50be2bae39a79c7bc320a36

8 years agoMerge "Let talkback announce category name in Settings." into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 16:51:13 +0000 (16:51 +0000)]
Merge "Let talkback announce category name in Settings." into nyc-mr1-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Jul 2016 14:45:00 +0000 (14:45 +0000)]
Import translations. DO NOT MERGE
am: b5c2131de4  -s ours

Change-Id: I090280543af960bd345e2e7be70a8efd74de979a

8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Jul 2016 14:34:39 +0000 (07:34 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 30202203
Change-Id: Ieb3d22c6a8d1608dce6d9bce23d85f31a75be58a

8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Jul 2016 14:15:59 +0000 (14:15 +0000)]
Import translations. DO NOT MERGE
am: 708c6264ac  -s ours

Change-Id: Icd36c43f8ba611bda0c1c88589cd7b1b86f6e716

8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Jul 2016 14:09:37 +0000 (07:09 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 30202203
Change-Id: I3fefeaaa89f3c3707b1e7c84c431689733547ca4

8 years agoMerge \"Protect against work conditional crash\" into nyc-mr1-dev
Jason Monk [Wed, 20 Jul 2016 13:33:57 +0000 (13:33 +0000)]
Merge \"Protect against work conditional crash\" into nyc-mr1-dev
am: bd6a4f9066

Change-Id: I6072b6235abb35da9ecac1f41b01cf82e75d868b

8 years agoMerge "Protect against work conditional crash" into nyc-mr1-dev
Jason Monk [Wed, 20 Jul 2016 13:28:13 +0000 (13:28 +0000)]
Merge "Protect against work conditional crash" into nyc-mr1-dev

8 years agoShould not report unsuccessful attempt if pattern size < minimal size
Tony Mak [Wed, 20 Jul 2016 08:55:25 +0000 (09:55 +0100)]
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

8 years agoMerge \"Add Night display settings conditional\" into nyc-mr1-dev
Justin Klaassen [Wed, 20 Jul 2016 01:06:41 +0000 (01:06 +0000)]
Merge \"Add Night display settings conditional\" into nyc-mr1-dev
am: b57ee0e02f

Change-Id: I72715ad005fade9376d036ebe7abfde0c89bd1e5

8 years agoMerge \"Add ripple effect on all preference tiles.\" into nyc-mr1-dev
Fan Zhang [Wed, 20 Jul 2016 01:06:40 +0000 (01:06 +0000)]
Merge \"Add ripple effect on all preference tiles.\" into nyc-mr1-dev
am: 99da60a35f

Change-Id: I4b089e31df8dd95a4c08d2b845e82f55b522f680

8 years agoMerge "Add Night display settings conditional" into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 01:00:23 +0000 (01:00 +0000)]
Merge "Add Night display settings conditional" into nyc-mr1-dev

8 years agoMerge "Add ripple effect on all preference tiles." into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 00:49:37 +0000 (00:49 +0000)]
Merge "Add ripple effect on all preference tiles." into nyc-mr1-dev

8 years agoError colors to point to frameworks instead of hard-coding them
Matthew Fritze [Tue, 19 Jul 2016 20:04:17 +0000 (13:04 -0700)]
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

8 years agoAdd ripple effect on all preference tiles.
Fan Zhang [Tue, 19 Jul 2016 23:04:28 +0000 (16:04 -0700)]
Add ripple effect on all preference tiles.

Bug: 30201359
Change-Id: If02b7b08c05c23a4db3a0455ce12df31c4b7bf42

8 years agoAdd a help item for the Help & Feedback for the Storage Manager.
Daniel Nishi [Tue, 19 Jul 2016 22:47:10 +0000 (15:47 -0700)]
Add a help item for the Help & Feedback for the Storage Manager.

Bug: 29793176
Change-Id: Ic4104525961e7f173212df54f19857a06c0fac05

8 years agoMerge \"Fix a bunch of straggler themes.\" into nyc-mr1-dev
Andrew Sapperstein [Tue, 19 Jul 2016 21:52:38 +0000 (21:52 +0000)]
Merge \"Fix a bunch of straggler themes.\" into nyc-mr1-dev
am: 85902750a5

Change-Id: I975563cc36cd9d4011db01c227ef5f32d80e7fd7

8 years agoMerge "Fix a bunch of straggler themes." into nyc-mr1-dev
Andrew Sapperstein [Tue, 19 Jul 2016 21:42:25 +0000 (21:42 +0000)]
Merge "Fix a bunch of straggler themes." into nyc-mr1-dev

8 years agoAdd Night display settings conditional
Justin Klaassen [Tue, 19 Jul 2016 04:39:03 +0000 (21:39 -0700)]
Add Night display settings conditional

Bug: 30043281
Change-Id: I2464cd90f1f7f379aabf123f602e6150a87120cf

8 years agoSettings: trampoline persist.logd.logpersistd to logd.logpersistd
Mark Salyzyn [Thu, 7 Jul 2016 19:38:50 +0000 (12:38 -0700)]
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

8 years agoSettings: add logpersist kernel only selection
Mark Salyzyn [Thu, 7 Jul 2016 19:38:50 +0000 (12:38 -0700)]
Settings: add logpersist kernel only selection

Bug: 28813587
Bug: 28936216
Bug: 29831823
Change-Id: I9bfbb2717c2d4d39bfda6b92221a38985a4f4973

8 years agoSettings: add logpersist selection (actions)
Mark Salyzyn [Fri, 3 Jun 2016 17:18:23 +0000 (10:18 -0700)]
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

8 years agoMerge \\"Pre-setup restrictions\\" into nyc-dev am: 5a3d1c17f2
Jason Monk [Tue, 19 Jul 2016 20:54:06 +0000 (20:54 +0000)]
Merge \\"Pre-setup restrictions\\" into nyc-dev am: 5a3d1c17f2
am: 3b0bfee337

Change-Id: I590a980c4b747d02a7c97768784e7045aea2964f

8 years agoMerge \\"Pre-setup restrictions\\" into nyc-dev am: 5a3d1c17f2
Jason Monk [Tue, 19 Jul 2016 20:47:46 +0000 (20:47 +0000)]
Merge \\"Pre-setup restrictions\\" into nyc-dev am: 5a3d1c17f2
am: 69ce586155

Change-Id: I5e57fd8016f45d2bb863896aeee34c8786cf41f0

8 years agoMerge \"Pre-setup restrictions\" into nyc-dev
Jason Monk [Tue, 19 Jul 2016 20:40:35 +0000 (20:40 +0000)]
Merge \"Pre-setup restrictions\" into nyc-dev
am: 5a3d1c17f2

Change-Id: I58796967153f15fad0ba853fa428b191ecc08ed2

8 years agoMerge \"Pre-setup restrictions\" into nyc-dev
Jason Monk [Tue, 19 Jul 2016 20:39:18 +0000 (20:39 +0000)]
Merge \"Pre-setup restrictions\" into nyc-dev
am: 5a3d1c17f2

Change-Id: I0bc7e426b0dfc4d233b9caa263e5361f94dbf6f2

8 years agoMerge \"Fix janky scrolling for Gestures Settings.\" into nyc-mr1-dev
Doris Ling [Tue, 19 Jul 2016 20:35:42 +0000 (20:35 +0000)]
Merge \"Fix janky scrolling for Gestures Settings.\" into nyc-mr1-dev
am: c2733db43f

Change-Id: I78b884c04ec6fa05fe7a6068260331d8451181cf

8 years agoMerge "Pre-setup restrictions" into nyc-dev
Jason Monk [Tue, 19 Jul 2016 20:31:15 +0000 (20:31 +0000)]
Merge "Pre-setup restrictions" into nyc-dev

8 years agoMerge "Fix janky scrolling for Gestures Settings." into nyc-mr1-dev
Doris Ling [Tue, 19 Jul 2016 20:30:12 +0000 (20:30 +0000)]
Merge "Fix janky scrolling for Gestures Settings." into nyc-mr1-dev

8 years agoMerge \"Add Gestures settings to search index.\" into nyc-mr1-dev
Doris Ling [Tue, 19 Jul 2016 20:21:45 +0000 (20:21 +0000)]
Merge \"Add Gestures settings to search index.\" into nyc-mr1-dev
am: bd3ac3bf22

Change-Id: I0d7aa14a24f496aba842d5b70176bc6f44c49c3b

8 years agoMerge "Add Gestures settings to search index." into nyc-mr1-dev
Doris Ling [Tue, 19 Jul 2016 20:19:04 +0000 (20:19 +0000)]
Merge "Add Gestures settings to search index." into nyc-mr1-dev

8 years agoMerge \"Clarify string translation.\" into nyc-mr1-dev
Fan Zhang [Tue, 19 Jul 2016 19:35:06 +0000 (19:35 +0000)]
Merge \"Clarify string translation.\" into nyc-mr1-dev
am: 677cf28f6d

Change-Id: I8513be5787aeae513d44c17221f4b40beb15f92a

8 years agoMerge "Clarify string translation." into nyc-mr1-dev
TreeHugger Robot [Tue, 19 Jul 2016 19:30:44 +0000 (19:30 +0000)]
Merge "Clarify string translation." into nyc-mr1-dev

8 years agoAdd Gestures settings to search index.
Doris Ling [Tue, 19 Jul 2016 18:45:03 +0000 (11:45 -0700)]
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

8 years agoProtect against work conditional crash
Jason Monk [Tue, 19 Jul 2016 18:22:14 +0000 (14:22 -0400)]
Protect against work conditional crash

Change-Id: Iba6e7281c622e3ba34fa6bd4672b2380b0329808
Fixes: 30014085

8 years agoClarify string translation.
Fan Zhang [Tue, 19 Jul 2016 16:37:47 +0000 (09:37 -0700)]
Clarify string translation.

Bug: 30196308

Clarify ringtong volume string format and add an example.

Change-Id: I52769d5d274c7502f73ac25e8e1ce9ae6d0b87a5

8 years agoMerge \"Do not use TetherUtil.setWifiTethering\" into nyc-mr1-dev
Christopher Wiley [Tue, 19 Jul 2016 16:02:42 +0000 (16:02 +0000)]
Merge \"Do not use TetherUtil.setWifiTethering\" into nyc-mr1-dev
am: 62edbf484e

Change-Id: I023592acc146cbddb2917556a0fb7c3dade417f4

8 years agoMerge "Do not use TetherUtil.setWifiTethering" into nyc-mr1-dev
TreeHugger Robot [Tue, 19 Jul 2016 15:55:30 +0000 (15:55 +0000)]
Merge "Do not use TetherUtil.setWifiTethering" into nyc-mr1-dev

8 years agoMerge \"Fix crash from dismissing after pause\" into nyc-mr1-dev
Jason Monk [Tue, 19 Jul 2016 14:33:16 +0000 (14:33 +0000)]
Merge \"Fix crash from dismissing after pause\" into nyc-mr1-dev
am: 8cb8dd05a2

Change-Id: I6ffd30d4c9dfa7e1c335a13495c1e7d823066c79

8 years agoMerge "Fix crash from dismissing after pause" into nyc-mr1-dev
Jason Monk [Tue, 19 Jul 2016 14:28:50 +0000 (14:28 +0000)]
Merge "Fix crash from dismissing after pause" into nyc-mr1-dev

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
Bill Yi [Tue, 19 Jul 2016 09:56:23 +0000 (09:56 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: b2f60d2974  -s ours

Change-Id: Ib24f1486b64a2aa2588e0142ae671d3ba79c8232

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 19 Jul 2016 09:49:06 +0000 (09:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge \"Lock the orientation for FallbackHome\" into nyc-mr1-dev
Maurice Lam [Tue, 19 Jul 2016 01:47:34 +0000 (01:47 +0000)]
Merge \"Lock the orientation for FallbackHome\" into nyc-mr1-dev
am: 78626fadb4

Change-Id: Ic15676a02afb4c4acf1eacc3975415108ef2b99c

8 years agoMerge "Lock the orientation for FallbackHome" into nyc-mr1-dev
Maurice Lam [Tue, 19 Jul 2016 01:30:08 +0000 (01:30 +0000)]
Merge "Lock the orientation for FallbackHome" into nyc-mr1-dev

8 years agoFix janky scrolling for Gestures Settings.
Doris Ling [Tue, 19 Jul 2016 01:05:06 +0000 (18:05 -0700)]
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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 18 Jul 2016 23:43:22 +0000 (16:43 -0700)]
Import translations. DO NOT MERGE

Change-Id: I34ef9d17f926e12706029e3825182e6dd0e1c24e
Auto-generated-cl: translation import

8 years agoMerge \"Support hardware colors for fingerprint video\" into nyc-mr1-dev
Maurice Lam [Mon, 18 Jul 2016 23:36:15 +0000 (23:36 +0000)]
Merge \"Support hardware colors for fingerprint video\" into nyc-mr1-dev
am: ebd722ce5b

Change-Id: Ibe34d29438026e2e5bfd233e9a245025a9e66931

8 years agoMerge "Support hardware colors for fingerprint video" into nyc-mr1-dev
Maurice Lam [Mon, 18 Jul 2016 23:24:18 +0000 (23:24 +0000)]
Merge "Support hardware colors for fingerprint video" into nyc-mr1-dev

8 years agoMerge \"Update FakeUid with new methods\" into nyc-mr1-dev
Adam Lesinski [Mon, 18 Jul 2016 21:16:03 +0000 (21:16 +0000)]
Merge \"Update FakeUid with new methods\" into nyc-mr1-dev
am: 30bef0a063

Change-Id: I3d9e4240c8986fad9ee3c3e3340027e127871d0b

8 years agoMerge "Update FakeUid with new methods" into nyc-mr1-dev
TreeHugger Robot [Mon, 18 Jul 2016 20:58:13 +0000 (20:58 +0000)]
Merge "Update FakeUid with new methods" into nyc-mr1-dev

8 years agoSupport hardware colors for fingerprint video
Maurice Lam [Fri, 15 Jul 2016 19:33:52 +0000 (12:33 -0700)]
Support hardware colors for fingerprint video

Bug: 28745754
Change-Id: Id86c2a6d882d4c4c4d1981da58de3e4c2059a50c

8 years agoDo not use TetherUtil.setWifiTethering
Christopher Wiley [Mon, 18 Jul 2016 18:16:15 +0000 (11:16 -0700)]
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

8 years agoFix a bunch of straggler themes.
Andrew Sapperstein [Fri, 15 Jul 2016 23:46:38 +0000 (16:46 -0700)]
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

8 years agoMerge \"Refine fingerprint animation handling\" into nyc-mr1-dev
Wonsik Kim [Mon, 18 Jul 2016 15:39:00 +0000 (15:39 +0000)]
Merge \"Refine fingerprint animation handling\" into nyc-mr1-dev
am: 534d644326

Change-Id: I39dee0085df38c687831057710645277a3d4ac96

8 years agoMerge "Refine fingerprint animation handling" into nyc-mr1-dev
Wonsik Kim [Mon, 18 Jul 2016 15:31:17 +0000 (15:31 +0000)]
Merge "Refine fingerprint animation handling" into nyc-mr1-dev

8 years agoDO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation.
Abodunrinwa Toki [Mon, 18 Jul 2016 11:03:38 +0000 (12:03 +0100)]
DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation.

This ports I1e4035f4dcff33e6b9a42d448303e962bd87c14b to MR1 dev.

Bug: 28182232
Change-Id: I292b00a21eb80577dbfec6a13f57b326571aefc7

8 years agoLock the orientation for FallbackHome
Maurice Lam [Sat, 16 Jul 2016 01:11:54 +0000 (18:11 -0700)]
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