OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "Make anomaly item refresh in battery" into oc-dr1-dev am: 0ec3e4e626
Lei Yu [Sat, 22 Jul 2017 00:36:48 +0000 (00:36 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev am: 0ec3e4e626
am: ab7a4db9df

Change-Id: Ic8abdff3468d1670533fe7bc99915fe3132c44ee

7 years agoMerge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am...
Antony Sargent [Sat, 22 Jul 2017 00:36:30 +0000 (00:36 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am: a6ac4890ed
am: 0531bd48e3

Change-Id: I0c7931f70db596cce9ddeb91d2bbdc3fc2a99aeb

7 years agoMerge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8...
Christine Franks [Sat, 22 Jul 2017 00:36:07 +0000 (00:36 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8  -s ours
am: 18cd618368

Change-Id: Ia4986adc50cca19ca72e2e036cd7bef78006bbaf

7 years agoMerge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce24
Fan Zhang [Sat, 22 Jul 2017 00:32:48 +0000 (00:32 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce24
am: ef0e290e65

Change-Id: I77ca5052477a9e1efee01c7022378164096669b8

7 years agoMerge "Make anomaly item refresh in battery" into oc-dr1-dev am: 0ec3e4e626
Lei Yu [Sat, 22 Jul 2017 00:32:27 +0000 (00:32 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev am: 0ec3e4e626
am: 454131cdb0

Change-Id: I3feacbe94bca351809341e60464a6834e6980a12

7 years agoMerge "Make anomaly item refresh in battery" into oc-dr1-dev
Lei Yu [Sat, 22 Jul 2017 00:32:21 +0000 (00:32 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev
am: 0ec3e4e626

Change-Id: Ie3e4b7ead145b22c44383443229043722b9e86d9

7 years agoMerge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am...
Antony Sargent [Sat, 22 Jul 2017 00:32:07 +0000 (00:32 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am: a6ac4890ed
am: 62b7527da5

Change-Id: Ibfe8afab3bf662c2855a28c27d636da17444eb79

7 years agoMerge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
Antony Sargent [Sat, 22 Jul 2017 00:32:00 +0000 (00:32 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
am: a6ac4890ed

Change-Id: Ib4cbffa94b0372419f60f16972836df27ad1fecf

7 years agoMerge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8
Christine Franks [Sat, 22 Jul 2017 00:31:48 +0000 (00:31 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8
am: c350386476  -s ours

Change-Id: I6371e6575ba1b60dfe1c715c46e17be4f6340d98

7 years agoMerge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
Christine Franks [Sat, 22 Jul 2017 00:31:39 +0000 (00:31 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
am: cb9a7075f8  -s ours

Change-Id: Id75c03768308873b6b2666eaae6d1c86f23d1663

7 years agoMerge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev
Christine Franks [Sat, 22 Jul 2017 00:11:01 +0000 (00:11 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev
am: fd8b8eb0b1

Change-Id: I2f22b732d4268af4ce2fd537746287bda8091e70

7 years agoMerge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev
Christine Franks [Fri, 21 Jul 2017 23:59:23 +0000 (23:59 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Fri, 21 Jul 2017 22:20:24 +0000 (22:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: f364c30330  -s ours

Change-Id: I9aa60965b808aadc652caf17b9e7f46e639c12a7

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 22:16:56 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

7 years agoMerge "Reindex db when package w/ searchIndexProvider changes" into oc-mr1-dev
Fan Zhang [Fri, 21 Jul 2017 22:15:54 +0000 (22:15 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-mr1-dev
am: 85287ec26a

Change-Id: Ieffd7131081d33db12437f0407d347eaec76c7f2

7 years agoMerge "Reindex db when package w/ searchIndexProvider changes" into oc-mr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 22:09:15 +0000 (22:09 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-mr1-dev

7 years agoMerge "Tweak bluetooth name preference" into oc-dr1-dev
Fan Zhang [Fri, 21 Jul 2017 21:47:13 +0000 (21:47 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev
am: 03c595ce24

Change-Id: I25e7a3c66fddb8b594e06ced3435fa02273dc68e

7 years agoMerge "Tweak bluetooth name preference" into oc-dr1-dev
Fan Zhang [Fri, 21 Jul 2017 21:41:29 +0000 (21:41 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev

7 years agoMerge "Make anomaly item refresh in battery" into oc-dr1-dev
Lei Yu [Fri, 21 Jul 2017 20:30:18 +0000 (20:30 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev
am: 0ec3e4e626

Change-Id: Idcd210c8643f4e60375ab957bcc83136e5ffb0f3

7 years agoMerge "Make anomaly item refresh in battery" into oc-dr1-dev
Lei Yu [Fri, 21 Jul 2017 20:28:01 +0000 (20:28 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev

7 years agoMerge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
Antony Sargent [Fri, 21 Jul 2017 20:11:53 +0000 (20:11 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
am: a6ac4890ed

Change-Id: I55b589590c90eb232bf70ec8b0256ee4da6013fe

7 years agoMerge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 20:03:41 +0000 (20:03 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev

7 years agoReindex db when package w/ searchIndexProvider changes
Fan Zhang [Fri, 21 Jul 2017 00:05:01 +0000 (17:05 -0700)]
Reindex db when package w/ searchIndexProvider changes

We do this by tracking a list of package/version that provides search
indexing data. When they change, we do a full reindex.

Change-Id: I906a1524f5b1292932f63727d605283ddb7d6ee2
Bug: 63903835
Test: robotests

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 21 Jul 2017 19:22:06 +0000 (12:22 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ifb876a3208315c84fad355fac5204336eb8681e1
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoMove logic for FR in demo mode out of Settings
Christine Franks [Fri, 23 Jun 2017 21:28:21 +0000 (14:28 -0700)]
Move logic for FR in demo mode out of Settings

Bug: 62712426
Test: make \
ROBOTEST_FILTER="(MasterClearTest|FactoryResetPreferenceControllerTest
|UtilsTest)" \
RunSettingsRoboTests -j100
Change-Id: I5e287c3d4a6a7050bda78187c52aec19e90b50bc

7 years agoMerge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
Christine Franks [Fri, 21 Jul 2017 19:05:42 +0000 (19:05 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
am: cb9a7075f8

Change-Id: I0b059d3c240169ff4b0cc24fd22597bd31659fe7

7 years agoMerge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
Christine Franks [Fri, 21 Jul 2017 18:52:56 +0000 (18:52 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev

7 years agoMerge "Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev...
Android Build Merger (Role) [Fri, 21 Jul 2017 18:51:46 +0000 (18:51 +0000)]
Merge "Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev am: e09338a208  -s ours am: 50ac1cebc3" into oc-mr1-dev-plus-aosp

7 years agoMerge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev am:...
Fan Zhang [Fri, 21 Jul 2017 18:51:19 +0000 (18:51 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev am: e09338a208  -s ours
am: 50ac1cebc3

Change-Id: Ie6554b2f6ca85e9805b40582d0a6f058aa0abc4e

7 years agoMerge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev am:...
Fan Zhang [Fri, 21 Jul 2017 18:51:14 +0000 (18:51 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev am: e09338a208
am: 8df2cef10d  -s ours

Change-Id: I3156fe7bfd6f2383b18457cf4a854059c26b6f0a

7 years agoMerge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
Fan Zhang [Fri, 21 Jul 2017 18:42:40 +0000 (18:42 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
am: e09338a208  -s ours

Change-Id: Iabafe1e7ffdd70fa9694cf4e293d83b4aef6bba8

7 years agoTweak bluetooth name preference
Fan Zhang [Fri, 21 Jul 2017 18:34:39 +0000 (11:34 -0700)]
Tweak bluetooth name preference

- remove accent color from device name
- remove useless ripple when tap

Change-Id: I7800523eb27bafa24f3a4549b1acf02c869ac8c8
Fix: 62891178
Test: robotests

7 years agoMerge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
Fan Zhang [Fri, 21 Jul 2017 18:23:56 +0000 (18:23 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
am: e09338a208

Change-Id: I5db6cec4b7976e338d9e49689f1530cbbb6a1259

7 years agoMerge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
Fan Zhang [Fri, 21 Jul 2017 18:18:44 +0000 (18:18 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev

7 years agoMake anomaly item refresh in battery
jackqdyulei [Fri, 21 Jul 2017 01:00:20 +0000 (18:00 -0700)]
Make anomaly item refresh in battery

Bug: 63908155
Test: RunSettingsRoboTest
Change-Id: I3e220001ca989020447403641360fade4d09e969

7 years agoMerge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev
Doris Ling [Fri, 21 Jul 2017 17:26:33 +0000 (17:26 +0000)]
Merge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev
am: a39daa25e7

Change-Id: Iaf765d32f99018f2a6372e87523f8b83df97c584

7 years agoMerge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev
Doris Ling [Fri, 21 Jul 2017 17:19:12 +0000 (17:19 +0000)]
Merge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev

7 years agoMerge "Zen settings screen update am: 56b748d686 am: 4faa353f02" into oc-mr1-dev...
Android Build Merger (Role) [Fri, 21 Jul 2017 16:27:31 +0000 (16:27 +0000)]
Merge "Zen settings screen update am: 56b748d686 am: 4faa353f02" into oc-mr1-dev-plus-aosp

7 years agoZen settings screen update am: 56b748d686
Julia Reynolds [Fri, 21 Jul 2017 16:27:18 +0000 (16:27 +0000)]
Zen settings screen update am: 56b748d686
am: 4faa353f02

Change-Id: Ifd7d390db0373561b9a5536b412373579dadc8e3

7 years agoZen settings screen update am: 56b748d686
Julia Reynolds [Fri, 21 Jul 2017 16:27:00 +0000 (16:27 +0000)]
Zen settings screen update am: 56b748d686
am: 6ad9f3267b

Change-Id: I1430e8788765d33e6fd03e2739676d26964cda68

7 years agoZen settings screen update
Julia Reynolds [Fri, 21 Jul 2017 16:21:25 +0000 (16:21 +0000)]
Zen settings screen update
am: 56b748d686

Change-Id: Ida9de16ee3a52fd1d06764e560411401c976ac5d

7 years agoZen settings screen update
Julia Reynolds [Fri, 21 Jul 2017 16:21:25 +0000 (16:21 +0000)]
Zen settings screen update
am: 56b748d686

Change-Id: Iaac694915e20e5dc0f5edd0d1be17321621caa6e

7 years agoZen settings screen update
Julia Reynolds [Fri, 21 Jul 2017 13:07:23 +0000 (09:07 -0400)]
Zen settings screen update

- Remove app attribution
- Change visual disturbances label

Change-Id: Id2f7a16817a3b044db4374bf45a54706b8c42eff
Fixes: 63905920
Fixes: 63906381
Test: manual

7 years agoMerge "Merge "Make the support loader activity display UI." into oc-dr1-dev am: 4ab6f...
Android Build Merger (Role) [Fri, 21 Jul 2017 01:50:05 +0000 (01:50 +0000)]
Merge "Merge "Make the support loader activity display UI." into oc-dr1-dev am: 4ab6f77f98 am: bb86b53a06" into oc-mr1-dev-plus-aosp

7 years agoMerge "Make the support loader activity display UI." into oc-dr1-dev am: 4ab6f77f98
Daniel Nishi [Fri, 21 Jul 2017 01:49:39 +0000 (01:49 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev am: 4ab6f77f98
am: bb86b53a06

Change-Id: I8fcb2b002c6007dafaeeee882a00937f4aa94e79

7 years agoMerge "Make the support loader activity display UI." into oc-dr1-dev am: 4ab6f77f98
Daniel Nishi [Fri, 21 Jul 2017 01:49:34 +0000 (01:49 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev am: 4ab6f77f98
am: 0eae770acc

Change-Id: I0ae9bff7b69927d535656482838f1819304d82df

7 years agoMerge "Make the support loader activity display UI." into oc-dr1-dev
Daniel Nishi [Fri, 21 Jul 2017 01:47:17 +0000 (01:47 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev
am: 4ab6f77f98

Change-Id: I17baf254839424d21f1588b1a7925927437b95c6

7 years agoMerge "Make the support loader activity display UI." into oc-dr1-dev
Daniel Nishi [Fri, 21 Jul 2017 01:47:17 +0000 (01:47 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev
am: 4ab6f77f98

Change-Id: I06dea000a9bc74314905f49843262e79a6c240dd

7 years agoMerge "Make the support loader activity display UI." into oc-dr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 01:43:47 +0000 (01:43 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev

7 years agoAdd shadow to searchbar when user scrolls vertically
Fan Zhang [Wed, 19 Jul 2017 23:44:28 +0000 (16:44 -0700)]
Add shadow to searchbar when user scrolls vertically

Bug: 63528057
Test: robotests

Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60
(cherry picked from commit e651ddf9e6c00a62338ef8c7114b5e5e9cd307ec)

7 years agoMove logic for FR in demo mode out of Settings
Christine Franks [Fri, 23 Jun 2017 21:28:21 +0000 (14:28 -0700)]
Move logic for FR in demo mode out of Settings

Bug: 62712426
Test: make \
ROBOTEST_FILTER="(MasterClearTest|FactoryResetPreferenceControllerTest
|UtilsTest)" \
RunSettingsRoboTests -j100
Change-Id: I5e287c3d4a6a7050bda78187c52aec19e90b50bc

7 years agoMerge "Add shadow to searchbar when user scrolls vertically" into oc-mr1-dev
Fan Zhang [Fri, 21 Jul 2017 00:41:32 +0000 (00:41 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-mr1-dev
am: 91468e309c

Change-Id: Ib1dcebb2136f8a673e050a3d19534d3fdb309766

7 years agoMerge "Add shadow to searchbar when user scrolls vertically" into oc-mr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 00:36:59 +0000 (00:36 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-mr1-dev

7 years agoMerge "Ignore clicks on developer switch UI during monkey test" into oc-mr1-dev
Fan Zhang [Thu, 20 Jul 2017 22:23:54 +0000 (22:23 +0000)]
Merge "Ignore clicks on developer switch UI during monkey test" into oc-mr1-dev
am: 52a3b5c17d

Change-Id: I2127af952a134a9eeb17c2ee2eda6c8410a671f6

7 years agoMerge "Ignore clicks on developer switch UI during monkey test" into oc-mr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 22:17:50 +0000 (22:17 +0000)]
Merge "Ignore clicks on developer switch UI during monkey test" into oc-mr1-dev

7 years agoMerge "Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am...
Android Build Merger (Role) [Thu, 20 Jul 2017 21:56:06 +0000 (21:56 +0000)]
Merge "Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am: e4c9b7162d am: 30b97e89d4" into oc-mr1-dev-plus-aosp

7 years agoMerge "Add some more logging to settings battery stuff" into oc-dr1-dev am: e4c9b7162d
Salvador Martinez [Thu, 20 Jul 2017 21:55:52 +0000 (21:55 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am: e4c9b7162d
am: 30b97e89d4

Change-Id: I6a1d8d036380f183bb080330542f0d5090e93a1b

7 years agoMerge "Add some more logging to settings battery stuff" into oc-dr1-dev am: e4c9b7162d
Salvador Martinez [Thu, 20 Jul 2017 21:55:48 +0000 (21:55 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am: e4c9b7162d
am: 2834bcb195

Change-Id: I07ba4b0efeae47fc80c46a193aaf073ccadbc182

7 years agoMerge "Add some more logging to settings battery stuff" into oc-dr1-dev
Salvador Martinez [Thu, 20 Jul 2017 21:53:50 +0000 (21:53 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev
am: e4c9b7162d

Change-Id: Ib105c6a9769db260e781dde61af74563735345a3

7 years agoMerge "Add some more logging to settings battery stuff" into oc-dr1-dev
Salvador Martinez [Thu, 20 Jul 2017 21:53:50 +0000 (21:53 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev
am: e4c9b7162d

Change-Id: I560c4f1640b20e781daf2bcc9e22fc0c9b511b90

7 years agoMerge "Add some more logging to settings battery stuff" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 21:46:33 +0000 (21:46 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev am: acd97be0b8 -s ours
Bill Yi [Thu, 20 Jul 2017 21:31:34 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: acd97be0b8  -s ours
am: 2d50ad831e  -s ours

Change-Id: Ic02b25c0a6077217fbd8093ae4f55a062d62bb3f

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev am: acd97be0b8 -s ours
Bill Yi [Thu, 20 Jul 2017 21:29:51 +0000 (21:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: acd97be0b8  -s ours
am: bc1a0265c5  -s ours

Change-Id: Ife685585ed0bef93f591de8b852dd4368811af42

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Thu, 20 Jul 2017 21:27:48 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: acd97be0b8  -s ours

Change-Id: I4b9fad43198474d48c7eb5313b52f9c9314ca05f

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Thu, 20 Jul 2017 21:27:48 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: acd97be0b8  -s ours

Change-Id: Ib8a1e9a9f4b4ae2d056b5b4bf8e6603aa9212c4d

7 years agoMerge "Add new column user_editable to Carriers table in telephony db." into oc-dr1...
Amit Mahajan [Thu, 20 Jul 2017 21:26:51 +0000 (21:26 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am: c2b12c5304
am: 8ace0324ee

Change-Id: I515783259b3c57c36985e0646886a1248a47c608

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 21:17:34 +0000 (21:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoMerge "Add new column user_editable to Carriers table in telephony db." into oc-dr1...
Amit Mahajan [Thu, 20 Jul 2017 21:11:45 +0000 (21:11 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am: c2b12c5304
am: 9ded852f71

Change-Id: I1fc8aec7c8cfc71c707f4ea1d0f02a2a2a7c8375

7 years agoMerge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
Amit Mahajan [Thu, 20 Jul 2017 21:00:23 +0000 (21:00 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am: c2b12c5304

Change-Id: Ic352005843d3ffd0b04a0a80710c04a5f02291a6

7 years agoMerge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
Amit Mahajan [Thu, 20 Jul 2017 20:58:48 +0000 (20:58 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am: c2b12c5304

Change-Id: I536c3111a917a2d9b1f64235fb54c5face72eb74

7 years agoMerge "Ensure that brightness level is within 0-100%." into oc-dr1-dev am: 390bb3216d
Doris Ling [Thu, 20 Jul 2017 20:57:03 +0000 (20:57 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev am: 390bb3216d
am: 1f8c5debbb

Change-Id: If600090e0b5e49682411dc42c027a206c97e3e2c

7 years agoMerge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am...
Evan Laird [Thu, 20 Jul 2017 20:56:43 +0000 (20:56 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am: a9e2d97004
am: e99586cfea

Change-Id: I84e08dda688ccec72c9c672813f75a3f597784e3

7 years agoMerge "Ensure that brightness level is within 0-100%." into oc-dr1-dev am: 390bb3216d
Doris Ling [Thu, 20 Jul 2017 20:51:19 +0000 (20:51 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev am: 390bb3216d
am: 11cfc26d0a

Change-Id: I3ac60eea7ed915e891412f88479c9b5374f53299

7 years agoMerge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am...
Evan Laird [Thu, 20 Jul 2017 20:50:57 +0000 (20:50 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am: a9e2d97004
am: bc562b1888

Change-Id: I9c33400aa612b7c44b9199ef8564889d8a128a1b

7 years agoMerge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
Amit Mahajan [Thu, 20 Jul 2017 20:47:12 +0000 (20:47 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev

7 years agoMerge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
Doris Ling [Thu, 20 Jul 2017 20:43:32 +0000 (20:43 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
am: 390bb3216d

Change-Id: Icfaf4162e4f43e6f91bc886e3750c2a713765e5c

7 years agoMerge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
Evan Laird [Thu, 20 Jul 2017 20:42:46 +0000 (20:42 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
am: a9e2d97004

Change-Id: I891ad549056df8632fd10570769c2695f6ad4384

7 years agoFix gesture preview image visibility not set correctly.
Doris Ling [Thu, 20 Jul 2017 20:25:51 +0000 (13:25 -0700)]
Fix gesture preview image visibility not set correctly.

- update for the preview image is done only in onStart()/Stop().
Move the handling to onPause()/onResume() instead so that visibility
updates will also be done when switching between pages.
- remove the obsolete GesturePreference class.

Change-Id: I743a9d41f17aab3303201e11e5bba708ca5810ae
Fix: 63783217
Test: make RunSettingsRoboTests

7 years agoMerge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
Doris Ling [Thu, 20 Jul 2017 20:38:09 +0000 (20:38 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
am: 390bb3216d

Change-Id: I4b6b6f8d2d6ef19e16d74df1f403f0a5f5109713

7 years agoMerge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
Evan Laird [Thu, 20 Jul 2017 20:37:47 +0000 (20:37 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
am: a9e2d97004

Change-Id: I596d700d10a29640344d4554824a29eb21e71cf1

7 years agoMerge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 20:34:55 +0000 (20:34 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev

7 years agoAdd shadow to searchbar when user scrolls vertically
Fan Zhang [Wed, 19 Jul 2017 23:44:28 +0000 (16:44 -0700)]
Add shadow to searchbar when user scrolls vertically

Bug: 63528057
Test: robotests

Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60

7 years agoMerge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 20:23:53 +0000 (20:23 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev

7 years agoMerge "Merge "Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: cc298f9ae...
Android Build Merger (Role) [Thu, 20 Jul 2017 20:10:56 +0000 (20:10 +0000)]
Merge "Merge "Import translations. DO NOT MERGE am: 6cf2d99816  -s ours am: cc298f9ae6  -s ours" into oc-dr1-dev-plus-aosp am: 8746483a7c  -s ours" into oc-mr1-dev-plus-aosp

7 years agoMerge "Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: cc298f9ae6 ...
Bill Yi [Thu, 20 Jul 2017 20:10:38 +0000 (20:10 +0000)]
Merge "Import translations. DO NOT MERGE am: 6cf2d99816  -s ours am: cc298f9ae6  -s ours" into oc-dr1-dev-plus-aosp
am: 8746483a7c  -s ours

Change-Id: I5a0e57de40ded32e9207c4ac0e5e85e89d2fde1f

7 years agoMerge "Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: bd3bd7d1e1 ...
Android Build Merger (Role) [Thu, 20 Jul 2017 20:10:30 +0000 (20:10 +0000)]
Merge "Import translations. DO NOT MERGE am: 6cf2d99816  -s ours am: bd3bd7d1e1  -s ours am: 29978d1ee6  -s ours" into oc-mr1-dev-plus-aosp

7 years agoImport translations. DO NOT MERGE am: 6cf2d99816 -s ours am: bd3bd7d1e1 -s ours
Bill Yi [Thu, 20 Jul 2017 20:10:13 +0000 (20:10 +0000)]
Import translations. DO NOT MERGE am: 6cf2d99816  -s ours am: bd3bd7d1e1  -s ours
am: 29978d1ee6  -s ours

Change-Id: I876d8498f240de3446cc7700ae36db901f6a8408

7 years agoImport translations. DO NOT MERGE am: 6cf2d99816 -s ours am: cc298f9ae6 -s ours
Bill Yi [Thu, 20 Jul 2017 20:10:11 +0000 (20:10 +0000)]
Import translations. DO NOT MERGE am: 6cf2d99816  -s ours am: cc298f9ae6  -s ours
am: 821967eca5  -s ours

Change-Id: I5fa9fbca513f35b554126b8a86536c68dcbdf7d0

7 years agoMerge "Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: cc298f9ae6 ...
Android Build Merger (Role) [Thu, 20 Jul 2017 20:05:12 +0000 (20:05 +0000)]
Merge "Import translations. DO NOT MERGE am: 6cf2d99816  -s ours am: cc298f9ae6  -s ours" into oc-dr1-dev-plus-aosp

7 years agoImport translations. DO NOT MERGE am: 6cf2d99816 -s ours
Bill Yi [Thu, 20 Jul 2017 20:04:42 +0000 (20:04 +0000)]
Import translations. DO NOT MERGE am: 6cf2d99816  -s ours
am: cc298f9ae6  -s ours

Change-Id: I28beea32e9cdc8bced4cd2af333e391bfc6d73c0

7 years agoImport translations. DO NOT MERGE am: 6cf2d99816 -s ours
Bill Yi [Thu, 20 Jul 2017 20:04:42 +0000 (20:04 +0000)]
Import translations. DO NOT MERGE am: 6cf2d99816  -s ours
am: bd3bd7d1e1  -s ours

Change-Id: I5654af1da287c0864385a5d6e473cd2800427eb7

7 years agoImport translations. DO NOT MERGE am: 6cf2d99816 -s ours
Bill Yi [Thu, 20 Jul 2017 20:04:41 +0000 (20:04 +0000)]
Import translations. DO NOT MERGE am: 6cf2d99816  -s ours
am: cc298f9ae6  -s ours

Change-Id: I3e0203a1fdc9f803c0f981d5dca7ad286493b4ce

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Jul 2017 19:58:46 +0000 (19:58 +0000)]
Import translations. DO NOT MERGE
am: 6cf2d99816  -s ours

Change-Id: Ic6e1c58d91200c599211ccf4a1f781892dc75d55

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Jul 2017 19:58:46 +0000 (19:58 +0000)]
Import translations. DO NOT MERGE
am: 6cf2d99816  -s ours

Change-Id: Iad277ccc5f81d14255363128d400420ca70cd376

7 years agoMove Gesture settings up one level.
Doris Ling [Thu, 20 Jul 2017 19:33:08 +0000 (19:33 +0000)]
Move Gesture settings up one level.
am: 204ca74397

Change-Id: I01ffe71df1e0769d87f9df6cdb1d3ced39e0ba99

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Jul 2017 17:53:14 +0000 (10:53 -0700)]
Import translations. DO NOT MERGE

Change-Id: If5c18c395a4293f6c084f9019fd37a17ddfd24d9
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoEnsure that brightness level is within 0-100%.
Doris Ling [Wed, 5 Jul 2017 19:53:04 +0000 (12:53 -0700)]
Ensure that brightness level is within 0-100%.

Check whether the retrieved brightnesss value is out of range, and
adjust it if necessary.

Change-Id: Ieb1ccc03dcb9fa3e1ed192fcc3d217b84d4d316c
Fix: 63872023
Test: make RunSettingsRoboTests
(cherry picked from commit c7d2d270abbe0d05ae00f326539d3dde91450243)

7 years agoSwitch to using gray icon for Bluetooth imaging devices
Antony Sargent [Thu, 20 Jul 2017 16:54:29 +0000 (09:54 -0700)]
Switch to using gray icon for Bluetooth imaging devices

All the other Bluetooth icons were switched to gray at some point in the
past, but we must have missed this one.

Bug: 63858978
Test: make RunSettingsRoboTests
Change-Id: I2ebefa42f3ecff8ae6d58f4bdb22dce39ae4dbd4

7 years agoMove Gesture settings up one level.
Doris Ling [Tue, 18 Jul 2017 22:43:26 +0000 (15:43 -0700)]
Move Gesture settings up one level.

Move System->Languages, input & gestures->Gestures to System->Gestures.

Change-Id: Ie81876208383f69ebf1a0465d76c760d7dd9d95d
Fix: 62276882
Test: make RunSettingsRoboTests
(cherry picked from commit 55ce7de7d06d9fd8ec153c4b6f5300fbe9349990)

7 years agoIgnore clicks on developer switch UI during monkey test
Fan Zhang [Wed, 19 Jul 2017 23:06:15 +0000 (16:06 -0700)]
Ignore clicks on developer switch UI during monkey test

Change-Id: I10c4771386bb38e117848da385090dec78e4a2f8
Fix: 63852950
Test: robotests