OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "Add Bluetooth toggle prompts - settings" am: de037d5491 -s ours
Marie Janssen [Fri, 28 Oct 2016 02:52:12 +0000 (02:52 +0000)]
Merge "Add Bluetooth toggle prompts - settings" am: de037d5491  -s ours
am: ce2a10b743

Change-Id: If2a0712b38cfd85af1502e68bdda39d1be8735b6

7 years agoMerge "Add Bluetooth toggle prompts - settings"
Marie Janssen [Fri, 28 Oct 2016 02:45:39 +0000 (02:45 +0000)]
Merge "Add Bluetooth toggle prompts - settings"
am: de037d5491  -s ours

Change-Id: I4d809fb02c07ad366b6e5954ac3c0dbc0f5c597d

7 years agoMerge "Add Bluetooth toggle prompts - settings"
Marie Janssen [Thu, 27 Oct 2016 23:07:31 +0000 (23:07 +0000)]
Merge "Add Bluetooth toggle prompts - settings"

7 years agoAdd Bluetooth toggle prompts - settings
Svetoslav Ganov [Sat, 23 Jul 2016 03:08:41 +0000 (20:08 -0700)]
Add Bluetooth toggle prompts - settings

If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Change-Id: I5ae0c532c92b2c05a91f0d769ca6744002747fca
(cherry picked from commit b06766f129dac138568883110f6d2a085b53445b)

7 years agoEnsure that the gesture animation video is paused properly. am: 4245ad4771
Doris Ling [Fri, 21 Oct 2016 23:46:51 +0000 (23:46 +0000)]
Ensure that the gesture animation video is paused properly. am: 4245ad4771
am: 5e4fce04fb

Change-Id: Ic615738b57a4ca49f5c6101e86aea03dbf0f9a12

7 years agoEnsure that the gesture animation video is paused properly.
Doris Ling [Fri, 21 Oct 2016 23:44:19 +0000 (23:44 +0000)]
Ensure that the gesture animation video is paused properly.
am: 4245ad4771

Change-Id: Ib6bd653fe0f1fd0859c37df4655908e67ecc4444

7 years agoEnsure that the gesture animation video is paused properly.
Doris Ling [Fri, 21 Oct 2016 21:28:54 +0000 (14:28 -0700)]
Ensure that the gesture animation video is paused properly.

Add the handling to pause the animation video when user navigates away
from the gesture settings.

Test: Manual - play gesture animation videos, then switch to another app
in recents. Verifies from logcat that NuPlayerDriver is not active.
Fix: 32064123

Change-Id: I3d0fb3946e4d0d77a686aa97cfabe667862cac17

7 years agoMerge "Support tile title text line wraps" into nyc-mr1-dev am: f5cd60372c
Matthew Fritze [Fri, 21 Oct 2016 16:46:00 +0000 (16:46 +0000)]
Merge "Support tile title text line wraps" into nyc-mr1-dev am: f5cd60372c
am: 2da1ca120f

Change-Id: Ic447e8fbf664140f2580c4898e2a0b6618585543

7 years agoSupport tile title text line wraps am: 0f813d668d
Matthew Fritze [Fri, 21 Oct 2016 16:45:40 +0000 (16:45 +0000)]
Support tile title text line wraps am: 0f813d668d
am: 0e0e6c5544

Change-Id: I81fa4356f76b2693eca95ff5c79c6168a68ffd64

7 years agoMerge "Support tile title text line wraps" into nyc-mr1-dev
Matthew Fritze [Fri, 21 Oct 2016 16:36:20 +0000 (16:36 +0000)]
Merge "Support tile title text line wraps" into nyc-mr1-dev
am: f5cd60372c

Change-Id: Ie0d699bcc355519060df04b46b213ce368e47e6a

7 years agoSupport tile title text line wraps
Matthew Fritze [Fri, 21 Oct 2016 16:36:19 +0000 (16:36 +0000)]
Support tile title text line wraps
am: 0f813d668d

Change-Id: I47a4f7f95f0bce43a55e661209d48142f82e5b42

7 years agoMerge "Support tile title text line wraps" into nyc-mr1-dev
TreeHugger Robot [Fri, 21 Oct 2016 16:30:49 +0000 (16:30 +0000)]
Merge "Support tile title text line wraps" into nyc-mr1-dev

7 years agoSupport tile title text line wraps
Matthew Fritze [Thu, 20 Oct 2016 22:35:29 +0000 (15:35 -0700)]
Support tile title text line wraps

Change-Id: Ice430d03877618aacad21e5ee6167516f60f02fd
Fixes: 32239411
Test: Manual

7 years agoMerge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev am...
Fan Zhang [Thu, 20 Oct 2016 20:34:04 +0000 (20:34 +0000)]
Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev am: 08254e5b4f
am: 723fbd06a9

Change-Id: Ief7d0f6e9d90c34f8b9405d4d13c4080f669c15c

7 years agoFix help & feedback link in data usage summary screen. am: 9b52836251
Fan Zhang [Thu, 20 Oct 2016 20:33:51 +0000 (20:33 +0000)]
Fix help & feedback link in data usage summary screen. am: 9b52836251
am: 7568e120cf

Change-Id: If7768bdf34204ca158dcf7e2078826a0aabc2ec7

7 years agoMerge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev
Fan Zhang [Thu, 20 Oct 2016 20:25:38 +0000 (20:25 +0000)]
Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev
am: 08254e5b4f

Change-Id: Ia9c30a0a03a1dcaec42573c3578f5a1ed80aa9b6

7 years agoFix help & feedback link in data usage summary screen.
Fan Zhang [Thu, 20 Oct 2016 20:25:37 +0000 (20:25 +0000)]
Fix help & feedback link in data usage summary screen.
am: 9b52836251

Change-Id: I1417eebbf5218baa24a79f2f1988844b8d06d674

7 years agoMerge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev
TreeHugger Robot [Thu, 20 Oct 2016 20:18:44 +0000 (20:18 +0000)]
Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE am: 4bfccb32a7 -s ours am: 4559d2bfac -s ours
Bill Yi [Thu, 20 Oct 2016 16:41:12 +0000 (16:41 +0000)]
Import translations. DO NOT MERGE am: 4bfccb32a7  -s ours am: 4559d2bfac  -s ours
am: d0c5d246c8  -s ours

Change-Id: Ic8230d57c512c2ccbc54be5061caac490bcbe6d4

7 years agoImport translations. DO NOT MERGE am: 4bfccb32a7 -s ours
Bill Yi [Thu, 20 Oct 2016 16:33:20 +0000 (16:33 +0000)]
Import translations. DO NOT MERGE am: 4bfccb32a7  -s ours
am: 4559d2bfac  -s ours

Change-Id: Iff8ca804ae251a0462f148a236e7b4e8c9dd3e4d

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Oct 2016 16:25:35 +0000 (16:25 +0000)]
Import translations. DO NOT MERGE
am: 4bfccb32a7  -s ours

Change-Id: I7c16649111b0057307773f7674c11c1aa9732c4c

7 years agoImport translations. DO NOT MERGE am: 7e6e9220da -s ours
Bill Yi [Thu, 20 Oct 2016 16:25:23 +0000 (16:25 +0000)]
Import translations. DO NOT MERGE am: 7e6e9220da  -s ours
am: d5bc80036b  -s ours

Change-Id: I147e0e6546f7d367ff81d45bc66e7829bcf45267

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Oct 2016 16:17:21 +0000 (16:17 +0000)]
Import translations. DO NOT MERGE
am: 7e6e9220da  -s ours

Change-Id: Ibe7e7a4797602978d09a44aab39f49045f029748

7 years agoFix help & feedback link in data usage summary screen.
Fan Zhang [Thu, 20 Oct 2016 16:06:12 +0000 (09:06 -0700)]
Fix help & feedback link in data usage summary screen.

The fragment was not providing the correct string for help & feedback
button, causing no result page when user navigates to help article page
from actionbar overflow menu.

Change-Id: I076846c44d4fc95efea743f019a7ad4aab47f214
Fixes: 32291069
Test: manual

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Oct 2016 14:52:52 +0000 (07:52 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Oct 2016 14:48:07 +0000 (07:48 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMerge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev am...
Anna Galusza [Thu, 20 Oct 2016 03:46:56 +0000 (03:46 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev am: ee502d5037
am: b104675957

Change-Id: Id3c38bf0f288ec55bdedb2029eac7c713773c4a9

7 years agoFix insufficint contrast on Vision Settings toggles. am: e212817785
Anna Galusza [Thu, 20 Oct 2016 03:46:42 +0000 (03:46 +0000)]
Fix insufficint contrast on Vision Settings toggles. am: e212817785
am: 5bf1f668ff

Change-Id: I0ac8ad8d8cd0091224c2bf1a76ac4845b4c6cf31

7 years agoMerge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
Anna Galusza [Thu, 20 Oct 2016 03:38:11 +0000 (03:38 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
am: ee502d5037

Change-Id: I23a6c8eb6911902fc9b9ecab8bb87e38c73371b5

7 years agoFix insufficint contrast on Vision Settings toggles.
Anna Galusza [Thu, 20 Oct 2016 03:38:11 +0000 (03:38 +0000)]
Fix insufficint contrast on Vision Settings toggles.
am: e212817785

Change-Id: I9969b046d52d6aff86fe6b0f5d44cce2cf49e8dd

7 years agoMerge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
Anna Galusza [Thu, 20 Oct 2016 03:32:22 +0000 (03:32 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev

7 years agoFix insufficint contrast on Vision Settings toggles.
Anna Galusza [Mon, 17 Oct 2016 19:23:08 +0000 (12:23 -0700)]
Fix insufficint contrast on Vision Settings toggles.

Bug: 29161887
Change-Id: I633ed3cf0fa00d3b697377118580471afaf30132

7 years agoMerge "Separate ambient display triggers" into nyc-mr1-dev am: ee5eef1492
Adrian Roos [Tue, 18 Oct 2016 22:43:36 +0000 (22:43 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev am: ee5eef1492
am: f33b98b750

Change-Id: I61777d38647d8b6f858de9feadf7ae3c8a9b7ebd

7 years agoSeparate ambient display triggers am: 82829ee0b1
Adrian Roos [Tue, 18 Oct 2016 22:19:52 +0000 (22:19 +0000)]
Separate ambient display triggers am: 82829ee0b1
am: 5ba2074e31

Change-Id: I023918a3d862502de6a4058609e29b8867e39f0c

7 years agoMerge "Separate ambient display triggers" into nyc-mr1-dev
Adrian Roos [Tue, 18 Oct 2016 22:16:39 +0000 (22:16 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev
am: ee5eef1492

Change-Id: Id045b4f47d8052b8e058522d69d91f9e1a9bba48

7 years agoSeparate ambient display triggers
Adrian Roos [Tue, 18 Oct 2016 22:07:11 +0000 (22:07 +0000)]
Separate ambient display triggers
am: 82829ee0b1

Change-Id: I9f58e13648def7e982ce2966e789147d07b14f62

7 years agoMerge "Separate ambient display triggers" into nyc-mr1-dev
Adrian Roos [Tue, 18 Oct 2016 22:00:04 +0000 (22:00 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev

7 years agoMerge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev...
Lei Yu [Tue, 18 Oct 2016 17:09:29 +0000 (17:09 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev am: 7fee46383f
am: b4969f5b6f

Change-Id: I81cf5f1bef06b9e3307df38d2e9e942f4be5f1e7

7 years agoSuspend action in security patch when browser is disabled am: 013da34209
jackqdyulei [Tue, 18 Oct 2016 17:09:15 +0000 (17:09 +0000)]
Suspend action in security patch when browser is disabled am: 013da34209
am: 221b9157b4

Change-Id: I09d1111f49a9d658629c2f1def0c1ed45f7b0ec4

7 years agoMerge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
Lei Yu [Tue, 18 Oct 2016 16:54:04 +0000 (16:54 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
am: 7fee46383f

Change-Id: I0adb924d05bed16bb6415f2b8edf69e509d7fe72

7 years agoSuspend action in security patch when browser is disabled
jackqdyulei [Tue, 18 Oct 2016 16:54:03 +0000 (16:54 +0000)]
Suspend action in security patch when browser is disabled
am: 013da34209

Change-Id: I408fadd1b4d5a3455eb70dc808efe18e258f26c0

7 years agoMerge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
Lei Yu [Tue, 18 Oct 2016 16:45:35 +0000 (16:45 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE am: 6515783df6 -s ours am: 37c5dd0fe3 -s ours
Bill Yi [Tue, 18 Oct 2016 05:49:41 +0000 (05:49 +0000)]
Import translations. DO NOT MERGE am: 6515783df6  -s ours am: 37c5dd0fe3  -s ours
am: a95e430c93  -s ours

Change-Id: I5704704614d94e10c1e5445d93fa28d584998d23

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5ffabbe58b -s ours
Bill Yi [Tue, 18 Oct 2016 05:49:22 +0000 (05:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5ffabbe58b  -s ours
am: 987866df87  -s ours

Change-Id: I004b43f4084e804c79e5b75b2e61448ecb4b0bdf

7 years agoImport translations. DO NOT MERGE am: ccde0787b8 -s ours
Bill Yi [Tue, 18 Oct 2016 05:49:02 +0000 (05:49 +0000)]
Import translations. DO NOT MERGE am: ccde0787b8  -s ours
am: 4367ed325e  -s ours

Change-Id: I10c8b1a9a393fa87343ebc2802232f246357b9b8

7 years agoImport translations. DO NOT MERGE am: 6515783df6 -s ours
Bill Yi [Tue, 18 Oct 2016 05:40:29 +0000 (05:40 +0000)]
Import translations. DO NOT MERGE am: 6515783df6  -s ours
am: 37c5dd0fe3  -s ours

Change-Id: Ia6d04b243b2338687963f234374d44a76a8bfae8

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 18 Oct 2016 05:40:02 +0000 (05:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 5ffabbe58b  -s ours

Change-Id: I97a96da052f14ecd9901ef7aee42cfdbaf284cbf

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 18 Oct 2016 05:40:01 +0000 (05:40 +0000)]
Import translations. DO NOT MERGE
am: ccde0787b8  -s ours

Change-Id: I7ee7d06fa217a520809ade396be78dddc63b3109

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 18 Oct 2016 05:37:33 +0000 (05:37 +0000)]
Import translations. DO NOT MERGE
am: 6515783df6  -s ours

Change-Id: I4afd6c7910dde3c52771687f6fa8bfbe55e56894

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 18 Oct 2016 05:30:53 +0000 (05:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoSuspend action in security patch when browser is disabled
jackqdyulei [Fri, 14 Oct 2016 20:53:14 +0000 (13:53 -0700)]
Suspend action in security patch when browser is disabled

When queryIntentActivities(intent, flag) return empty, don't send out
that intent to stop crash. This is a special catch only in security
patch.

Bug: 32054067
Test: Manual, hard to mock the situation to disable all the apps for
a specific action.

Change-Id: Ibc96b814a4170926972cff8e0bc954ea57b33c10

7 years agoSeparate ambient display triggers
Adrian Roos [Fri, 14 Oct 2016 20:03:55 +0000 (13:03 -0700)]
Separate ambient display triggers

Allows configuring notification and sensor triggers
separately. Introduces a helper class that hosts the
logic for determining what kinds of triggers a device
supports.

Bug: 32073185
Change-Id: Ie7e8eb6b895dcc54e6f972e70642c7248b9e223a
Test: disable "ambient display", sensor triggers should still work

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 17 Oct 2016 20:26:38 +0000 (13:26 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMerge "Add static preview images to gesture settings." into nyc-mr1-dev am: ec5314f2f5
Doris Ling [Mon, 17 Oct 2016 20:24:34 +0000 (20:24 +0000)]
Merge "Add static preview images to gesture settings." into nyc-mr1-dev am: ec5314f2f5
am: 1a674eef53

Change-Id: I5fe058f76e3a7061fc78fe02294f0cd802534cde

7 years agoAdd static preview images to gesture settings. am: 12e4bebabf
Doris Ling [Mon, 17 Oct 2016 20:24:26 +0000 (20:24 +0000)]
Add static preview images to gesture settings. am: 12e4bebabf
am: df7b815980

Change-Id: I56c1f9368bb762e400e0a071e72dd175351a7696

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 17 Oct 2016 20:21:09 +0000 (13:21 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMerge "Add static preview images to gesture settings." into nyc-mr1-dev
Doris Ling [Mon, 17 Oct 2016 20:18:33 +0000 (20:18 +0000)]
Merge "Add static preview images to gesture settings." into nyc-mr1-dev
am: ec5314f2f5

Change-Id: Ib195aa98f9838ceffc27255e34b18e2bdfbccbff

7 years agoAdd static preview images to gesture settings.
Doris Ling [Mon, 17 Oct 2016 20:18:30 +0000 (20:18 +0000)]
Add static preview images to gesture settings.
am: 12e4bebabf

Change-Id: I4f5f16b109c4997b15b93320945bbb3ccab06735

7 years agoMerge "Add static preview images to gesture settings." into nyc-mr1-dev
Doris Ling [Mon, 17 Oct 2016 20:11:31 +0000 (20:11 +0000)]
Merge "Add static preview images to gesture settings." into nyc-mr1-dev

7 years agoFix multi-sim popup issue in data usage. am: 8591f26fa3
Sanket Padawe [Mon, 17 Oct 2016 17:25:04 +0000 (17:25 +0000)]
Fix multi-sim popup issue in data usage. am: 8591f26fa3
am: d8fc77122b

Change-Id: Idbe5e19e8ce5660e4a056b28917fccca5477cc9e

7 years agoFix multi-sim popup issue in data usage.
Sanket Padawe [Mon, 17 Oct 2016 17:18:34 +0000 (17:18 +0000)]
Fix multi-sim popup issue in data usage.
am: 8591f26fa3

Change-Id: If23388f4fb2211af239aef7043cceb2ec2dd13e8

7 years agoFix multi-sim popup issue in data usage.
Sanket Padawe [Fri, 14 Oct 2016 22:41:52 +0000 (15:41 -0700)]
Fix multi-sim popup issue in data usage.

+ Avoid sending popup dialog when data is enabled on currently active
data sim.

Bug: 31736014
Change-Id: I60e9e049f546cb176283bc4c4e20cb2d3e7ac386

7 years agoImport translations. DO NOT MERGE am: 43920d3ba5 -s ours am: 1146d6375c -s ours
Bill Yi [Fri, 14 Oct 2016 09:29:39 +0000 (09:29 +0000)]
Import translations. DO NOT MERGE am: 43920d3ba5  -s ours am: 1146d6375c  -s ours
am: 11d7cba3b2  -s ours

Change-Id: I4a666011cda0542627d55677ed4bbe26378e2804

7 years agoImport translations. DO NOT MERGE am: 18a64f201b -s ours
Bill Yi [Fri, 14 Oct 2016 09:29:25 +0000 (09:29 +0000)]
Import translations. DO NOT MERGE am: 18a64f201b  -s ours
am: fceb2818d6  -s ours

Change-Id: I5bc44f819b0dcc27aa5dcd411bed23eda90ec733

7 years agoImport translations. DO NOT MERGE am: 43920d3ba5 -s ours
Bill Yi [Fri, 14 Oct 2016 09:22:56 +0000 (09:22 +0000)]
Import translations. DO NOT MERGE am: 43920d3ba5  -s ours
am: 1146d6375c  -s ours

Change-Id: I973f3606e3f7427f74c9af29d58ba0611b865704

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 14 Oct 2016 09:21:26 +0000 (09:21 +0000)]
Import translations. DO NOT MERGE
am: 43920d3ba5  -s ours

Change-Id: I72f1d361a29a4391c33c5fd0fb8a3340287314f9

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 14 Oct 2016 09:20:40 +0000 (09:20 +0000)]
Import translations. DO NOT MERGE
am: 18a64f201b  -s ours

Change-Id: I91b138778b8488b63afa11c1c6625f7a72acbd62

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 13 Oct 2016 22:35:00 +0000 (15:35 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 13 Oct 2016 22:30:06 +0000 (15:30 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMerge "Fix searched item isn't highlighted" am: 363c529dc6 am: 1d07de566d
Qi Ding [Thu, 13 Oct 2016 01:34:08 +0000 (01:34 +0000)]
Merge "Fix searched item isn't highlighted" am: 363c529dc6 am: 1d07de566d
am: 85768b3723

Change-Id: I7bb1c3b3a5dbb1ee4e6d8934a7be542076d1e863

7 years agoMerge "Fix searched item isn't highlighted" am: 363c529dc6
Qi Ding [Thu, 13 Oct 2016 01:28:00 +0000 (01:28 +0000)]
Merge "Fix searched item isn't highlighted" am: 363c529dc6
am: 1d07de566d

Change-Id: I908c237db46ffcca743b66dd1c5fa5b0fab17a06

7 years agoMerge "Fix searched item isn't highlighted"
Qi Ding [Thu, 13 Oct 2016 01:19:49 +0000 (01:19 +0000)]
Merge "Fix searched item isn't highlighted"
am: 363c529dc6

Change-Id: I57e09b8403422338c80bd369d41822bf26383361

7 years agoMerge "Fix searched item isn't highlighted"
Treehugger Robot [Thu, 13 Oct 2016 01:13:41 +0000 (01:13 +0000)]
Merge "Fix searched item isn't highlighted"

7 years agoMerge "Suppress notif block/silence settings for essential packages." into nyc-mr1...
Daniel Sandler [Wed, 12 Oct 2016 13:58:04 +0000 (13:58 +0000)]
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev am: 0f6ae3aa87
am: 93622202d3

Change-Id: I8fa5d3437be488fa3c5f1d57a2032636d4fcd6b1

7 years agoSuppress notif block/silence settings for essential packages. am: acf763e996
Dan Sandler [Wed, 12 Oct 2016 13:57:49 +0000 (13:57 +0000)]
Suppress notif block/silence settings for essential packages. am: acf763e996
am: 80df316ac4

Change-Id: I6c8b6133ab088362974df5c19d3b93d2862f8c92

7 years agoMerge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev
Daniel Sandler [Wed, 12 Oct 2016 13:51:05 +0000 (13:51 +0000)]
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev
am: 0f6ae3aa87

Change-Id: I87fbb0cd4c462a7df76e2f5719aafc54ee671076

7 years agoSuppress notif block/silence settings for essential packages.
Dan Sandler [Wed, 12 Oct 2016 13:51:04 +0000 (13:51 +0000)]
Suppress notif block/silence settings for essential packages.
am: acf763e996

Change-Id: I2c88494c5d1df2075bc56ed10aa88b41d6ec6113

7 years agoMerge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev
Daniel Sandler [Wed, 12 Oct 2016 13:38:56 +0000 (13:38 +0000)]
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev

7 years agoMerge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev am...
Doris Ling [Wed, 12 Oct 2016 00:36:05 +0000 (00:36 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev am: 49c0bab8bf
am: 739a261295

Change-Id: I25ceb867e68720f22405a944669c5fc9ca3570f4

7 years agoRemove pickup gesture settings if sensor is not found. am: 94e0da52fc
Doris Ling [Wed, 12 Oct 2016 00:35:58 +0000 (00:35 +0000)]
Remove pickup gesture settings if sensor is not found. am: 94e0da52fc
am: 79aa718669

Change-Id: Ibd7ad376e17c8a612b87909ffe87e75bb242c3a0

7 years agoMerge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
Doris Ling [Wed, 12 Oct 2016 00:23:48 +0000 (00:23 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
am: 49c0bab8bf

Change-Id: I8cf7ab7f80ea97249425e8da2fae6c2e88affd99

7 years agoRemove pickup gesture settings if sensor is not found.
Doris Ling [Wed, 12 Oct 2016 00:23:46 +0000 (00:23 +0000)]
Remove pickup gesture settings if sensor is not found.
am: 94e0da52fc

Change-Id: Iaca5d323b7cda84ca3ed822babe150fc517f1ce9

7 years agoAdd static preview images to gesture settings.
Doris Ling [Fri, 30 Sep 2016 19:41:26 +0000 (12:41 -0700)]
Add static preview images to gesture settings.

Set the animation preview image view to the newly added preview image
instead of loading it from animation video.

Test: manual - launch gesture settings and visually check the animation
preview images.

Bug: 31636637

Change-Id: If25a0e3501bea0c6343326a143d665ec79e3d7c7

7 years agoMerge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
Doris Ling [Tue, 11 Oct 2016 23:42:41 +0000 (23:42 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev

7 years agoRemove pickup gesture settings if sensor is not found.
Doris Ling [Tue, 11 Oct 2016 21:19:03 +0000 (14:19 -0700)]
Remove pickup gesture settings if sensor is not found.

Update gesture settings to check for available pickup sensor before
showing pickup gesture settings.

Test: manual - launch gesture settings on different device and check for
pickup preference. Auto test pending.

Bug: 32072298

Change-Id: Iaab0290dcfeb2b0c9195df685f225d092a658347

7 years agoMerge "Delete "Show CPU usage"" into nyc-mr1-dev am: 09d3961326
Nick Kralevich [Tue, 11 Oct 2016 18:28:05 +0000 (18:28 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev am: 09d3961326
am: 2c89007df6

Change-Id: Iaddfa85f013b44648b12fed164e26d02251471fc

7 years agoDelete "Show CPU usage" am: 73dfef91b2
Nick Kralevich [Tue, 11 Oct 2016 18:14:34 +0000 (18:14 +0000)]
Delete "Show CPU usage" am: 73dfef91b2
am: 0f3067ce58

Change-Id: Ic7a08dfa404e8dc35feb17187fe7067ee868c715

7 years agoMerge "Delete "Show CPU usage"" into nyc-mr1-dev
Nick Kralevich [Tue, 11 Oct 2016 18:14:06 +0000 (18:14 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev
am: 09d3961326

Change-Id: Iaa4e4d01ca8a1543994d9ca422991cc25a36d819

7 years agoDelete "Show CPU usage"
Nick Kralevich [Tue, 11 Oct 2016 18:09:16 +0000 (18:09 +0000)]
Delete "Show CPU usage"
am: 73dfef91b2

Change-Id: I3bf3ab7c241980f21ae0b648db4e0e4065d3b848

7 years agoMerge "Delete "Show CPU usage"" into nyc-mr1-dev
Nick Kralevich [Tue, 11 Oct 2016 18:03:25 +0000 (18:03 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev

7 years agoDelete "Show CPU usage"
Nick Kralevich [Tue, 11 Oct 2016 16:03:29 +0000 (09:03 -0700)]
Delete "Show CPU usage"

This functionality hasn't worked since Lollipop.

Bug: 21388590
Change-Id: Ie3684ba0f8b3a5f577462e4cc4a1ceba53931eff

7 years agoImport translations. DO NOT MERGE am: 64d3e22e11 -s ours am: 9f8644c04f -s ours
Bill Yi [Tue, 11 Oct 2016 15:14:56 +0000 (15:14 +0000)]
Import translations. DO NOT MERGE am: 64d3e22e11  -s ours am: 9f8644c04f  -s ours
am: d13a041835  -s ours

Change-Id: Ibcfcbaa91d51944f0861d0f65e50461004db8779

7 years agoImport translations. DO NOT MERGE am: 6acf691f62 -s ours
Bill Yi [Tue, 11 Oct 2016 15:14:42 +0000 (15:14 +0000)]
Import translations. DO NOT MERGE am: 6acf691f62  -s ours
am: 557f83edb5  -s ours

Change-Id: I4d4f4c323c27dced0088b588567c7b42f3acb3e1

7 years agoImport translations. DO NOT MERGE am: 64d3e22e11 -s ours
Bill Yi [Tue, 11 Oct 2016 15:09:26 +0000 (15:09 +0000)]
Import translations. DO NOT MERGE am: 64d3e22e11  -s ours
am: 9f8644c04f  -s ours

Change-Id: I7dc4c1f300dd8a3afdd55cca1224c81e83528478

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 11 Oct 2016 15:09:11 +0000 (15:09 +0000)]
Import translations. DO NOT MERGE
am: 6acf691f62  -s ours

Change-Id: I2e8466a2baab0727b0a03ab96589cb0a1bd312a3

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 11 Oct 2016 15:03:11 +0000 (15:03 +0000)]
Import translations. DO NOT MERGE
am: 64d3e22e11  -s ours

Change-Id: Ib8ac9eb3a836caf8e4c239c0caa99ca1c9ec0948

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 10 Oct 2016 19:39:26 +0000 (12:39 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 10 Oct 2016 19:31:59 +0000 (12:31 -0700)]
Import translations. DO NOT MERGE

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

7 years agoFixed spans getting stripped from disclaimer am: e0b74a6de0
Salvador Martinez [Fri, 7 Oct 2016 21:08:47 +0000 (21:08 +0000)]
Fixed spans getting stripped from disclaimer am: e0b74a6de0
am: e3c31f3aec

Change-Id: Ia05205f27bdaccd7f08e311ef0c24a0af1776f64

7 years agoFixed spans getting stripped from disclaimer
Salvador Martinez [Fri, 7 Oct 2016 21:04:16 +0000 (21:04 +0000)]
Fixed spans getting stripped from disclaimer
am: e0b74a6de0

Change-Id: I5b668306d5e6221f47903179b58ce9b227d6a940