PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,428 Commits 1 Branch 0 Tags
306ff7e3a9897a28bd2e27225907d9a72de72b6c
Commit Graph

39428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
5b98c9f4a3 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 
Change-Id: Id8ac4a63bd63d0a219364b520211ebae5ad6ea62
 2018-04-02 17:44:58 +00:00
Hansong Zhang
ac6c49d2b0 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
 2018-04-02 10:44:38 -07:00
Antony Sargent
086df75f9a [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
 2018-03-08 19:48:36 +00:00
Antony Sargent
f224aa6af9 [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
 2018-03-08 19:42:30 +00:00
Bill Yi
509d7bbc5d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I22bc99cc231771403dd9be9ec77fa0391e4e874d
 2018-03-01 14:23:13 -08:00
Bill Yi
3b4a3e0a0f Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1e41ebfa49aad56d5fad9889dcea6f487457400d
 2018-02-20 00:57:01 -08:00
Bill Yi
27f30d2f46 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ia171cb822fd79c5828a9042873f4b52b6e9c6541
 2018-02-16 23:15:09 -08:00
Android Build Merger (Role)
5943908af4 [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
 2018-02-13 00:43:56 +00:00
Android Build Merger (Role)
fb6a179745 [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
 2018-02-13 00:43:53 +00:00
Android Build Merger (Role)
ca801490c1 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 
Change-Id: I2da83a86cf8dce95f26b21c02a426d53f5db5913
 2018-02-13 00:43:50 +00:00
Android Build Merger (Role)
6827142bd1 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 
Change-Id: I43b0b5ebdb708b53d3df284c3f836bec85e6e028
 2018-02-13 00:43:46 +00:00
Android Build Merger (Role)
ddd9cb6be9 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff 
Change-Id: I789abf6753a183218b5a5b3497a4496d3e3b937c
 2018-02-13 00:43:44 +00:00
Android Build Merger (Role)
5755ec9bff [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 
Change-Id: I999690b501e7fc8fb80b1d0d00b3ea325eef4247
 2018-02-13 00:43:40 +00:00
Android Build Merger (Role)
eb76bf9861 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 
Change-Id: Ib7353cdd97c4da931c3ea3502e40fc72b61c1bb8
 2018-02-13 00:43:37 +00:00
Android Build Merger (Role)
59ab695e25 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 
Change-Id: I04c83c01dd38c7498fdd7ca4b978bab482172801
 2018-02-13 00:43:34 +00:00
Android Build Merger (Role)
d923718d10 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 
Change-Id: I99c6271e133bffb2e78ba1fbfbf34a3e819411a7
 2018-02-13 00:43:27 +00:00
Antony Sargent
0a7ae11c49 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
 2018-02-13 00:43:21 +00:00
Bill Yi
31abbee452 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I2d8c57680d1d98b74193654e9fe77016304f6ac5
 2018-01-26 20:56:24 -08:00
jackqdyulei
adf11594d3 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
 2018-01-11 14:52:48 -08:00
jackqdyulei
2fd1c9839c Add metric id for anomaly fragments. 
1. PowerUsageAnomalyDetails
2. AnomalyDialogFragment

Bug: 37681923
Test: Build

Change-Id: Ia82fde0fa3e61b6284dc18db3018dd223a0e435b
(cherry picked from commit 725562c748)
 2018-01-10 03:10:28 +00:00
Bill Yi
1f229d3710 Import translations. DO NOT MERGE 
am: 596de5e45c  -s ours

Change-Id: Id2b718512440b8d3703244fc6825bfad8579e8cc
 2017-12-19 18:24:44 +00:00
Bill Yi
596de5e45c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie62b3a6c465b7d0f011cfdc5e51fb3f195ed4306
 2017-12-18 20:43:20 -08:00
Bill Yi
1e9183e0c0 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ib8ace3f2052b60e0623095c5647b9c9c3b2c199c
 2017-12-18 20:37:58 -08:00
Android Build Merger (Role)
ad44ea442b Merge "Import translations. DO NOT MERGE am: 1d6d60f251 -s ours" into oc-mr1-dev 2017-12-13 13:19:40 +00:00
Bill Yi
ae0da91c1c Import translations. DO NOT MERGE 
am: 1d6d60f251  -s ours

Change-Id: I3a20f9e9061dbaf15f5f61a3f5f0a146c128ff2e
 2017-12-13 13:19:06 +00:00
Bill Yi
1d6d60f251 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If249fffda6df063fd39ec95e4ba04b412a1ea9e1
 2017-12-12 16:25:18 -08:00
Bill Yi
e30af484ff Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I37fb135ddf373093ede9b1d56bf6452ea52ef093
 2017-12-12 16:19:14 -08:00
TreeHugger Robot
15b42b89b8 Merge "Update the way OMS records details about overlays" into oc-mr1-dev 2017-12-12 21:48:17 +00:00
TreeHugger Robot
814fb3b7a1 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-12-08 05:52:37 +00:00
Bill Yi
14c47203b3 Import translations. DO NOT MERGE 
am: 3ed385256a  -s ours

Change-Id: Idb17affa2264a9b46343c3bc9dea1978e5a92a32
 2017-12-08 05:39:41 +00:00
Bill Yi
3ed385256a Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I35a94b9a271e88bf4f0384d5619c59661516131d
 2017-12-07 17:08:40 -08:00
Bill Yi
3ea52be26d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I59dde21252b7681bb6dfcf9dae1f27192a3cd19e
 2017-12-07 17:08:11 -08:00
TreeHugger Robot
afa1efabad Merge "Update asset for no search result image" into oc-mr1-dev 2017-12-08 00:19:09 +00:00
Adam Lesinski
9e19121a00 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
 2017-12-07 19:40:19 +00:00
Antony Sargent
51950965e9 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
 2017-12-05 23:17:11 +00:00
Antony Sargent
fe20f69e3f 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
 2017-12-05 23:10:05 +00:00
Antony Sargent
26e5f828f7 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
 2017-12-05 17:36:29 +00:00
Antony Sargent
db6e747ab9 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 
am: acacd658f1

Change-Id: If9851b0b24c020d3a10b197fc15b6777bd88401c
 2017-12-05 17:32:41 +00:00
Antony Sargent
acacd658f1 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 
am: 9867a3ef85

Change-Id: Ic9195106304da657092f113817ec7ad86618a2b1
 2017-12-05 17:28:54 +00:00
Antony Sargent
9867a3ef85 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 
am: 3d7dbd6407

Change-Id: Ifa4509bbabbb346ce581f17d33e3f48fc7014971
 2017-12-05 17:26:51 +00:00
Antony Sargent
3d7dbd6407 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 
am: 24f063a207

Change-Id: I44b42f37a638cda455bbeb3ab4bab5c02fc9c7d9
 2017-12-05 17:24:48 +00:00
Antony Sargent
24f063a207 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 
am: 9cf1fc73f1

Change-Id: I4906dc8f97cfcfeef7bfda0896b39c032ef26ec6
 2017-12-05 17:21:14 +00:00
Antony Sargent
9cf1fc73f1 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 
am: eee62e1846

Change-Id: Ie6fff7cf9df6827a29c04473ed3a0f1332c08ff2
 2017-12-05 17:19:12 +00:00
Antony Sargent
eee62e1846 Reword bluetooth confirmation dialog am: e14d38a383 
am: b2b401b5f3

Change-Id: I21921d41d35a87a48ad627e9889e4d00219e912b
 2017-12-05 17:17:08 +00:00
Antony Sargent
b2b401b5f3 Reword bluetooth confirmation dialog 
am: e14d38a383

Change-Id: Ibb19504f6a74015a2a4d25d5c268db975da4ebb5
 2017-12-05 17:13:36 +00:00
TreeHugger Robot
fa3af7b0e7 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""
 2017-12-03 03:20:19 +00:00
Antony Sargent
4b47184df3 Fix BluetoothPairingDialogTest to not expect device name am: f20e0a492b 
am: 0ceadf9fb8

Change-Id: I2d48521b73bb75fbbc92c54ff353ec491397f81c
 2017-12-01 21:23:59 +00:00
Antony Sargent
0ceadf9fb8 Fix BluetoothPairingDialogTest to not expect device name 
am: f20e0a492b

Change-Id: I4a74ac865db27415b232b0f460b058344adcc0ce
 2017-12-01 21:21:38 +00:00
Chien-Yu Chen
7bae205499 Settings: Remove HAL HDR+ option 
Test: RunSettingsRoboTests
Bug: 68223991
Merged-In: I9eb27c7e205ac005c6a71726e125ed1e512da33b
Change-Id: I9eb27c7e205ac005c6a71726e125ed1e512da33b
 2017-12-01 08:11:56 -08:00
Chien-Yu Chen
24721e7d96 Revert "Revert "Settings: Enable HAL HDR+ by default"" 
This reverts commit 781e762c2c.

Test: CTS
Bug: 67590972
Change-Id: I3c1459e432df10d075072e531ef6fc65e3ae4f24
Merged-In: I3c1459e432df10d075072e531ef6fc65e3ae4f24
 2017-12-01 08:11:44 -08:00