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 [Wed, 5 Jun 2019 09:12:01 +0000 (02:12 -0700)]

[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693
am: 65294e6ee5 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I02047207e9ed30afb0afb003f0c93f2cfb59addd

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:11:52 +0000 (02:11 -0700)]

[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09
am: bfe5b37bc8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I68b5c6aebfd69660c51613b6a96ef0c354d800ae

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:11:36 +0000 (02:11 -0700)]

[automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0
am: 6dbb3108a7 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I171e67f778cd8e8f67cb8d685ecfe09316619cf5

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 02:50:10 +0000 (02:50 +0000)]

[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693

Change-Id: I45fe88086caf9220b67162863828d3bf0ea30d7f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 02:50:07 +0000 (02:50 +0000)]

[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96

Change-Id: I6f8236a1de4c8edc766ae625fe0010924e4cfba3

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 02:50:04 +0000 (02:50 +0000)]

[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e

Change-Id: I5ed98836a8659baedf50724ce1f65c76bcace5ef

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 02:48:34 +0000 (02:48 +0000)]

[automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0

Change-Id: I0b4d8af9f5306150b58fb5cc8e10ba192458a458

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:14 +0000 (02:37 +0000)]

[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09

Change-Id: I8f2da352d0658de16a2b4087067a57fa7cf40ad6

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:12 +0000 (02:37 +0000)]

[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631

Change-Id: Ief79f2f50874bbfcd214b1ce3248b10532a24452

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:11 +0000 (02:37 +0000)]

[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d

Change-Id: I9f55b76cc7079a2eb682c2093f57ac0c58e524c9

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:09 +0000 (02:37 +0000)]

[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8

Change-Id: I1a5227631dbc4446af520c71e9d23b54bec5085f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:07 +0000 (02:37 +0000)]

[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e

Change-Id: Id4e7e996a34a5520a3785e2e778e75b4ee02ed02

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

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

Raff Tsai [Thu, 30 May 2019 01:30:24 +0000 (18:30 -0700)]

Merge "Do not allow draw on top for App notification settings" into oc-dev
am: 811229a2fd

Change-Id: Ie5ed40b8f573b974850234987bacc5ae7db925a4

commit | commitdiff | tree

TreeHugger Robot [Thu, 30 May 2019 01:14:19 +0000 (01:14 +0000)]

Merge "Do not allow draw on top for App notification settings" into oc-dev

commit | commitdiff | tree

Jonathan Scott [Wed, 8 May 2019 22:43:07 +0000 (15:43 -0700)]

[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357
am: bd3672b2d8

Change-Id: I9157d6fd4afc3426142dbfbbdc9a57aceb2b7d7f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 8 May 2019 20:51:48 +0000 (20:51 +0000)]

[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357

Change-Id: If8d375a600b9db7b011b08770ad6e7fbf29073c4

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 8 May 2019 20:51:45 +0000 (20:51 +0000)]

[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6

Change-Id: Ief43c33183fa5f24cf3bd9f26c9d7362d235492e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 8 May 2019 20:51:43 +0000 (20:51 +0000)]

[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b

Change-Id: I89b5b93b63beb9f52e5799c822edccf208158f39

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 8 May 2019 20:51:40 +0000 (20:51 +0000)]

[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc

Change-Id: Ibb0d6c1d0253c78160d66e27a2847192c19d10d1

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 8 May 2019 20:51:37 +0000 (20:51 +0000)]

[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29

Change-Id: Iee20bc7fe4fe756b87c9231689792ab50f8a76bc

commit | commitdiff | tree

Jonathan Scott [Tue, 7 May 2019 16:20:00 +0000 (17:20 +0100)]

[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks.

Bug: 127605586
Test: Manual
Change-Id: I4186c2d57b42b6e3d27013f2c9708fca56c561fe
Merged-In: I1cdd82bea4dc9e4182694b061a7746aa83dabdfe

commit | commitdiff | tree

Christopher Dombroski [Wed, 8 May 2019 02:14:43 +0000 (19:14 -0700)]

Treat mode_default as denied for install_unknown_apps
am: 4b78bcd5cd

Change-Id: I09e4fa32947b51a6614012ae3f42062416ca086e

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

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

Christopher Dombroski [Tue, 16 Apr 2019 19:22:56 +0000 (12:22 -0700)]

Treat mode_default as denied for install_unknown_apps

Test: atest SettingsRoboTests
Bug: 123700348
Change-Id: Ieeb6456854cc3d0faa0e9c407accd94f56a25813
Merged-In: Ieeb6456854cc3d0faa0e9c407accd94f56a25813

commit | commitdiff | tree

Fan Zhang [Fri, 8 Mar 2019 22:55:32 +0000 (14:55 -0800)]

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

Change-Id: I3b3a2411f4be05e1b8f6ecfce3521c5932028038

commit | commitdiff | tree

TreeHugger Robot [Fri, 8 Mar 2019 22:34:09 +0000 (22:34 +0000)]

Merge "Do not allow draw on top for default sms picker." into nyc-dev

commit | commitdiff | tree

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

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

Change-Id: I029a177108cbe0c6646b9c717e910266c9a5a410

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

Fan Zhang [Tue, 20 Nov 2018 10:28:15 +0000 (02:28 -0800)]

Hide quicksetting tile for dev options when it's turned off
am: 73469d9de1

Change-Id: Ibd19748e11218a958a00eaf501d9d8ab7cfc96e0

commit | commitdiff | tree

Fan Zhang [Tue, 12 Jun 2018 19:06:17 +0000 (12:06 -0700)]

Hide quicksetting tile for dev options when it's turned off

Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests

commit | commitdiff | tree

jackqdyulei [Fri, 7 Sep 2018 17:42:16 +0000 (10:42 -0700)]

Update PBAP info for all pairing dialogs. DO NOT MERGE
am: ff171eff8e

Change-Id: I21d048a1ad2d0e37870d380c30e95ee8e3a48091

commit | commitdiff | tree

jackqdyulei [Tue, 19 Jun 2018 23:52:07 +0000 (16:52 -0700)]

Update PBAP info for all pairing dialogs. DO NOT MERGE

This is a bug from ag/4210612, in which it only update PBAP info
for USER_ENTRY_DIALOG. So in other kind of dialogs it never upload
correct PBAP info to bluetooth backend.

This CL fix it by updating PBAP for all dialogs.

Change-Id: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Merged-In: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Bug: 109842273
Bug: 72872376
Test: RunSettingsRoboTests
(cherry picked from commit 7015e20a554fd7f8f7ded7359a5ecc13a82a0464)

commit | commitdiff | tree

Doris Ling [Thu, 9 Aug 2018 22:19:19 +0000 (15:19 -0700)]

[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev
am: 62158f0943 -s ours

Change-Id: I892834c6c0655f40954ee94d98b29ac271b3de4c

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 Aug 2018 21:51:32 +0000 (21:51 +0000)]

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

commit | commitdiff | tree

Doris Ling [Thu, 9 Aug 2018 19:02:34 +0000 (12:02 -0700)]

Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev
am: 197a10b053

Change-Id: I398a80b0e514f9c2439b3852996a4190b0d32b96

commit | commitdiff | tree

Doris Ling [Thu, 9 Aug 2018 19:00:42 +0000 (12:00 -0700)]

Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev
am: 528be61eeb

Change-Id: I8ee97a35c41ef54dde584ddd61b2afea577a9ad3

commit | commitdiff | tree

Doris Ling [Thu, 9 Aug 2018 18:58:38 +0000 (11:58 -0700)]

[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b
am: 3672a1fe7f

Change-Id: Ia9b1b5a4dee46b3a66b21080b54b6f9b92629c0f

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:43:34 +0000 (18:43 +0000)]

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

* changes:
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7 skipped: 3503445e59
  [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:34:12 +0000 (18:34 +0000)]

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

* changes:
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6 skipped: 1b622b07be
  [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

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:11 +0000 (21:04 +0000)]

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

Change-Id: I2755a79cc942e8dc063f3a420e0ed02817959cec

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

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
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2

commit | commitdiff | tree

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

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

Change-Id: I83aa2c1573b6310112b3575b4b4b35ef3c7f57d9

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

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

[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b

Change-Id: Ia238fa6c7245d14b40c8abd4b08e4d591f776ece

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

Fan Zhang [Thu, 28 Jun 2018 04:53:33 +0000 (21:53 -0700)]

Delete obsolete activity alias for dev settings
am: 0e1393ae8c

Change-Id: I879550b9dda19f42aec9d5cecc4f66a5ad0c23e4

commit | commitdiff | tree

Fan Zhang [Thu, 7 Jun 2018 16:45:23 +0000 (16:45 +0000)]

Delete obsolete activity alias for dev settings

This activity alias is here since android 4.x for backward
compatibility. We no longer need it, and keeping it will cause security
issue.

Change-Id: Ib7817fd7cf8c8e66ca50534a0387cdc5773f837b
Merged-In: I3f985e7fe14bd290db73b8c46dd817591df02015
Fixes: 92497653
Test: manual

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 23:59:14 +0000 (16:59 -0700)]

[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev
am: 8994d1f0a4 -s ours

Change-Id: I91de7cf39aee69aab379cfd81085965cabf0ae81

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 22:43:14 +0000 (15:43 -0700)]

Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev
am: 9b4f5525b4

Change-Id: I325923e835cf57736106da3ce8cc26aefa4ee3f7

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 22:41:42 +0000 (15:41 -0700)]

Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev
am: 75f0072c94

Change-Id: Ife69a5cf4637ef6b605415c5fa9f818f2644d54c

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 22:39:29 +0000 (15:39 -0700)]

Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev
am: 438cf9da52

Change-Id: I0964b2320f0b6d55923847bbba779bb8ee5c2794

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 22:38:17 +0000 (15:38 -0700)]

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

Change-Id: I6536e0423a261da7232b6229d96019fea35f5bfe

commit | commitdiff | tree

Atanas Kirilov [Mon, 4 Jun 2018 22:36:29 +0000 (15:36 -0700)]

Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev
am: 826b14e43e

Change-Id: If4056f03d27f845d30862b04dcbdb119141f2bf8

commit | commitdiff | tree

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

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

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:25:15 +0000 (20:25 +0000)]

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

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

* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2 skipped: c874b450af
  [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 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:34 +0000 (20:24 +0000)]

Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev

* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 732b65ca4d
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 oc-dev

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

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

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

Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev

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

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
Merged-In: I2d8c57680d1d98b74193654e9fe77016304f6ac5

commit | commitdiff | tree

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

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

Change-Id: Ib56a32b88c58c7b1a54ba4522cd9bf4bd80cd6e5

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

Hansong Zhang [Wed, 30 May 2018 20:23:53 +0000 (13:23 -0700)]

DO NOT MERGE Give PBAP permission only after user confirms
am: e36ca3e96d

Change-Id: I6fe221ad379ab6398b01bfb96fe7390d0369c15d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 24 May 2018 18:22:37 +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 skipped: b9aa0fbfe9

Change-Id: Ib0b9bdb830263bbfb7c81033b388cd9e07e591ef

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

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.