git.osdn.net Git - android-x86/packages-apps-Settings.git/log

OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Raff Tsai [Fri, 8 Mar 2019 08:19:30 +0000 (16:19 +0800)]

Do not allow draw on top for App notification settings

Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f0b8e01e5f595bd60edc594eef58aba)

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:39 +0000 (21:54 +0000)]

[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837

Change-Id: I16c54cab9346d161d668dc4183ae4a9eb7117996

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:37 +0000 (21:54 +0000)]

[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114

Change-Id: I9212ffd96f974268c0069e80e68347102967e7e5

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:34 +0000 (21:54 +0000)]

[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f

Change-Id: Ic6e4308ee65a83e7d00801452323569301e65d66

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:31 +0000 (21:54 +0000)]

[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49

Change-Id: I9466105a6de960efb4513d4e856450459aec2560

commit | commitdiff | tree

Fan Zhang [Fri, 15 Feb 2019 00:07:37 +0000 (16:07 -0800)]

Do not allow draw on top for default sms picker.

Fixes: 120484087
Test: manual
Change-Id: I4be265565678302fad207839216d5cd65dcb6e94
Merged-In: I4be265565678302fad207839216d5cd65dcb6e94
(cherry picked from commit 9d46e1fdfe1b70618c5a92c3e3461a4b379db236)

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 Aug 2018 18:43:34 +0000 (18:43 +0000)]

Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f
  DO NOT MERGE Disable changing lock when device is not provisioned.

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 Aug 2018 18:43:34 +0000 (18:43 +0000)]

Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into cw-f-dev

* changes:
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f
DO NOT MERGE Disable changing lock when device is not provisioned.

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 Aug 2018 18:43:34 +0000 (18:43 +0000)]

Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into nyc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 Aug 2018 18:34:12 +0000 (18:34 +0000)]

Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5
  DO NOT MERGE Disable changing lock when device is not provisioned.

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 3 Aug 2018 21:04:09 +0000 (21:04 +0000)]

[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6

Change-Id: I9c1ba2599a78d6518531a2bff2b899eecb3b6554

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 3 Aug 2018 21:04:08 +0000 (21:04 +0000)]

[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4

Change-Id: Ic801ec29d08cf8600e3f04cd9b311d6fbbb315a8

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 3 Aug 2018 21:04:06 +0000 (21:04 +0000)]

[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011

Change-Id: If73d439ccad4d5a317de59de48427e6f406f1fa2

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 3 Aug 2018 21:04:04 +0000 (21:04 +0000)]

[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5

Change-Id: I8b74b9105db55d8b8cdb3f7bc7b8b42ee9998de8

commit | commitdiff | tree

Doris Ling [Thu, 2 Aug 2018 00:24:34 +0000 (17:24 -0700)]

DO NOT MERGE Disable changing lock when device is not provisioned.

When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 3 Aug 2018 01:03:02 +0000 (01:03 +0000)]

[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7

Change-Id: I67d4821190d4a6283a54a23a087984b9ca18063f

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 3 Aug 2018 01:03:00 +0000 (01:03 +0000)]

[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f

Change-Id: If3f680b663909bd4e40b3e9033fed9cd0c8f537a

commit | commitdiff | tree

Doris Ling [Thu, 2 Aug 2018 00:24:34 +0000 (17:24 -0700)]

DO NOT MERGE Disable changing lock when device is not provisioned.

When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- set display search menu to false
- disallow update to display the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2

commit | commitdiff | tree

Doris Ling [Thu, 2 Aug 2018 00:24:34 +0000 (17:24 -0700)]

DO NOT MERGE Disable changing lock when device is not provisioned.

When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- set display search menu to false
- disallow update to display the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 20:25:15 +0000 (20:25 +0000)]

Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into nyc-mr2-dev

* changes:
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e
  [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

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 20:25:15 +0000 (20:25 +0000)]

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

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 20:25:15 +0000 (20:25 +0000)]

Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into nyc-mr1-dev

* changes:
[automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a
Merge translations of Bluetooth confirmation text

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 20:25:15 +0000 (20:25 +0000)]

Merge "Merge translations of Bluetooth confirmation text" into nyc-dr1-dev

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 20:24:37 +0000 (20:24 +0000)]

Merge "Merge translations of Bluetooth confirmation text" into nyc-dev

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 20:24:37 +0000 (20:24 +0000)]

Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into nyc-mr2-dev

* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2
  [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

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 20:24:37 +0000 (20:24 +0000)]

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

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 20:24:37 +0000 (20:24 +0000)]

Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into nyc-mr1-dev

* changes:
  [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

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 20:24:37 +0000 (20:24 +0000)]

Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into nyc-dr1-dev

* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
Merge translations of Bluetooth confirmation text

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 20:24:35 +0000 (20:24 +0000)]

Merge "Merge translations of Bluetooth confirmation text" into nyc-mr2-dev

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)]

Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into nyc-dev

* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71
Merge translations of Bluetooth confirmation text

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)]

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

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)]

Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into nyc-mr1-dev

* changes:
  [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

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)]

Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into nyc-dr1-dev

* changes:
  [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

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)]

Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into nyc-mr2-dev

* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 skipped: 8bc91c3b8b
  [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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 4 Jun 2018 17:23:16 +0000 (17:23 +0000)]

[automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e

Change-Id: Ib1f576348a4e89028ddb3d731ecdc1c92599723d

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 4 Jun 2018 17:23:08 +0000 (17:23 +0000)]

[automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa

Change-Id: I0d88fc2ba7016327ab0ebbe05b016c4585ee965f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 24 May 2018 18:22:35 +0000 (18:22 +0000)]

[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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 24 May 2018 18:22:34 +0000 (18:22 +0000)]

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e

Change-Id: I72e34eb278333a310cab6845c79f55df50478860

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 24 May 2018 18:22:33 +0000 (18:22 +0000)]

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f

Change-Id: Ic7873dae0f097a546b250ebcb96cf88a437e1173

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 24 May 2018 18:22:32 +0000 (18:22 +0000)]

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f

Change-Id: Ibb61117b7475504a756dafece07c5d79eba0f73f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 24 May 2018 18:22:30 +0000 (18:22 +0000)]

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282

Change-Id: Ieb0dfe22926f14109466bd00c9cac9ccaa04e057

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 24 May 2018 18:22:29 +0000 (18:22 +0000)]

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724

Change-Id: I2b731c3a29f4fde5a672c9224008e7be7e460b72

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 24 May 2018 18:22:19 +0000 (18:22 +0000)]

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d

Change-Id: I1ba9495afe9e105926ad407442d732f2c6e92cf5

commit | commitdiff | tree

Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]

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

commit | commitdiff | tree

Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 21 May 2018 22:05:41 +0000 (22:05 +0000)]

[automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a

Change-Id: I8bb2f283f86210447788c3191b67c1936e7b0a72

commit | commitdiff | tree

Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 21 May 2018 21:00:04 +0000 (21:00 +0000)]

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2

Change-Id: Iacafdefee68a900d636db83ccbf764114327a805

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 21 May 2018 21:00:03 +0000 (21:00 +0000)]

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293

Change-Id: Ia02c7c5d5e52abcd2ecfbf0d9399efad31c3575e

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 21 May 2018 21:00:01 +0000 (21:00 +0000)]

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf

Change-Id: I1fa52208a183a67c694c9457bb304f94c1a05ec1

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 21 May 2018 20:59:52 +0000 (20:59 +0000)]

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5

Change-Id: Ic63f7f831df3111a5ce1cda7759e760563ea574d

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 May 2018 22:37:15 +0000 (22:37 +0000)]

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 skipped: 8bc91c3b8b

Change-Id: I5beeaa99ef0cafa7ac716dc0745c90855954dc60

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 May 2018 22:37:13 +0000 (22:37 +0000)]

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8

Change-Id: Ie0c9a58d5b24ae22fa183f656c2378fa957da7c1

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 May 2018 22:37:12 +0000 (22:37 +0000)]

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e

Change-Id: Ie28e68f8334f8e6e74241c25b522bb64a16e3f1b

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 May 2018 22:37:10 +0000 (22:37 +0000)]

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313

Change-Id: Ibb7ba4f78bb2ff73ddde61bf4fb57ef2997517b0

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 May 2018 22:37:02 +0000 (22:37 +0000)]

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71

Change-Id: I552259236b2aef72e2b50441943e6b413fdd3ab7

commit | commitdiff | tree

Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]

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

commit | commitdiff | tree

Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]

Merge "DO NOT MERGE Fix unexpected behavior in Bluetooth pairing" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:17:08 +0000 (17:17 +0000)]

Reword bluetooth confirmation dialog am: e14d38a383
am: b2b401b5f3

Change-Id: I21921d41d35a87a48ad627e9889e4d00219e912b

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:13:36 +0000 (17:13 +0000)]

Reword bluetooth confirmation dialog
am: e14d38a383

Change-Id: Ibb19504f6a74015a2a4d25d5c268db975da4ebb5

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.