OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMerge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am...
Hansong Zhang [Mon, 9 Apr 2018 20:54:58 +0000 (13:54 -0700)]
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am: d59b0eddae
am: 3f2dbb7cc9

Change-Id: Ica684d7a7fc36439111b7eeb3886761f63a7130f

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0...
Hansong Zhang [Mon, 9 Apr 2018 20:53:41 +0000 (13:53 -0700)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6 am: c4127072f4
am: 1b7566cd07

Change-Id: I10c2d233f05ddf566ac38afb7c2cdc5a8e61df25

6 years agoMerge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev
Hansong Zhang [Mon, 9 Apr 2018 20:44:07 +0000 (13:44 -0700)]
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev
am: d59b0eddae

Change-Id: Ia628cc0bd02429ec321d8e80c9d9ad2c097715bd

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0...
Hansong Zhang [Mon, 9 Apr 2018 20:43:04 +0000 (13:43 -0700)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6
am: c4127072f4

Change-Id: I559bfa947ae6f7ee89076d05826fd4529d6b0cc2

6 years agoMerge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev
TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617 skipped: b1f00ebf9c
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa
  DO NOT MERGE Fix unexpected behavior in Bluetooth pairing

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa...
Android Build Merger (Role) [Mon, 2 Apr 2018 17:48:50 +0000 (17:48 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617 skipped: b1f00ebf9c

Change-Id: I4f02817d60b302e068caadd21ef4555f5f7d9221

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa...
Android Build Merger (Role) [Mon, 2 Apr 2018 17:48:48 +0000 (17:48 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617

Change-Id: I23c3c75844ff136521f67f94d4d911a44571ae07

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa...
Android Build Merger (Role) [Mon, 2 Apr 2018 17:48:47 +0000 (17:48 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238

Change-Id: I3fdb63225079954bace095dc0ddfd78deb372ff8

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa...
Android Build Merger (Role) [Mon, 2 Apr 2018 17:48:45 +0000 (17:48 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc

Change-Id: I5b600093709bf93bb64ccacddeaa3cdf0b470107

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa
Android Build Merger (Role) [Mon, 2 Apr 2018 17:48:43 +0000 (17:48 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa

Change-Id: Ibaab24729318954dbce44f3ccf53fcb4180ac1c7

6 years agoDO NOT MERGE Fix unexpected behavior in Bluetooth pairing
Hansong Zhang [Mon, 2 Apr 2018 17:48:18 +0000 (10:48 -0700)]
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing

* Set default PBAP permission to false
* Remove all newline and tab characters in Bluetooth device name

Bug: 72872376
Bug: 73173182
Test: manual
Change-Id: Ib3b99017c8da01446ce6302d43dcfb1ef8fba02c

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0...
Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:11 +0000 (17:45 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6

Change-Id: Idfc539317dd20a0216bb635fa0e014509d451069

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0...
Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:10 +0000 (17:45 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e

Change-Id: I527b0743bd4b85ddaa7c2bff32523c1876cb8859

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0...
Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:08 +0000 (17:45 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1

Change-Id: I1a16852bc9676bf785836576bf034d0a1dc8cf4b

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0...
Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:07 +0000 (17:45 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667

Change-Id: I72b65a7a76c93dff0dd5ffd9c3747c68c0a382e8

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0...
Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:05 +0000 (17:45 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2

Change-Id: I501c5e16642ce2bddb0c5c5e2ed6e0b84fc34029

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0...
Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:03 +0000 (17:45 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666

Change-Id: Idf0afa49507f8ead25fd1b59809064f058281076

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0...
Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:02 +0000 (17:45 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7

Change-Id: I69b00aebae95532bf9fe51191b14e12d8948b0bf

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0...
Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:00 +0000 (17:45 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3

Change-Id: I7c2952f8540db9ee15ceac73bf1a0d73652f5163

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0
Android Build Merger (Role) [Mon, 2 Apr 2018 17:44:58 +0000 (17:44 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0

Change-Id: Id8ac4a63bd63d0a219364b520211ebae5ad6ea62

6 years agoDO NOT MERGE Fix unexpected behavior in Bluetooth pairing
Hansong Zhang [Mon, 2 Apr 2018 17:42:26 +0000 (10:42 -0700)]
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing

* Set default PBAP permission to false
* Remove all newline and tab characters in Bluetooth device name

Bug: 72872376
Bug: 73173182
Test: manual
Change-Id: I85f5f11c5803c3031bf9a56273c30c3ef305f63d

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped...
Antony Sargent [Thu, 8 Mar 2018 19:48:36 +0000 (19:48 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 skipped: fb6a179745 am: 5943908af4  -s ours
am: f224aa6af9  -s ours

Change-Id: I0441b99e9f7b945d41303fdc8d0e412426a081e3

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped...
Antony Sargent [Thu, 8 Mar 2018 19:42:30 +0000 (19:42 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 skipped: fb6a179745
am: 5943908af4  -s ours

Change-Id: I26672d57ced63374a8b03ae3e8e0647c6a4bd150

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 1 Mar 2018 22:23:13 +0000 (14:23 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I22bc99cc231771403dd9be9ec77fa0391e4e874d

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 20 Feb 2018 08:57:01 +0000 (00:57 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1e41ebfa49aad56d5fad9889dcea6f487457400d

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 17 Feb 2018 07:15:09 +0000 (23:15 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ia171cb822fd79c5828a9042873f4b52b6e9c6541

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped...
Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:56 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 skipped: fb6a179745

Change-Id: Ib8ff63887495bec58823610df2bfe993d024bb12

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped...
Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:53 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1

Change-Id: Ife59d44c290cc17fb50bf252e0d5018e694249f4

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped...
Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:50 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1

Change-Id: I2da83a86cf8dce95f26b21c02a426d53f5db5913

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped...
Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:46 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9

Change-Id: I43b0b5ebdb708b53d3df284c3f836bec85e6e028

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped...
Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:44 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff

Change-Id: I789abf6753a183218b5a5b3497a4496d3e3b937c

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped...
Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:40 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861

Change-Id: I999690b501e7fc8fb80b1d0d00b3ea325eef4247

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped...
Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:37 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25

Change-Id: Ib7353cdd97c4da931c3ea3502e40fc72b61c1bb8

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped...
Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:34 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10

Change-Id: I04c83c01dd38c7498fdd7ca4b978bab482172801

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49
Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:27 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49

Change-Id: I99c6271e133bffb2e78ba1fbfbf34a3e819411a7

6 years agoImport translations. DO NOT MERGE
Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]
Import translations. DO NOT MERGE

Merge translations of Bluetooth confirmation text

This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.

Bug: 62672248
Test: manual
Change-Id: I43db31f1495e6873b6905896e6fa75fd88b4cb8d

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 27 Jan 2018 04:56:24 +0000 (20:56 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I2d8c57680d1d98b74193654e9fe77016304f6ac5

6 years agoDO NOT MERGE Add metric log for anomaly.
jackqdyulei [Wed, 25 Oct 2017 17:41:30 +0000 (10:41 -0700)]
DO NOT MERGE Add metric log for anomaly.

This cl creates metric log when anomaly surfaces in battery page or
anomaly dialog.

Each anomaly action contains two fields:
1. FIELD_CONTEXT(int): determine which fragment start this action.
2. FIELD_ANOMALY_ACTION_TYPE(int): determine action type for this
anomaly.

**Cherry-picked from ag/3120176. Fix merge conflict in import part
in AdvancedPowerUsageDetail**

Bug: 68215016
Test: RunSettingsRoboTests
Change-Id: I83761e2a9c206ea7a04f7d031a6961fdab7ca9a0

6 years agoAdd metric id for anomaly fragments.
jackqdyulei [Tue, 24 Oct 2017 01:21:33 +0000 (18:21 -0700)]
Add metric id for anomaly fragments.

1. PowerUsageAnomalyDetails
2. AnomalyDialogFragment

Bug: 37681923
Test: Build

Change-Id: Ia82fde0fa3e61b6284dc18db3018dd223a0e435b
(cherry picked from commit 725562c7484439172dece19c72b5c76943144638)

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 19 Dec 2017 18:24:44 +0000 (18:24 +0000)]
Import translations. DO NOT MERGE
am: 596de5e45c  -s ours

Change-Id: Id2b718512440b8d3703244fc6825bfad8579e8cc

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 19 Dec 2017 04:43:20 +0000 (20:43 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie62b3a6c465b7d0f011cfdc5e51fb3f195ed4306

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 19 Dec 2017 04:37:58 +0000 (20:37 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ib8ace3f2052b60e0623095c5647b9c9c3b2c199c

6 years agoMerge "Import translations. DO NOT MERGE am: 1d6d60f251 -s ours" into oc-mr1-dev
Android Build Merger (Role) [Wed, 13 Dec 2017 13:19:40 +0000 (13:19 +0000)]
Merge "Import translations. DO NOT MERGE am: 1d6d60f251  -s ours" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 13 Dec 2017 13:19:06 +0000 (13:19 +0000)]
Import translations. DO NOT MERGE
am: 1d6d60f251  -s ours

Change-Id: I3a20f9e9061dbaf15f5f61a3f5f0a146c128ff2e

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 13 Dec 2017 00:25:18 +0000 (16:25 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If249fffda6df063fd39ec95e4ba04b412a1ea9e1

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 13 Dec 2017 00:19:14 +0000 (16:19 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I37fb135ddf373093ede9b1d56bf6452ea52ef093

6 years agoMerge "Update the way OMS records details about overlays" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Dec 2017 21:48:17 +0000 (21:48 +0000)]
Merge "Update the way OMS records details about overlays" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 8 Dec 2017 05:52:37 +0000 (05:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 8 Dec 2017 05:39:41 +0000 (05:39 +0000)]
Import translations. DO NOT MERGE
am: 3ed385256a  -s ours

Change-Id: Idb17affa2264a9b46343c3bc9dea1978e5a92a32

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 8 Dec 2017 01:08:40 +0000 (17:08 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I35a94b9a271e88bf4f0384d5619c59661516131d

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 8 Dec 2017 01:08:11 +0000 (17:08 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I59dde21252b7681bb6dfcf9dae1f27192a3cd19e

6 years agoMerge "Update asset for no search result image" into oc-mr1-dev
TreeHugger Robot [Fri, 8 Dec 2017 00:19:09 +0000 (00:19 +0000)]
Merge "Update asset for no search result image" into oc-mr1-dev

6 years agoUpdate the way OMS records details about overlays
Adam Lesinski [Tue, 14 Nov 2017 19:10:08 +0000 (11:10 -0800)]
Update the way OMS records details about overlays

Use flags, since we keep introducing boolean traits which would
be wasteful to encode as booleans.

Bug: 69383160
Test: builds
Change-Id: Ic09ae1086c7afa039b5df11e4c8c968125784586
Merged-In: Ic09ae1086c7afa039b5df11e4c8c968125784586

6 years agoReword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846...
Antony Sargent [Tue, 5 Dec 2017 23:17:11 +0000 (23:17 +0000)]
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1 am: db6e747ab9 am: 26e5f828f7
am: fe20f69e3f

Change-Id: I1d1eb74920d9b191bb7f0365620d0dd1d372b923

6 years agoReword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846...
Antony Sargent [Tue, 5 Dec 2017 23:10:05 +0000 (23:10 +0000)]
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1 am: db6e747ab9
am: 26e5f828f7

Change-Id: Ia88d8014f221c5079ff33f9a10e58c2eed7b329a

6 years agoReword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846...
Antony Sargent [Tue, 5 Dec 2017 17:36:29 +0000 (17:36 +0000)]
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1
am: db6e747ab9

Change-Id: Ibf7cb8c3c7947dbc8cbf019ab32b872756ed7c63

6 years agoReword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846...
Antony Sargent [Tue, 5 Dec 2017 17:32:41 +0000 (17:32 +0000)]
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85
am: acacd658f1

Change-Id: If9851b0b24c020d3a10b197fc15b6777bd88401c

6 years agoReword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846...
Antony Sargent [Tue, 5 Dec 2017 17:28:54 +0000 (17:28 +0000)]
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407
am: 9867a3ef85

Change-Id: Ic9195106304da657092f113817ec7ad86618a2b1

6 years agoReword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846...
Antony Sargent [Tue, 5 Dec 2017 17:26:51 +0000 (17:26 +0000)]
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207
am: 3d7dbd6407

Change-Id: Ifa4509bbabbb346ce581f17d33e3f48fc7014971

6 years agoReword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846...
Antony Sargent [Tue, 5 Dec 2017 17:24:48 +0000 (17:24 +0000)]
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1
am: 24f063a207

Change-Id: I44b42f37a638cda455bbeb3ab4bab5c02fc9c7d9

6 years agoReword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846
Antony Sargent [Tue, 5 Dec 2017 17:21:14 +0000 (17:21 +0000)]
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846
am: 9cf1fc73f1

Change-Id: I4906dc8f97cfcfeef7bfda0896b39c032ef26ec6

6 years agoReword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3
Antony Sargent [Tue, 5 Dec 2017 17:19:12 +0000 (17:19 +0000)]
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3
am: eee62e1846

Change-Id: Ie6fff7cf9df6827a29c04473ed3a0f1332c08ff2

6 years agoReword bluetooth confirmation dialog am: e14d38a383
Antony Sargent [Tue, 5 Dec 2017 17:17:08 +0000 (17:17 +0000)]
Reword bluetooth confirmation dialog am: e14d38a383
am: b2b401b5f3

Change-Id: I21921d41d35a87a48ad627e9889e4d00219e912b

6 years agoReword bluetooth confirmation dialog
Antony Sargent [Tue, 5 Dec 2017 17:13:36 +0000 (17:13 +0000)]
Reword bluetooth confirmation dialog
am: e14d38a383

Change-Id: Ibb19504f6a74015a2a4d25d5c268db975da4ebb5

6 years agoMerge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev
TreeHugger Robot [Sun, 3 Dec 2017 03:20:19 +0000 (03:20 +0000)]
Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev

* changes:
  Settings: Remove HAL HDR+ option
  Revert "Revert "Settings: Enable HAL HDR+ by default""

6 years agoFix BluetoothPairingDialogTest to not expect device name am: f20e0a492b
Antony Sargent [Fri, 1 Dec 2017 21:23:59 +0000 (21:23 +0000)]
Fix BluetoothPairingDialogTest to not expect device name am: f20e0a492b
am: 0ceadf9fb8

Change-Id: I2d48521b73bb75fbbc92c54ff353ec491397f81c

6 years agoFix BluetoothPairingDialogTest to not expect device name
Antony Sargent [Fri, 1 Dec 2017 21:21:38 +0000 (21:21 +0000)]
Fix BluetoothPairingDialogTest to not expect device name
am: f20e0a492b

Change-Id: I4a74ac865db27415b232b0f460b058344adcc0ce

6 years agoSettings: Remove HAL HDR+ option
Chien-Yu Chen [Fri, 10 Nov 2017 21:51:24 +0000 (13:51 -0800)]
Settings: Remove HAL HDR+ option

Test: RunSettingsRoboTests
Bug: 68223991
Merged-In: I9eb27c7e205ac005c6a71726e125ed1e512da33b
Change-Id: I9eb27c7e205ac005c6a71726e125ed1e512da33b

6 years agoRevert "Revert "Settings: Enable HAL HDR+ by default""
Chien-Yu Chen [Tue, 10 Oct 2017 18:36:57 +0000 (11:36 -0700)]
Revert "Revert "Settings: Enable HAL HDR+ by default""

This reverts commit 781e762c2c68027c6b4bf8bcb71979c5e8c595c3.

Test: CTS
Bug: 67590972
Change-Id: I3c1459e432df10d075072e531ef6fc65e3ae4f24
Merged-In: I3c1459e432df10d075072e531ef6fc65e3ae4f24

6 years agoUpdate asset for no search result image
Fan Zhang [Wed, 29 Nov 2017 18:53:37 +0000 (10:53 -0800)]
Update asset for no search result image

Bug: 68863351
Test: visual
Change-Id: Ia4d411e5d7d1db8b321fdfde006a93c6ff52ecb3
(cherry picked from commit cb721bd870f73af7e156076f5fe57314436a5312)

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 26 Nov 2017 23:02:14 +0000 (23:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 26 Nov 2017 22:49:49 +0000 (22:49 +0000)]
Import translations. DO NOT MERGE
am: 9ae05458f0  -s ours

Change-Id: I829586defb2cf0da3395bc8eb41ae243faf02173

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 26 Nov 2017 20:19:05 +0000 (12:19 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I970b01d5df730bd739ef0ad5a40d28916bf53b02

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 26 Nov 2017 20:15:58 +0000 (12:15 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ibfb674f157b342ea77c07cd88c47dc25b2fcd03e

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 20 Nov 2017 22:46:59 +0000 (22:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Mon, 20 Nov 2017 22:31:36 +0000 (22:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: ae351b3266  -s ours

Change-Id: I7004ff8745bf3ecbb1e947d5c064cca955f9e35e

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Mon, 20 Nov 2017 22:20:05 +0000 (22:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 20 Nov 2017 19:40:38 +0000 (11:40 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ic55e0c95b19c299b290f9f22b935b0e553917264

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 20 Nov 2017 19:39:36 +0000 (11:39 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id4c5ecbe846aca0a08b60c7a08d548cbae3458b1

6 years agoReword bluetooth confirmation dialog
Antony Sargent [Wed, 6 Sep 2017 23:15:59 +0000 (16:15 -0700)]
Reword bluetooth confirmation dialog

Changing the text near the checkbox allowing contacts/call history
access from "Allow $device_name to access your contacts and call
history" to just "Allow access to your contacts and call history" to
avoid problem where a properly crafted remote device name can make the
"to access your contacts and call history" text get pushed down below
the fold, and mislead users into thinking the checkbox has a different
meaning.

Bug: 62672248
Test: manual (initiate bluetooth pairing with another phone or a
computer, observe pairing dialog text)

Change-Id: I770852739f6791c2b9a36ab45c526bab3f3b9be1

6 years agoFix BluetoothPairingDialogTest to not expect device name
Antony Sargent [Thu, 7 Sep 2017 18:46:58 +0000 (11:46 -0700)]
Fix BluetoothPairingDialogTest to not expect device name

The functional fix for b/62672248 in ag/2856166 removes the device name
from the text near the checkbox in the bluetooth pairing dialog, so we
need to stop checking for it in this robotest. However, that functional
fix needs to be in a separate CL from this fix for the robotest, because
the robotest doesn't exist on some of the older branches where the
functional fix needs to be backported.

Bug: 62672248
Test: RunSettingsRoboTests
Change-Id: I17ff3e4f13c20d58cc4027557f275d296ecccc95

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 15 Nov 2017 03:37:20 +0000 (03:37 +0000)]
Import translations. DO NOT MERGE
am: fbdea47c44  -s ours

Change-Id: I791dd2ed3d53ac4230748c61169677190e143919

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 14 Nov 2017 20:42:27 +0000 (12:42 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I72e5c29e7cd17ed3ee1ae77677b74ca287baa241

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 14 Nov 2017 20:38:18 +0000 (12:38 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ic67e156508ed64a3ae1f26c095f72929f29e9b63

6 years agoEnforce null check for mAccessPoint
Ningyuan Wang [Fri, 3 Nov 2017 18:16:56 +0000 (11:16 -0700)]
Enforce null check for mAccessPoint

mAccessPoint == null implies this is a new network.
In this case, we don't need to check if it's a carrier AP.

Bug: 68846574
Test: compile, manually test that crash does not happen again.
Test: make RunSettingsRoboTests -j40 aROBOTEST_FILTER=WifiConfigControllerTest

Change-Id: I03b1da5e8f0b8e4270c0c52c67bbc90c999be078
(cherry picked from commit 0117b995f44758a64b7af6d2d11e17d10ef125ce)

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Tue, 7 Nov 2017 09:41:30 +0000 (09:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 7 Nov 2017 09:33:26 +0000 (09:33 +0000)]
Import translations. DO NOT MERGE
am: 73120a4cdb  -s ours

Change-Id: Ida543e80dd13e3b5653c8676fe3032d5693a224d

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 7 Nov 2017 07:21:01 +0000 (23:21 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I16dfb5a1bbcd9d062c9f24914c0715c5f0cfe95e

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 7 Nov 2017 07:20:38 +0000 (23:20 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I5e47736d365f0c8e75ec8e9ac0c84d599fbf7180

6 years agoMerge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c...
Fan Zhang [Fri, 3 Nov 2017 00:42:12 +0000 (00:42 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414  -s ours am: b17703e871  -s ours am: 1de093b1a1  -s ours am: 5f02135c42  -s ours am: 7690482014  -s ours am: dbbcf65c96  -s ours am: e6a8f354fc  -s ours am: 3c19043e9c  -s ours am: d15a81f882  -s ours am: e981e0b855  -s ours am: ef61a45cf6  -s ours
am: 5af580a419  -s ours

Change-Id: I83bbad093fdcf90649ce39efbd9783a584d2b7c1

6 years agoMerge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c...
Fan Zhang [Fri, 3 Nov 2017 00:40:07 +0000 (00:40 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414  -s ours am: b17703e871  -s ours am: 1de093b1a1  -s ours am: 5f02135c42  -s ours am: 7690482014  -s ours am: dbbcf65c96  -s ours am: e6a8f354fc  -s ours am: 3c19043e9c  -s ours am: d15a81f882  -s ours am: e981e0b855  -s ours
am: ef61a45cf6  -s ours

Change-Id: If9d124cc6a362a152345a04e0748cd71c6fac42a

6 years agoMerge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c...
Fan Zhang [Fri, 3 Nov 2017 00:38:04 +0000 (00:38 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414  -s ours am: b17703e871  -s ours am: 1de093b1a1  -s ours am: 5f02135c42  -s ours am: 7690482014  -s ours am: dbbcf65c96  -s ours am: e6a8f354fc  -s ours am: 3c19043e9c  -s ours am: d15a81f882  -s ours
am: e981e0b855  -s ours

Change-Id: I32df0f311eca598b6b6969f288b258f65e43ae49

6 years agoMerge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c...
Fan Zhang [Fri, 3 Nov 2017 00:34:29 +0000 (00:34 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414  -s ours am: b17703e871  -s ours am: 1de093b1a1  -s ours am: 5f02135c42  -s ours am: 7690482014  -s ours am: dbbcf65c96  -s ours am: e6a8f354fc  -s ours am: 3c19043e9c  -s ours
am: d15a81f882  -s ours

Change-Id: I937296351e0da23f441dab7c0403b1d59d78a016

6 years agoMerge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c...
Fan Zhang [Fri, 3 Nov 2017 00:31:01 +0000 (00:31 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414  -s ours am: b17703e871  -s ours am: 1de093b1a1  -s ours am: 5f02135c42  -s ours am: 7690482014  -s ours am: dbbcf65c96  -s ours am: e6a8f354fc  -s ours
am: 3c19043e9c  -s ours

Change-Id: I6e25fc7111d4ec534d0588100e1dd6ce2ced5ee1

6 years agoMerge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c...
Fan Zhang [Fri, 3 Nov 2017 00:28:34 +0000 (00:28 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414  -s ours am: b17703e871  -s ours am: 1de093b1a1  -s ours am: 5f02135c42  -s ours am: 7690482014  -s ours am: dbbcf65c96  -s ours
am: e6a8f354fc  -s ours

Change-Id: I4ea4b1a122429accdaede04201d88f16286fa4da

6 years agoMerge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c...
Fan Zhang [Fri, 3 Nov 2017 00:26:03 +0000 (00:26 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414  -s ours am: b17703e871  -s ours am: 1de093b1a1  -s ours am: 5f02135c42  -s ours am: 7690482014  -s ours
am: dbbcf65c96  -s ours

Change-Id: Ia7d6e53337a1b0225e8917542fa5ae9d092b1ebf

6 years agoMerge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c...
Fan Zhang [Fri, 3 Nov 2017 00:22:09 +0000 (00:22 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414  -s ours am: b17703e871  -s ours am: 1de093b1a1  -s ours am: 5f02135c42  -s ours
am: 7690482014  -s ours

Change-Id: Ia8925895580e9e010bee69ae638272ec7a9bad1a

6 years agoMerge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c...
Fan Zhang [Fri, 3 Nov 2017 00:19:51 +0000 (00:19 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414  -s ours am: b17703e871  -s ours am: 1de093b1a1  -s ours
am: 5f02135c42  -s ours

Change-Id: I97a7ff922ca6aed7f99bce5f15f104b6b7ce8411

6 years agoMerge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c...
Fan Zhang [Fri, 3 Nov 2017 00:17:43 +0000 (00:17 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414  -s ours am: b17703e871  -s ours
am: 1de093b1a1  -s ours

Change-Id: Ia56b40b2d0de2d993a46970d5cf1e63c8e47cd81

6 years agoMerge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c...
Fan Zhang [Fri, 3 Nov 2017 00:15:15 +0000 (00:15 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414  -s ours
am: b17703e871  -s ours

Change-Id: I17c1cacc0a068c4d79e4cf568152607c3e13c4c4