Commit Graph

35570 Commits

Author SHA1 Message Date
TreeHugger Robot
811229a2fd Merge "Do not allow draw on top for App notification settings" into oc-dev 2019-05-30 01:14:19 +00:00
Android Build Merger (Role)
bd3672b2d8 [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357
Change-Id: If8d375a600b9db7b011b08770ad6e7fbf29073c4
2019-05-08 20:51:48 +00:00
Android Build Merger (Role)
333afb4357 [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6
Change-Id: Ief43c33183fa5f24cf3bd9f26c9d7362d235492e
2019-05-08 20:51:45 +00:00
Android Build Merger (Role)
003ce809c6 [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b
Change-Id: I89b5b93b63beb9f52e5799c822edccf208158f39
2019-05-08 20:51:43 +00:00
Android Build Merger (Role)
7d86790c7b [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc
Change-Id: Ibb0d6c1d0253c78160d66e27a2847192c19d10d1
2019-05-08 20:51:40 +00:00
Android Build Merger (Role)
133337b4dc [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29
Change-Id: Iee20bc7fe4fe756b87c9231689792ab50f8a76bc
2019-05-08 20:51:37 +00:00
Jonathan Scott
b985aa2f29 [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks.
Bug: 127605586
Test: Manual
Change-Id: I4186c2d57b42b6e3d27013f2c9708fca56c561fe
Merged-In: I1cdd82bea4dc9e4182694b061a7746aa83dabdfe
2019-05-08 20:51:35 +00:00
Raff Tsai
c968eacbbf Do not allow draw on top for App notification settings
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f)
2019-05-03 03:12:32 +00:00
Christopher Dombroski
4b78bcd5cd Treat mode_default as denied for install_unknown_apps
Test: atest SettingsRoboTests
Bug: 123700348
Change-Id: Ieeb6456854cc3d0faa0e9c407accd94f56a25813
Merged-In: Ieeb6456854cc3d0faa0e9c407accd94f56a25813
2019-04-24 18:29:53 +00:00
TreeHugger Robot
decb412d5b Merge "Do not allow draw on top for default sms picker." into nyc-dev 2019-03-08 22:34:09 +00:00
Android Build Merger (Role)
ba87cf7444 [automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837 am: d6bde3f5b8
Change-Id: I029a177108cbe0c6646b9c717e910266c9a5a410
2019-02-20 21:54:41 +00:00
Android Build Merger (Role)
d6bde3f5b8 [automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837
Change-Id: I16c54cab9346d161d668dc4183ae4a9eb7117996
2019-02-20 21:54:39 +00:00
Android Build Merger (Role)
7926131837 [automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114
Change-Id: I9212ffd96f974268c0069e80e68347102967e7e5
2019-02-20 21:54:37 +00:00
Android Build Merger (Role)
7a58589114 [automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f
Change-Id: Ic6e4308ee65a83e7d00801452323569301e65d66
2019-02-20 21:54:34 +00:00
Android Build Merger (Role)
b810aee20f [automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49
Change-Id: I9466105a6de960efb4513d4e856450459aec2560
2019-02-20 21:54:31 +00:00
Fan Zhang
95d0fb7f49 Do not allow draw on top for default sms picker.
Fixes: 120484087
Test: manual
Change-Id: I4be265565678302fad207839216d5cd65dcb6e94
Merged-In: I4be265565678302fad207839216d5cd65dcb6e94
(cherry picked from commit 9d46e1fdfe)
2019-02-20 13:53:51 -08:00
Fan Zhang
73469d9de1 Hide quicksetting tile for dev options when it's turned off
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
2018-11-12 20:25:51 +08:00
jackqdyulei
ff171eff8e 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 7015e20a55)
2018-09-06 16:35:58 -07:00
TreeHugger Robot
62158f0943 Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev 2018-08-09 21:51:32 +00:00
TreeHugger Robot
8e20b46f3f 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.
2018-08-09 18:43:34 +00:00
TreeHugger Robot
f0d84f0841 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.
2018-08-09 18:43:34 +00:00
TreeHugger Robot
597820a687 Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into nyc-mr1-dev 2018-08-09 18:43:34 +00:00
TreeHugger Robot
197a10b053 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.
2018-08-09 18:43:34 +00:00
TreeHugger Robot
20a8f8b1ae 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.
2018-08-09 18:34:12 +00:00
TreeHugger Robot
528be61eeb 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.
2018-08-09 18:34:12 +00:00
Android Build Merger (Role)
36a583e2ff [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
2018-08-03 21:04:11 +00:00
Android Build Merger (Role)
1b622b07be [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6
Change-Id: I9c1ba2599a78d6518531a2bff2b899eecb3b6554
2018-08-03 21:04:09 +00:00
Android Build Merger (Role)
aaa67659a6 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4
Change-Id: Ic801ec29d08cf8600e3f04cd9b311d6fbbb315a8
2018-08-03 21:04:08 +00:00
Android Build Merger (Role)
782fc16dc4 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011
Change-Id: If73d439ccad4d5a317de59de48427e6f406f1fa2
2018-08-03 21:04:06 +00:00
Android Build Merger (Role)
c056ac3011 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5
Change-Id: I8b74b9105db55d8b8cdb3f7bc7b8b42ee9998de8
2018-08-03 21:04:04 +00:00
Doris Ling
c624deaff5 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
2018-08-03 14:03:37 -07:00
Doris Ling
cb68db7d4f 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
2018-08-03 12:55:42 -07:00
Android Build Merger (Role)
8da82c40cc [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7 skipped: 3503445e59
Change-Id: I83aa2c1573b6310112b3575b4b4b35ef3c7f57d9
2018-08-03 01:03:04 +00:00
Android Build Merger (Role)
3503445e59 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7
Change-Id: I67d4821190d4a6283a54a23a087984b9ca18063f
2018-08-03 01:03:02 +00:00
Android Build Merger (Role)
d98908e7c7 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f
Change-Id: If3f680b663909bd4e40b3e9033fed9cd0c8f537a
2018-08-03 01:03:00 +00:00
Doris Ling
cd0b97e86f 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
2018-08-03 01:02:58 +00:00
Android Build Merger (Role)
3672a1fe7f [automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b
Change-Id: Ia238fa6c7245d14b40c8abd4b08e4d591f776ece
2018-08-03 01:00:48 +00:00
Doris Ling
94ea2dad5b 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
2018-08-02 18:00:29 -07:00
Fan Zhang
0e1393ae8c 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
2018-06-07 16:47:31 +00:00
Atanas Kirilov
8994d1f0a4 Merge "Merge translations of Bluetooth confirmation text" into oc-dev 2018-06-04 20:37:42 +00:00
Atanas Kirilov
78da279398 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
2018-06-04 20:25:15 +00:00
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
c1028a9996 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
2018-06-04 20:25:15 +00:00
Atanas Kirilov
5388f7b1bc Merge "Merge translations of Bluetooth confirmation text" into nyc-dr1-dev 2018-06-04 20:25:15 +00:00
Atanas Kirilov
9b4f5525b4 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
2018-06-04 20:25:15 +00:00
Atanas Kirilov
263b3861cb Merge "Merge translations of Bluetooth confirmation text" into nyc-dev 2018-06-04 20:24:37 +00:00
Atanas Kirilov
a762677e27 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
2018-06-04 20:24:37 +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
84d1cc06ea 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
2018-06-04 20:24:37 +00:00
Atanas Kirilov
b6f6f6db44 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
2018-06-04 20:24:37 +00:00