Julia Reynolds
5849bc48cb
Merge "Add filtering to notification channel settings" into sc-dev am: 6c70707655
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13563266
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia854106faf632be72bad2dc0b64b7d10b0135a4e
2021-02-17 14:14:00 +00:00
Julia Reynolds
6c70707655
Merge "Add filtering to notification channel settings" into sc-dev
2021-02-17 14:12:04 +00:00
Rahul Sabnis
c596015e6a
Merge "Skips the bluetooth consent pairing dialog if the device has recently been associated with the companion app that requested the bond through CDM" into sc-dev am: 9b6ce3e0db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13534591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I93fccd03b41e86f1e68b0868c57c2ead5a4bc97b
2021-02-16 23:58:45 +00:00
Rahul Sabnis
9b6ce3e0db
Merge "Skips the bluetooth consent pairing dialog if the device has recently been associated with the companion app that requested the bond through CDM" into sc-dev
2021-02-16 23:30:19 +00:00
TreeHugger Robot
7b87649227
Merge "Use location access for recent location apps." into sc-dev am: 5a2a19deae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13549705
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7007681ad30ab7a77c520526377d07585b1f2f06
2021-02-16 22:40:26 +00:00
TreeHugger Robot
5a2a19deae
Merge "Use location access for recent location apps." into sc-dev
2021-02-16 22:08:45 +00:00
Alex Johnston
7ed173673f
Merge "Disallow modifying USB in Settings" into sc-dev am: c0c3bce16e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13580608
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7f83323580f5ac7a022e92ecc00427fd222e9b2f
2021-02-16 21:08:17 +00:00
Alex Johnston
c0c3bce16e
Merge "Disallow modifying USB in Settings" into sc-dev
2021-02-16 20:47:15 +00:00
Wei Wang
f383cb44b4
Use location access for recent location apps.
...
Bug: 177685444
Test: Manual
Change-Id: Id22ce156b20b66cf0607879ea0f9f874b621894d
2021-02-16 12:27:10 -08:00
Julia Reynolds
4dc7795eb3
Add filtering to notification channel settings
...
Allow apps that are launching this page to specify targeted subsets of
settings that should be shown.
Test: settings notification robotests
Bug: 177246841
Change-Id: Ib491c43f1861a9775e3b25f39134cdbe105a7ff8
2021-02-16 14:40:26 -05:00
TreeHugger Robot
50efe32c67
Merge "Fix SettingsActivity name" into sc-dev am: 3deffe9f04
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13546464
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie139e47e53088b7ce76fe45062c781cde3eb3af9
2021-02-16 15:52:32 +00:00
Alex Johnston
7d4db750e6
Disallow modifying USB in Settings
...
Background
* The admin can disable signaling over USB
on corporate owned device.
Changes
* If the admin has disabled signaling over
USB, disable preferences in Settings to
modify USB.
* Show policy transparency dialogs.
Manual Testing:
* Install TestDPC
* Set up as Device Owner
* Disable USB data signaling
* Verify Settings > Connected Devices
> USB is disabled
* Verify Settings > Network & Internet
> Hotspot & tethering > USB tethering
is disabled
* Verify Developer options >
USB debugging, default USB configurations
and USB audio routing are disabled
Bug: 168301639
Test: Manual Testing
make RunSettingsRoboTests -j ROBOTEST_FILTER=TetherSettingsTest
make RunSettingsRoboTests -j
ROBOTEST_FILTER=UsbAudioRoutingPreferenceControllerTest
make RunSettingsRoboTests -j
ROBOTEST_FILTER=UsbDefaultFragmentTest
make RunSettingsRoboTests -j
ROBOTEST_FILTER=DevelopmentSettingsDashboardFragmentTest
make RunSettingsRoboTests -j
ROBOTEST_FILTER=DefaultUsbConfigurationPreferenceControllerTest
make RunSettingsLibRoboTests -j
ROBOTEST_FILTER=EnableAdbPreferenceControllerTest
Change-Id: I3e8461ac37f406a407c874598335cde28fb89b2d
Merged-In: I3e8461ac37f406a407c874598335cde28fb89b2d
2021-02-16 15:29:49 +00:00
TreeHugger Robot
3deffe9f04
Merge "Fix SettingsActivity name" into sc-dev
2021-02-16 15:07:56 +00:00
TreeHugger Robot
81bc71a861
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 73fe82071d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13573184
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ife511038ece8c6b99a9e9195ea047c711e02869d
2021-02-16 09:04:05 +00:00
TreeHugger Robot
73fe82071d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-02-16 08:36:24 +00:00
Bill Yi
a38dbb908f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idb0bb381925e39f50a95c86e5cf1cbd0e06796eb
2021-02-15 08:13:48 +00:00
Ben Chung
6535474424
Update accessibility settings layout am: 478db86589
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13517006
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I27de16fa17eac2ae05d72b325eb66ec4126132d2
2021-02-14 18:52:52 +00:00
Ben Chung
478db86589
Update accessibility settings layout
...
Accessibility settings category restructure
1. Add caption category fragment for related accessibility services.
2. Remove experimental category.
Bug: 174829936
Test: atest AccessibilitySettingsTest
Change-Id: I13b1ed62afe0634329d1e340ba154454640fadd6
2021-02-14 15:11:59 +00:00
TreeHugger Robot
199ee08881
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 380d004b6c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13561577
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf116875f5e2de1ce931a8c4975569d98cf59531
2021-02-13 21:27:53 +00:00
TreeHugger Robot
380d004b6c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-02-13 21:00:44 +00:00
TreeHugger Robot
2d4fadb13c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c27fab1d5e -s ours am: af061ae9e1 -s ours am: 3a09a2cda2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13559497
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I01840a6ad9a02f4a977b73f905dfb5705d27463d
2021-02-13 19:39:02 +00:00
Bill Yi
943c0452a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf789f35a -s ours am: d3ee559603 -s ours am: 9172c947b6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13561669
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I757108efa79f398b9f95be23306ee24b58709987
2021-02-13 19:38:52 +00:00
TreeHugger Robot
3a09a2cda2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c27fab1d5e -s ours am: af061ae9e1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13559497
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2bf0c191de51029dbfef6a484475701dd04f982a
2021-02-13 19:26:06 +00:00
Bill Yi
9172c947b6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf789f35a -s ours am: d3ee559603 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13561669
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I93350bdec9f8e3f42dbb33b6f856d91c78739c11
2021-02-13 19:25:58 +00:00
Bill Yi
4c696451f9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1c109b18f -s ours am: bdcdfac39c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13559495
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I57f7dcae96383ee527572eaa92b92ed4d01be3d3
2021-02-13 19:23:36 +00:00
TreeHugger Robot
af061ae9e1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c27fab1d5e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13559497
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I061359a6ab7e65349f93ef6b0ebc5dd145623217
2021-02-13 18:32:45 +00:00
Bill Yi
d3ee559603
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf789f35a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13561669
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4676a7e5b838ff558ecd79f3ea1e3f2159c7048d
2021-02-13 18:32:38 +00:00
Bill Yi
bdcdfac39c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1c109b18f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13559495
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia3d1fc9eb229a7279789e1d832a85107755499a4
2021-02-13 18:32:17 +00:00
TreeHugger Robot
c27fab1d5e
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-02-13 17:54:17 +00:00
Peter Kalauskas
a9a34673b2
Merge "Revert "Update icons and text for guest user"" into sc-dev am: d7af6821dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13554661
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I049b584d87bfda0f5bc479448d0481881b337b3f
2021-02-12 17:28:31 +00:00
Peter Kalauskas
d7af6821dc
Merge "Revert "Update icons and text for guest user"" into sc-dev
2021-02-12 17:26:47 +00:00
Chloris Kuo
bdb967c756
Merge "Remove Feedback UI Settings" into sc-dev am: da031064c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13556692
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If7b189201fb37be2ae652b5155e94068cfc07289
2021-02-12 17:16:30 +00:00
Chloris Kuo
da031064c6
Merge "Remove Feedback UI Settings" into sc-dev
2021-02-12 17:11:30 +00:00
Bill Yi
acf789f35a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9f6118a293ecb1c5d671398e9253e8908cf18c94
2021-02-12 04:56:56 -08:00
Bill Yi
de0c91786a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1e836778f9c8ad88a60c316cf6bd246c48c007d8
2021-02-12 11:45:30 +00:00
Bill Yi
f532cdefb0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9adb00d0640a1550bf967bc70baae11bcc7ee605
2021-02-12 09:25:35 +00:00
Bill Yi
e1c109b18f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I92331438bfe6ec4d779d6238a9892f6d1cb72de1
2021-02-12 08:02:38 +00:00
Julia Reynolds
e50ffd6366
Merge "Add package filtering to NLSes" into sc-dev am: 776919fc0a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13499641
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I99f7c44b694bde8b682a6dade3f5406b650b702d
2021-02-12 04:48:15 +00:00
Julia Reynolds
776919fc0a
Merge "Add package filtering to NLSes" into sc-dev
2021-02-12 02:16:52 +00:00
Chloris Kuo
c22654c075
Remove Feedback UI Settings
...
remove settings from developers option and use deviceconfig to control
Test: manual on device
Bug: 180057146
Change-Id: Ic72d0f49e6f47aaeb541b997779d2cd66ca2b287
2021-02-11 17:21:01 -08:00
Peter Kalauskas
06b235e497
Revert "Update icons and text for guest user"
...
Revert submission 13278947-new-guest-user-strings
Reason for revert: Use same strings and text as Android R
Reverted Changes:
I8e9b7992d:Update icons and text for guest user
I42c0b46fd:Update icons and text for guest user
Bug: 169783558
Change-Id: Id038ec708e9098c856c4d24ae55a3b7e2bad391d
2021-02-11 22:29:38 +00:00
Julia Reynolds
20814ed5c7
Add package filtering to NLSes
...
Now users can prevent a given notification listener from seeing
notifications from particular apps.
Test: settings unit tests
Bug: 173052211
Change-Id: Ia868d6dc2da1ae7f75c0dca47034e28910584acd
2021-02-11 19:00:57 +00:00
TreeHugger Robot
bca31c4c62
Merge "[FakeUid] BatteryStats.getCustomMeasuredEnergiesMicroJoules()" into sc-dev am: 76971db7bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13547202
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I66ed4953ebcdbd66b8cfa5d6073aadc2d499eb0f
2021-02-11 17:58:30 +00:00
TreeHugger Robot
76971db7bb
Merge "[FakeUid] BatteryStats.getCustomMeasuredEnergiesMicroJoules()" into sc-dev
2021-02-11 17:42:30 +00:00
TreeHugger Robot
c0394c2ba7
Merge "Use InternalActivity when ForceVerifyPath is set" into sc-dev am: 6ef5f04d95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13552669
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8e2ede820e427f2d18282cc2b3f6a79ff62b8002
2021-02-11 14:46:30 +00:00
TreeHugger Robot
6ef5f04d95
Merge "Use InternalActivity when ForceVerifyPath is set" into sc-dev
2021-02-11 14:23:26 +00:00
Rubin Xu
11ba18ad94
Use InternalActivity when ForceVerifyPath is set
...
ConfirmLockPassword enforces that ForceVerifyPath
can only be set when caller is launching InternalActivity,
so the builder needs to launch that activity instead.
This is regressed from Idf6fcb43f7497323d089eb9c37125294e7a7f5dc
Bug: 179172552
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: I8e03fc69c4748d09f17c29edaa77594e233f79ea
2021-02-11 12:40:09 +00:00
SongFerng Wang
a836735535
Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" into sc-dev am: 374ae167e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13515168
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2552756df631eb10a7418c36623c9957dc5bfa8d
2021-02-11 08:50:32 +00:00
SongFerng Wang
374ae167e1
Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" into sc-dev
2021-02-11 08:28:21 +00:00
Rahul Sabnis
faa3647257
Skips the bluetooth consent pairing dialog if the device has recently been
...
associated with the companion app that requested the bond through CDM
Bug: 172006481
Test: Manual
Change-Id: I9a8ae1c3c7aed46295e7b0958b5c1b59960e3a26
2021-02-10 21:25:36 +00:00