PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,124 Commits 1 Branch 0 Tags
674371cde0f2fa61a6e1f48d9af1235e7b0b8d79
Commit Graph

28124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atanas Kirilov
674371cde0 Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into cw-f-dev 
* changes:
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:25:15 +00:00
Atanas Kirilov
ec357c4782 Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into cw-f-dev 
* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:24:37 +00:00
Atanas Kirilov
c202a94028 Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into cw-f-dev 
* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:24:25 +00:00
Android Build Merger (Role)
b176eaa85e [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa 
Change-Id: I0d88fc2ba7016327ab0ebbe05b016c4585ee965f
 2018-06-04 17:23:08 +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)
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)
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
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
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
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)
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)
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
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
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