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)
b9aa0fbfe9 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead 
Change-Id: I164f89c547721b6b02fcd2bf57b224c92816e25b
 2018-05-24 18:22:35 +00:00
Android Build Merger (Role)
30d0145ead [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e 
Change-Id: I72e34eb278333a310cab6845c79f55df50478860
 2018-05-24 18:22:34 +00:00
Android Build Merger (Role)
93ee1bd17e [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f 
Change-Id: Ic7873dae0f097a546b250ebcb96cf88a437e1173
 2018-05-24 18:22:33 +00:00
Android Build Merger (Role)
551be9a85f [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f 
Change-Id: Ibb61117b7475504a756dafece07c5d79eba0f73f
 2018-05-24 18:22:32 +00:00
Android Build Merger (Role)
874c51780f [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 
Change-Id: Ieb0dfe22926f14109466bd00c9cac9ccaa04e057
 2018-05-24 18:22:30 +00:00
Android Build Merger (Role)
cb66517282 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 
Change-Id: I2b731c3a29f4fde5a672c9224008e7be7e460b72
 2018-05-24 18:22:29 +00:00
Android Build Merger (Role)
5b4de5e724 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d 
Change-Id: I1ba9495afe9e105926ad407442d732f2c6e92cf5
 2018-05-24 18:22:19 +00:00
Antony Sargent
e0eeafcb5d 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: Iab08b43768f0aedd690570eb59dcb71c14c04784
 2018-05-23 18:02:36 +00:00
Android Build Merger (Role)
6351f90219 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 732b65ca4d 
Change-Id: I89bf7eb803969f28afc67c2c2073b6169131c3fe
 2018-05-21 22:49:17 +00:00
Antony Sargent
732b65ca4d 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: I829baada46cdb2314021d8772feb8811072e41d8
 2018-05-21 15:14:25 -07:00
Android Build Merger (Role)
108cb3edaa [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a 
Change-Id: I8bb2f283f86210447788c3191b67c1936e7b0a72
 2018-05-21 22:05:41 +00:00
Antony Sargent
a0b8f3fe3a 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: I049138002f07e78442ddebfa746d6128b5689947
 2018-05-21 14:43:18 -07:00
Android Build Merger (Role)
81573c9301 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2 skipped: c874b450af 
Change-Id: I9d42278f5f9dae38dacf16012b242c6dd9b5abb2
 2018-05-21 21:00:05 +00:00
Android Build Merger (Role)
c874b450af [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2 
Change-Id: Iacafdefee68a900d636db83ccbf764114327a805
 2018-05-21 21:00:04 +00:00
Android Build Merger (Role)
e9345782e2 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 
Change-Id: Ia02c7c5d5e52abcd2ecfbf0d9399efad31c3575e
 2018-05-21 21:00:03 +00:00
Android Build Merger (Role)
7304aaf293 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf 
Change-Id: I1fa52208a183a67c694c9457bb304f94c1a05ec1
 2018-05-21 21:00:01 +00:00
Android Build Merger (Role)
ed423eadcf [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 
Change-Id: Ic63f7f831df3111a5ce1cda7759e760563ea574d
 2018-05-21 20:59:52 +00:00
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
e934ea80a6 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am: d59b0eddae 
am: 3f2dbb7cc9

Change-Id: Ica684d7a7fc36439111b7eeb3886761f63a7130f
 2018-04-09 13:54:58 -07:00
Hansong Zhang
af077f8d4c [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
 2018-04-09 13:53:41 -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