Commit Graph

39459 Commits

Author SHA1 Message Date
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
622444d488 [automerger skipped] Hide quicksetting tile for dev options when it's turned off am: 73469d9de1
am: eeaff5deeb  -s ours

Change-Id: I1da9e0c3e5a170eb16a11a616d8a76fe6424d420
2018-11-20 02:34:38 -08:00
Fan Zhang
eeaff5deeb Hide quicksetting tile for dev options when it's turned off
am: 73469d9de1

Change-Id: Ibd19748e11218a958a00eaf501d9d8ab7cfc96e0
2018-11-20 02:28:15 -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
Fan Zhang
04f1e38dc3 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 19:52:32 +08:00
jackqdyulei
c05958ecdd Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff8e
am: 618b808b61

Change-Id: Id92a02a67661e0b7707564b7d83a7ff7f27854e1
2018-09-07 10:46:08 -07:00
jackqdyulei
618b808b61 Update PBAP info for all pairing dialogs. DO NOT MERGE
am: ff171eff8e

Change-Id: I21d048a1ad2d0e37870d380c30e95ee8e3a48091
2018-09-07 10:42:16 -07: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
Doris Ling
bea56da7d6 [automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am: 62158f0943 -s ours
am: 2ef0e15b66  -s ours

Change-Id: I3c13ee22f6e19d1ba45dd9fc34489d45c887ef35
2018-08-09 15:26:36 -07:00
Doris Ling
2ef0e15b66 [automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev
am: 62158f0943  -s ours

Change-Id: I892834c6c0655f40954ee94d98b29ac271b3de4c
2018-08-09 15:19:19 -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
38b9504a41 Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev 2018-08-09 19:47:07 +00:00
Doris Ling
4a6da68af7 Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev am: 197a10b053
am: 9245b98d0f

Change-Id: Ia674ef3fc7eb8042c58ca3da03ecb8b08df91eed
2018-08-09 12:06:31 -07:00
Doris Ling
d1146af517 Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb
am: 78a7ee2f10

Change-Id: I82960fb637152698cb676fae82862408b1a2db75
2018-08-09 12:05:08 -07:00
Doris Ling
0f0147213e [automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b am: 3672a1fe7f
am: cff5200146

Change-Id: I44df485b49098b69371d1248067e51559dcd4964
2018-08-09 12:03:48 -07:00
Doris Ling
9245b98d0f Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev
am: 197a10b053

Change-Id: I398a80b0e514f9c2439b3852996a4190b0d32b96
2018-08-09 12:02:34 -07:00
Doris Ling
78a7ee2f10 Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev
am: 528be61eeb

Change-Id: I8ee97a35c41ef54dde584ddd61b2afea577a9ad3
2018-08-09 12:00:42 -07:00
Doris Ling
cff5200146 [automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b
am: 3672a1fe7f

Change-Id: Ia9b1b5a4dee46b3a66b21080b54b6f9b92629c0f
2018-08-09 11:58:38 -07: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
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
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
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
Doris Ling
fff37ccb31 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
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
2018-08-03 12:25:41 -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
192cc156b0 Delete obsolete activity alias for dev settings am: 0e1393ae8c
am: afbdbeb7d5

Change-Id: I0bbd3a65b7f1ab11e0f182ca4421c8c5911e6ad2
2018-06-27 21:56:41 -07:00
Fan Zhang
afbdbeb7d5 Delete obsolete activity alias for dev settings
am: 0e1393ae8c

Change-Id: I879550b9dda19f42aec9d5cecc4f66a5ad0c23e4
2018-06-27 21:53:33 -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
71046c3d10 [automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours
am: b072779789  -s ours

Change-Id: I517819e05e5283e6c50555c713d79b34179a4f7c
2018-06-04 17:10:35 -07:00
Atanas Kirilov
b072779789 [automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev
am: 8994d1f0a4  -s ours

Change-Id: I91de7cf39aee69aab379cfd81085965cabf0ae81
2018-06-04 16:59:14 -07:00
Atanas Kirilov
5e66879b53 Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4
am: dededea9f3

Change-Id: Ia42df7f876f964d153b217de4f501a0b7f03d363
2018-06-04 16:14:11 -07:00
Atanas Kirilov
463ea747f6 Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am: 75f0072c94
am: 67892acff1

Change-Id: I4ca44d469bf063ba68b078ba830a5b7f4d86a2cb
2018-06-04 16:13:02 -07:00
Atanas Kirilov
0d59c0d23d Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am: 438cf9da52
am: a29108a778

Change-Id: I24bdca64cf308155ae9499fc0db629ba31c85e90
2018-06-04 16:10:32 -07:00
Atanas Kirilov
2f38890832 Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am: 9e626734bb
am: 65db9c47b9

Change-Id: I86cff1a6b90fbf53738d76f26fee07637db7da95
2018-06-04 16:09:33 -07:00
Atanas Kirilov
a50293f72c Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e
am: 74d98110f3

Change-Id: Ie334ee442e46dffa11926b471b0a096a3c4f1f92
2018-06-04 16:07:36 -07:00
Atanas Kirilov
dededea9f3 Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev
am: 9b4f5525b4

Change-Id: I325923e835cf57736106da3ce8cc26aefa4ee3f7
2018-06-04 15:43:14 -07:00
Atanas Kirilov
67892acff1 Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev
am: 75f0072c94

Change-Id: Ife69a5cf4637ef6b605415c5fa9f818f2644d54c
2018-06-04 15:41:42 -07:00