PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,929 Commits 1 Branch 0 Tags
6feccd1ea7639056382e78aa76ae6dc3b888c68e
Commit Graph

70929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
6feccd1ea7 Merge "Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e am: dbe7263055" into rvc-d1-dev-plus-aosp am: 369f4f61ac am: 08b4801bf9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11763678

Change-Id: I72404b4fb5d6708206b4cd5b8530ddf51fbd40b5
 2020-06-10 06:16:14 +00:00
TreeHugger Robot
5bbeca77c7 Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e am: bae5889dd1 am: 2b61c0c6a5 am: 7647b5fad5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11763678

Change-Id: Ia9caa7467bd6d8c859bca9acf1ffce1e69414576
 2020-06-10 06:15:41 +00:00
Automerger Merge Worker
08b4801bf9 Merge "Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e am: dbe7263055" into rvc-d1-dev-plus-aosp am: 369f4f61ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11763678

Change-Id: I1f1b5438c430e0622f8372963d10918ace41fbba
 2020-06-10 05:57:48 +00:00
TreeHugger Robot
7647b5fad5 Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e am: bae5889dd1 am: 2b61c0c6a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11763678

Change-Id: I110fa3efe890b8448cecd5ba7709d40dfa1bd15f
 2020-06-10 05:57:16 +00:00
Automerger Merge Worker
369f4f61ac Merge "Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e am: dbe7263055" into rvc-d1-dev-plus-aosp 2020-06-10 05:41:06 +00:00
TreeHugger Robot
2b61c0c6a5 Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e am: bae5889dd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11763678

Change-Id: I673e50fcddf0a48d55e348c7c074fd578f120bd0
 2020-06-10 05:40:59 +00:00
TreeHugger Robot
9ea4731aa3 Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e am: dbe7263055 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11763678

Change-Id: Idf7d705f3291c5a7360e11148d20d94df3189659
 2020-06-10 05:40:59 +00:00
TreeHugger Robot
bae5889dd1 Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11763678

Change-Id: I4bd6cc79c6188c26ee233306e3979ba9d7806329
 2020-06-10 05:22:50 +00:00
TreeHugger Robot
dbe7263055 Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11763678

Change-Id: Ie52943675d3a5610978a6bf7a7ac0743407447f1
 2020-06-10 05:22:05 +00:00
TreeHugger Robot
73bf03748e Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev 2020-06-10 05:06:41 +00:00
Sarah Chin
f71eed162d Add logic for 5G icon to SIM status dialog 
Test: manual test with fake 5G data network type
Bug: 156815536
Change-Id: I764f4ade8032511b44098e7eccb19b909fccc717
 2020-06-09 18:55:53 -07:00
Robert Luo
6e57b15b2a [automerger skipped] Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: c36fe51faf -s ours am: 6cb1c40ae1 -s ours am: aee23dc6fc -s ours 
am skip reason: Change-Id Icbc5879301fec9a7deacd7ee2896fd41b6feab7a with SHA-1 1633ae37e7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511

Change-Id: I5f946645a47b70b4f664a6609e759c15fd7ba671
 2020-06-09 14:09:46 +00:00
Robert Luo
afe64f6d2e [automerger skipped] Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: 2cdf49c4d5 am: c6f7e0d493 -s ours am: edeb3c91c9 -s ours 
am skip reason: Change-Id Icbc5879301fec9a7deacd7ee2896fd41b6feab7a with SHA-1 1633ae37e7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511

Change-Id: I11cb035053611393b70a475e97245b7f60f3f8be
 2020-06-09 14:09:37 +00:00
Robert Luo
c2114694f2 [automerger skipped] Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: 2cdf49c4d5 am: dad4baf879 am: 9e1fdc3ef2 -s ours 
am skip reason: Change-Id Icbc5879301fec9a7deacd7ee2896fd41b6feab7a with SHA-1 a289708db1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511

Change-Id: If84bc168f455d1003ef49ef96be6ad4370798036
 2020-06-09 14:08:44 +00:00
Robert Luo
aee23dc6fc [automerger skipped] Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: c36fe51faf -s ours am: 6cb1c40ae1 -s ours 
am skip reason: Change-Id Icbc5879301fec9a7deacd7ee2896fd41b6feab7a with SHA-1 1633ae37e7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511

Change-Id: Ifb7decfc74757b807fad4aacd9ea1da49bdeb133
 2020-06-09 13:56:04 +00:00
Robert Luo
edeb3c91c9 [automerger skipped] Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: 2cdf49c4d5 am: c6f7e0d493 -s ours 
am skip reason: Change-Id Icbc5879301fec9a7deacd7ee2896fd41b6feab7a with SHA-1 1633ae37e7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511

Change-Id: I44396a23338623fcab85534991f62bd67b609faf
 2020-06-09 13:55:37 +00:00
Robert Luo
9e1fdc3ef2 Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: 2cdf49c4d5 am: dad4baf879 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511

Change-Id: I2fdb58e481e95546a8933e52dc82687c27a6c5f7
 2020-06-09 13:55:24 +00:00
Robert Luo
6cb1c40ae1 [automerger skipped] Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: c36fe51faf -s ours 
am skip reason: Change-Id Icbc5879301fec9a7deacd7ee2896fd41b6feab7a with SHA-1 1633ae37e7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511

Change-Id: Ib5f54f360705296df5f84fcf141bb3820df5792c
 2020-06-09 13:42:13 +00:00
Robert Luo
dad4baf879 Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: 2cdf49c4d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511

Change-Id: Ie93d5805043f70fb28855bed88369554414b3d7e
 2020-06-09 13:42:04 +00:00
Robert Luo
c6f7e0d493 Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: 2cdf49c4d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511

Change-Id: I769482b69789e9931fc2662053848607f00c53cd
 2020-06-09 13:41:50 +00:00
Robert Luo
c36fe51faf Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511

Change-Id: I9c18b15953b3a3bae512c436ecb7aea4ee336411
 2020-06-09 13:28:27 +00:00
Robert Luo
2cdf49c4d5 Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511

Change-Id: I9bf6d161b485683185c3f8d000c06aa1cbfa2fb3
 2020-06-09 13:28:23 +00:00
Robert Luo
21ac98e2f1 Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev 2020-06-09 13:18:22 +00:00
Stanley Wang
32bd56b532 Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073 am: b9b28441ee am: f38093956a am: 04a1ebd4d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

Change-Id: I07ecbe60ad7cd1ab1b22c7723eb99c6c69d358d7
 2020-06-09 12:32:19 +00:00
Stanley Wang
e2223eea3d Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073 am: c52aa3d8ca am: 6d92aef4c2 am: dadbba076f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

Change-Id: I20ce1cdd6eb2f9edae9a582c92def06675e3e0bf
 2020-06-09 12:32:10 +00:00
Stanley Wang
008ce56641 Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073 am: b9b28441ee am: f71d5e8427 am: 320c19d355 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

Change-Id: I2201c8cd46464cd1be832478cd91f1f5e1b26ae8
 2020-06-09 12:31:52 +00:00
Stanley Wang
04a1ebd4d5 Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073 am: b9b28441ee am: f38093956a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

Change-Id: I5101920a147f0ea7e837cc6b0720f6f886e94aa8
 2020-06-09 12:17:02 +00:00
Stanley Wang
dadbba076f Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073 am: c52aa3d8ca am: 6d92aef4c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

Change-Id: I060c801e5a92ce2388ee274fce3f30b37ed76ded
 2020-06-09 12:16:53 +00:00
Stanley Wang
320c19d355 Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073 am: b9b28441ee am: f71d5e8427 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

Change-Id: I1136afffbc410aaceba6d4d644830f30dedcad58
 2020-06-09 12:16:41 +00:00
Stanley Wang
f38093956a Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073 am: b9b28441ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

Change-Id: I3468789ab0b977a8e80545b171ce497b7c7565fd
 2020-06-09 12:05:06 +00:00
Stanley Wang
6d92aef4c2 Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073 am: c52aa3d8ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

Change-Id: I94bb64ea7103056c414b97d4f76466c98229596c
 2020-06-09 12:05:04 +00:00
Stanley Wang
f71d5e8427 Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073 am: b9b28441ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

Change-Id: I7119692f5f073702404c22fda1c8872247c1448b
 2020-06-09 12:04:49 +00:00
Stanley Wang
c52aa3d8ca Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

Change-Id: I2fdd9c2227b798376fa3036de82f82843392e02e
 2020-06-09 11:54:57 +00:00
Stanley Wang
b9b28441ee Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

Change-Id: Ib7d80f647fad736266d1930e6eef08d660cccdea
 2020-06-09 11:54:48 +00:00
Stanley Wang
37d5ed5073 Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev 2020-06-09 11:46:09 +00:00
Robert Luo
1633ae37e7 Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity 
Bug: 156696236
Test: 1. Manual 2. make -j42 RunSettingsRoboTests
Change-Id: Icbc5879301fec9a7deacd7ee2896fd41b6feab7a
Merged-In: Icbc5879301fec9a7deacd7ee2896fd41b6feab7a
 2020-06-09 18:56:46 +08:00
Robert Luo
51d3a80a27 Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" 2020-06-09 10:49:29 +00:00
Automerger Merge Worker
795d0684f9 Merge "Merge "Update "yes" string for German language." into rvc-dev am: 36dd53a0db am: 9d28584122 am: 4158f0875a" into rvc-qpr-dev-plus-aosp am: 186217dcb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11788801

Change-Id: Ie33b1c66c2619676bf65bab07449ff23d6237cc3
 2020-06-09 10:34:17 +00:00
Stanley Wang
291bb9e1d9 Merge "Update "yes" string for German language." into rvc-dev am: 36dd53a0db am: 235b6d4bbd am: 0f96e7b527 am: 858efc1381 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11788801

Change-Id: I6ec13296e3f3c4a4c7d5452f9f8e79c343b0ddea
 2020-06-09 10:34:06 +00:00
Stanley Wang
fb148bab88 Merge "Update "yes" string for German language." into rvc-dev am: 36dd53a0db am: 235b6d4bbd am: a924938de6 am: b0e89cb624 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11788801

Change-Id: I8058a37ba9cabf1508d390f1f1ebeaa66671815a
 2020-06-09 10:33:47 +00:00
Automerger Merge Worker
186217dcb5 Merge "Merge "Update "yes" string for German language." into rvc-dev am: 36dd53a0db am: 9d28584122 am: 4158f0875a" into rvc-qpr-dev-plus-aosp 2020-06-09 10:21:36 +00:00
Stanley Wang
858efc1381 Merge "Update "yes" string for German language." into rvc-dev am: 36dd53a0db am: 235b6d4bbd am: 0f96e7b527 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11788801

Change-Id: Ica444ead5628edde155e17460227bfe550756e96
 2020-06-09 10:21:31 +00:00
Stanley Wang
8936058803 Merge "Update "yes" string for German language." into rvc-dev am: 36dd53a0db am: 9d28584122 am: 4158f0875a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11788801

Change-Id: I3d8371f846b01950a141f3c9f76b8f75d43ccc15
 2020-06-09 10:21:31 +00:00
Stanley Wang
b0e89cb624 Merge "Update "yes" string for German language." into rvc-dev am: 36dd53a0db am: 235b6d4bbd am: a924938de6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11788801

Change-Id: I9557573b9994205c31a84383352dc120a2cea5c8
 2020-06-09 10:21:15 +00:00
TreeHugger Robot
5b8c52dd7d Merge "Add extra summary string in cross profiles page" into rvc-dev am: debe9b3577 am: c5cd2de1ed am: b235bdf537 am: ecef5590c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11789922

Change-Id: Ie4cf26dd7c03575d03891a3133667f718f32af1d
 2020-06-09 10:11:20 +00:00
Automerger Merge Worker
3a888b5b6c Merge "Merge "Add new description to Permission manager in settings" into rvc-dev am: c628df6914 am: 14c4b1eaad" into rvc-d1-dev-plus-aosp am: b59c43e075 am: 000ebbfaba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797825

Change-Id: Ib0a683fbc9e25a37bde176d272b39345d93172b0
 2020-06-09 10:11:13 +00:00
TreeHugger Robot
66a0217621 Merge "Add extra summary string in cross profiles page" into rvc-dev am: debe9b3577 am: 4b8c7528f3 am: eeb568183b am: e3cb5c4067 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11789922

Change-Id: Iff2238f26352b0cdf2106204dc8cc76a44b9b368
 2020-06-09 10:11:05 +00:00
TreeHugger Robot
d07747d8d1 Merge "Add new description to Permission manager in settings" into rvc-dev am: c628df6914 am: a0c05f2651 am: b8724e9ec8 am: 4638faf530 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797825

Change-Id: I8f1f54929b97235f4dbd3e9e8614c4d223287dea
 2020-06-09 10:10:51 +00:00
TreeHugger Robot
0b487874ee Merge "Add extra summary string in cross profiles page" into rvc-dev am: debe9b3577 am: 4b8c7528f3 am: 713049c75b am: 64a69f266d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11789922

Change-Id: I62c294ef3b38e4d8ad35f959ba9f2a4532450ad8
 2020-06-09 10:09:34 +00:00
TreeHugger Robot
3c7b07d04b Merge "Add new description to Permission manager in settings" into rvc-dev am: c628df6914 am: a0c05f2651 am: aa860a901a am: e933d12ca9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797825

Change-Id: I6af3c681dc0c2f95c79c18ebcb2634b2b2c7a91e
 2020-06-09 10:08:32 +00:00