Commit Graph

79622 Commits

Author SHA1 Message Date
Tsung-Mao Fang
772477af1c Fix broken tests
1) Remove AssistantFeedbackPreferenceController since it didn't use.
2) Refine the AssistantFeedbackPreferenceControllerTest, we need to use
vpn manager object now. (See ag/13519006)

Test: Run robo test
Fix: 180576544
Change-Id: I719711d83201d571427b9f46a6026e0831cddab6
2021-02-18 10:23:25 +00:00
Weng Su
64cf59bad3 [Provider Model] UI wording change
- Update the summary of Ethernet network
  "To switch networks, disconnect ethernet"

- Update the summary of data usage for non-carrier networks
  "Excludes data used by carrier networks"

- Update the title of Network preferences
  "Network preferences"

- Screenshot:
  https://screenshot.googleplex.com/62URXVwUJbSXKko
  https://screenshot.googleplex.com/AeZDG2HmkmUkeHd

Bug: 178473018
Bug: 178474159
Bug: 178886957
Test: manual test
Change-Id: Id9ed11ed5cc2db329556bf64a13f21999dcdb151
2021-02-18 18:22:19 +08:00
Weng Su
a4fa394b07 Merge "Fix WiFi show "Not connected" always issue" into sc-dev 2021-02-18 09:55:18 +00:00
TreeHugger Robot
178081cf83 Merge "Change SIM dialog activity theme" into sc-dev 2021-02-18 09:18:37 +00:00
Lorenzo Colitti
cacf9aa485 Remove ConnectivityManager from EnterprisePrivacyFeatureProvider.
It is only used in GlobalHttpPreferenceController. Move it there.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I62c589679052b276927d057d3d5d084bbfb57626
2021-02-18 16:44:53 +09:00
Jiashen Wang
e74e93b31e Merge "Fix the notification issue after pSIM is auto enabled" into sc-dev 2021-02-18 07:12:31 +00:00
Lorenzo Colitti
5c9a042370 Stop using ConnectivityManager for VPNs.
These methods have all moved to VpnManager.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
2021-02-18 16:02:08 +09:00
Tsung-Mao Fang
9a90dc1e8e Update new owners for battery pages.
Change-Id: I330d074c6e504493abf4cece51199ec5851b5d3b
2021-02-18 01:27:27 +00:00
Abel Tesfaye
ed7673eadd Check for available rotation resolver service and camera permission before showing setting for face based auto-rotation
Test: locally with crosshatch & make -j64 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.display.SmartAutoRotateControllerTest"

Bug: 172857585
Change-Id: I825b0c2471c71a3de59532b39a47c5442f234fb5
2021-02-18 00:18:47 +00:00
Yomna Nasser
977513924c Merge "Adds Enable2gPreferenceController and unit tests." into sc-dev 2021-02-17 23:44:43 +00:00
Jiashen Wang
15e7a0bce4 Fix the notification issue after pSIM is auto enabled
Bug: 179933905
Test: Manually tested
Change-Id: I52a751c515785618c9a1a5f3bc571687731b4552
2021-02-17 20:42:52 +00:00
Yomna Nasser
6d65cb995b Adds Enable2gPreferenceController and unit tests.
Adds (1) Enable2gPreferenceController, the controller for the
"Enable 2G" toggle, and (2) Enable2gPreferenceControllerTest,
the corresponding unit tests.

Test: manul & atest -c Enable2gPreferenceControllerTest
Bug: b/163168917
Change-Id: Ib827cfcfd96fdea77b586c92ae0ec5b2bd5818c3
2021-02-17 20:08:41 +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
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
5a2a19deae Merge "Use location access for recent location apps." into sc-dev 2021-02-16 22:08:45 +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
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
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
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
380d004b6c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-13 21:00:44 +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
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
Bob Badour
6695ff84d9 [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings
Added SPDX-license-identifier-Apache-2.0 to:
  Android.bp
  protos/Android.bp
  tests/anomaly-tester/Android.bp
  tests/perftests/Android.bp
  tests/robotests/Android.bp
  tests/uitests/Android.bp
  tests/unit/Android.bp
  tests/unit/InstrumentedEntitlementApp/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I81f11a66b5977cb5096e262819084706af5fa54c
2021-02-12 17:08:01 -08: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
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
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
76971db7bb Merge "[FakeUid] BatteryStats.getCustomMeasuredEnergiesMicroJoules()" into sc-dev 2021-02-11 17:42: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
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
Adam Bookatz
738376dbaa [FakeUid] BatteryStats.getCustomMeasuredEnergiesMicroJoules()
Fake Uid.getCustomMeasuredEnergiesMicroJoules() for new BatteryStats API.

Bug: 179107328
Bug: 174818228

Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsNoteTest
Test: atest FrameworksCoreTests:com.android.internal.power.MeasuredEnergyStatsTest
Change-Id: Id55d52cad6622289aa0f39cfdb24799cac393878
2021-02-10 13:18:43 -08:00
Fabian Kozynski
662de5311d Fix SettingsActivity name
The name now matches that in the manifest

Test: manual, launch through intent
Bug: 179920615
Change-Id: I9c2ab90c66e97dffaac15dc522758d3e6dd9f2d5
2021-02-10 14:47:50 -05:00
Jiashen Wang
f49a21d78d Change SIM dialog activity theme
Bug: 153811431
Bug: 170508680
Test: Test manually
Change-Id: Ifc5697a3cc80b3e74144a67c5847820ee15bd2fa
2021-02-09 16:45:26 -08:00
Peter Kalauskas
2b9f139a2d Merge "Revert "Revert "Revert "Show "Add users from lock screen" dependent on secure lock screen."""" into sc-dev 2021-02-09 23:03:09 +00:00