PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,259 Commits 1 Branch 0 Tags
f52eedfcea0d33d4dc979a824d71a5b25a761fbf
Commit Graph

72259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
50c07797c9 Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073 am: b9b28441ee am: f38093956a am: 04a1ebd4d5 am: 32bd56b532 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

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

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

Change-Id: If9c9ad1814ab39b2a32662ce86a20902ecdbc167
 2020-06-09 12:46:49 +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
70c1f4a599 Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" am: 51d3a80a27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802009

Change-Id: I1e3a085be1e7c26554fa7f9b6c0cf49b883c3388
 2020-06-09 10:50:50 +00:00
Robert Luo
51d3a80a27 Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" 2020-06-09 10:49:29 +00:00
Automerger Merge Worker
a83a0822df 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 am: 795d0684f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11788801

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

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

Change-Id: Ib289f1e3c6d54f6d011398b1a729b569dad311ea
 2020-06-09 10:43:49 +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
TreeHugger Robot
c36a55650d Merge "Add extra summary string in cross profiles page" into rvc-dev am: debe9b3577 am: c5cd2de1ed am: b235bdf537 am: ecef5590c1 am: 5b8c52dd7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11789922

Change-Id: I3b3cdd8bda8515009e2521b6c4c3525d0e16a023
 2020-06-09 10:22:22 +00:00
Automerger Merge Worker
a6856b5b78 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 am: 3a888b5b6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797825

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

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

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

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

Change-Id: Ia1440c6a7d6ddae9154e11bbd6e052044f4eb09e
 2020-06-09 10:21:37 +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
Stanley Wang
0f96e7b527 Merge "Update "yes" string for German language." into rvc-dev am: 36dd53a0db am: 235b6d4bbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11788801

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

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

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

Change-Id: I8ec8a88c9594a1d766bfa41c49759fb4878ed314
 2020-06-09 09:51:36 +00:00