Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,743 Commits 1 Branch 0 Tags
8f70c24f2dae4f0b8acd20888d32f3984bcb7bd5
Commit Graph

27743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
8f70c24f2d [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 
Change-Id: I1a5227631dbc4446af520c71e9d23b54bec5085f
 2019-06-05 02:37:09 +00:00
Android Build Merger (Role)
e537ffece8 [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e 
Change-Id: Id4e7e996a34a5520a3785e2e778e75b4ee02ed02
 2019-06-05 02:37:07 +00:00
Raff Tsai
5d9328571e 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-31 17:50:17 +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
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)
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
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
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
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
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
263b3861cb Merge "Merge translations of Bluetooth confirmation text" into nyc-dev 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
Atanas Kirilov
b6f0ef4113 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
 2018-06-04 20:24:25 +00:00
Atanas Kirilov
07bcf55ae8 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
 2018-06-04 20:24:25 +00:00
Atanas Kirilov
ae16bd77c3 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
 2018-06-04 20:24:25 +00:00
Android Build Merger (Role)
93ee1bd17e [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f 
Change-Id: Ic7873dae0f097a546b250ebcb96cf88a437e1173
 2018-05-24 18:22:33 +00:00
Android Build Merger (Role)
551be9a85f [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f 
Change-Id: Ibb61117b7475504a756dafece07c5d79eba0f73f
 2018-05-24 18:22:32 +00:00
Android Build Merger (Role)
874c51780f [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 
Change-Id: Ieb0dfe22926f14109466bd00c9cac9ccaa04e057
 2018-05-24 18:22:30 +00:00
Android Build Merger (Role)
cb66517282 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 
Change-Id: I2b731c3a29f4fde5a672c9224008e7be7e460b72
 2018-05-24 18:22:29 +00:00
Android Build Merger (Role)
5b4de5e724 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d 
Change-Id: I1ba9495afe9e105926ad407442d732f2c6e92cf5
 2018-05-24 18:22:19 +00:00
Antony Sargent
e0eeafcb5d Merge translations of Bluetooth confirmation text 
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name

Bug: 62672248
Test: manual
Change-Id: Iab08b43768f0aedd690570eb59dcb71c14c04784
 2018-05-23 18:02:36 +00:00
Android Build Merger (Role)
108cb3edaa [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a 
Change-Id: I8bb2f283f86210447788c3191b67c1936e7b0a72
 2018-05-21 22:05:41 +00:00
Antony Sargent
a0b8f3fe3a Merge translations of Bluetooth confirmation text 
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.

Bug: 62672248
Test: manual
Change-Id: I049138002f07e78442ddebfa746d6128b5689947
 2018-05-21 14:43:18 -07:00
Android Build Merger (Role)
7304aaf293 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf 
Change-Id: I1fa52208a183a67c694c9457bb304f94c1a05ec1
 2018-05-21 21:00:01 +00:00
Android Build Merger (Role)
ed423eadcf [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 
Change-Id: Ic63f7f831df3111a5ce1cda7759e760563ea574d
 2018-05-21 20:59:52 +00:00
Android Build Merger (Role)
2d1bae1bd8 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e 
Change-Id: Ie28e68f8334f8e6e74241c25b522bb64a16e3f1b
 2018-05-02 22:37:12 +00:00
Android Build Merger (Role)
ba2ea1e53e [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 
Change-Id: Ibb7ba4f78bb2ff73ddde61bf4fb57ef2997517b0
 2018-05-02 22:37:10 +00:00
Android Build Merger (Role)
4a82795313 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 
Change-Id: I552259236b2aef72e2b50441943e6b413fdd3ab7
 2018-05-02 22:37:02 +00:00
Antony Sargent
3f8d33ff71 Merge translations of Bluetooth confirmation text 
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.

Bug: 62672248
Test: manual
Change-Id: Id393c4296efef03f38b6e55396c83da9dd9c8b4c
 2018-05-02 15:32:36 -07:00
Antony Sargent
7d505aefa5 Merge translations of Bluetooth confirmation text 
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.

Bug: 62672248
Test: manual
Change-Id: Ia386cc2d98de086ed545e4fe6d41be20e9c24dc4
 2018-05-02 14:07:34 -07:00
TreeHugger Robot
8e2a3b1813 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into nyc-mr1-dev 
* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa
  DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
 2018-04-09 20:29:54 +00:00
TreeHugger Robot
6b6d337610 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into nyc-dr1-dev 
* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa
  DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
 2018-04-09 20:29:54 +00:00
TreeHugger Robot
eeafbd8d60 Merge "DO NOT MERGE Fix unexpected behavior in Bluetooth pairing" into nyc-dev 2018-04-09 20:29:54 +00:00
Android Build Merger (Role)
ee220e0238 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc 
Change-Id: I5b600093709bf93bb64ccacddeaa3cdf0b470107
 2018-04-02 17:48:45 +00:00
Android Build Merger (Role)
e25ebddfdc [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa 
Change-Id: Ibaab24729318954dbce44f3ccf53fcb4180ac1c7
 2018-04-02 17:48:43 +00:00
Hansong Zhang
4f58c19afa DO NOT MERGE Fix unexpected behavior in Bluetooth pairing 
* Set default PBAP permission to false
* Remove all newline and tab characters in Bluetooth device name

Bug: 72872376
Bug: 73173182
Test: manual
Change-Id: Ib3b99017c8da01446ce6302d43dcfb1ef8fba02c
 2018-04-02 10:48:18 -07:00
Android Build Merger (Role)
84061c71d1 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 
Change-Id: I72b65a7a76c93dff0dd5ffd9c3747c68c0a382e8
 2018-04-02 17:45:07 +00:00
Android Build Merger (Role)
bab8dca667 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 
Change-Id: I501c5e16642ce2bddb0c5c5e2ed6e0b84fc34029
 2018-04-02 17:45:05 +00:00
Android Build Merger (Role)
5d27bdb6d2 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 
Change-Id: Idf0afa49507f8ead25fd1b59809064f058281076
 2018-04-02 17:45:03 +00:00
Android Build Merger (Role)
d276b38666 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 
Change-Id: I69b00aebae95532bf9fe51191b14e12d8948b0bf
 2018-04-02 17:45:02 +00:00
Android Build Merger (Role)
dfe4cc74f7 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 
Change-Id: I7c2952f8540db9ee15ceac73bf1a0d73652f5163
 2018-04-02 17:45:00 +00:00
Android Build Merger (Role)
5b98c9f4a3 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 
Change-Id: Id8ac4a63bd63d0a219364b520211ebae5ad6ea62
 2018-04-02 17:44:58 +00:00