PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,842 Commits 1 Branch 0 Tags
fd058ab872d41b469e4da2d9b261dd2c9d1dffe0
Commit Graph

37842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hansong Zhang
e36ca3e96d DO NOT MERGE Give PBAP permission only after user confirms 
Bug: 72872376
Test: manual
Change-Id: I9617e3c10bf19e22f9a8f172332a83bbbebaf4a4
 2018-05-18 17:31:42 -07:00
Android Build Merger (Role)
3d99dc7e7d [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 skipped: 8bc91c3b8b skipped: 3e48235bf6 
Change-Id: Iea466a1bb688d8ff74cbb6cf964fbd7205705960
 2018-05-02 22:37:16 +00:00
Android Build Merger (Role)
3e48235bf6 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 skipped: 8bc91c3b8b 
Change-Id: I5beeaa99ef0cafa7ac716dc0745c90855954dc60
 2018-05-02 22:37:15 +00:00
Android Build Merger (Role)
8bc91c3b8b [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 
Change-Id: Ie0c9a58d5b24ae22fa183f656c2378fa957da7c1
 2018-05-02 22:37:13 +00:00
Android Build Merger (Role)
2d1bae1bd8 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e 
Change-Id: Ie28e68f8334f8e6e74241c25b522bb64a16e3f1b
 2018-05-02 22:37:12 +00:00
Android Build Merger (Role)
ba2ea1e53e [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 
Change-Id: Ibb7ba4f78bb2ff73ddde61bf4fb57ef2997517b0
 2018-05-02 22:37:10 +00:00
Android Build Merger (Role)
4a82795313 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 
Change-Id: I552259236b2aef72e2b50441943e6b413fdd3ab7
 2018-05-02 22:37:02 +00:00
Antony Sargent
3f8d33ff71 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: Id393c4296efef03f38b6e55396c83da9dd9c8b4c
 2018-05-02 15:32:36 -07:00
Antony Sargent
7d505aefa5 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: Ia386cc2d98de086ed545e4fe6d41be20e9c24dc4
 2018-05-02 14:07:34 -07:00
Hansong Zhang
3f2dbb7cc9 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev 
am: d59b0eddae

Change-Id: Ia628cc0bd02429ec321d8e80c9d9ad2c097715bd
 2018-04-09 13:44:07 -07:00
Hansong Zhang
1b7566cd07 [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
 2018-04-09 13:43:04 -07:00
TreeHugger Robot
6a668c5630 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into nyc-mr2-dev 
* changes:
  [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
 2018-04-09 20:29:54 +00:00
TreeHugger Robot
70643c1bf4 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into cw-f-dev 
* changes:
  [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
 2018-04-09 20:29:54 +00:00
TreeHugger Robot
d59b0eddae 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
 2018-04-09 20:29:54 +00:00
TreeHugger Robot
8e2a3b1813 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into nyc-mr1-dev 
* changes:
  [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
 2018-04-09 20:29:54 +00:00
TreeHugger Robot
6b6d337610 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into nyc-dr1-dev 
* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa
  DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
 2018-04-09 20:29:54 +00:00
TreeHugger Robot
eeafbd8d60 Merge "DO NOT MERGE Fix unexpected behavior in Bluetooth pairing" into nyc-dev 2018-04-09 20:29:54 +00:00
Android Build Merger (Role)
1990791bfe [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617 skipped: b1f00ebf9c 
Change-Id: I4f02817d60b302e068caadd21ef4555f5f7d9221
 2018-04-02 17:48:50 +00:00
Android Build Merger (Role)
b1f00ebf9c [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617 
Change-Id: I23c3c75844ff136521f67f94d4d911a44571ae07
 2018-04-02 17:48:48 +00:00
Android Build Merger (Role)
7b2b84c617 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 
Change-Id: I3fdb63225079954bace095dc0ddfd78deb372ff8
 2018-04-02 17:48:47 +00:00
Android Build Merger (Role)
ee220e0238 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc 
Change-Id: I5b600093709bf93bb64ccacddeaa3cdf0b470107
 2018-04-02 17:48:45 +00:00
Android Build Merger (Role)
e25ebddfdc [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa 
Change-Id: Ibaab24729318954dbce44f3ccf53fcb4180ac1c7
 2018-04-02 17:48:43 +00:00
Hansong Zhang
4f58c19afa 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
 2018-04-02 10:48:18 -07:00
Android Build Merger (Role)
c4127072f4 [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
 2018-04-02 17:45:11 +00:00
Android Build Merger (Role)
74ff24d1c6 [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
 2018-04-02 17:45:10 +00:00
Android Build Merger (Role)
41be25548e [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
 2018-04-02 17:45:08 +00:00
Android Build Merger (Role)
84061c71d1 [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
 2018-04-02 17:45:07 +00:00
Android Build Merger (Role)
bab8dca667 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 
Change-Id: I501c5e16642ce2bddb0c5c5e2ed6e0b84fc34029
 2018-04-02 17:45:05 +00:00
Android Build Merger (Role)
5d27bdb6d2 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 
Change-Id: Idf0afa49507f8ead25fd1b59809064f058281076
 2018-04-02 17:45:03 +00:00
Android Build Merger (Role)
d276b38666 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 
Change-Id: I69b00aebae95532bf9fe51191b14e12d8948b0bf
 2018-04-02 17:45:02 +00:00
Android Build Merger (Role)
dfe4cc74f7 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 
Change-Id: I7c2952f8540db9ee15ceac73bf1a0d73652f5163
 2018-04-02 17:45:00 +00:00
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
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
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
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
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
3ed385256a Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I35a94b9a271e88bf4f0384d5619c59661516131d
 2017-12-07 17:08:40 -08: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