PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,441 Commits 1 Branch 0 Tags
960644dff57a6f5b0149bccdaf0d5d02e3b4ef42
Commit Graph

79441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
960644dff5 [automerger skipped] Merge changes I62c58967,I1dd57fa2 am: 20e39131c9 am: 72b557ac6a am: d558605aeb -s ours am: 9561f091e1 -s ours 
am skip reason: Change-Id I62c589679052b276927d057d3d5d084bbfb57626 with SHA-1 cacf9aa485 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic021d9c984218c0503bf03cbe9ec3a5024a02f56
 2021-02-18 18:06:14 +00:00
Lorenzo Colitti
b10eae37a4 [automerger skipped] Stop using ConnectivityManager for VPNs. am: 1434c08600 am: cd7a7d20a1 am: 927ff0169f -s ours am: 2d6fc470ef -s ours 
am skip reason: Change-Id I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff with SHA-1 5c9a042370 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I828521a4f1c0e5e5ff975e809b076a5136897aec
 2021-02-18 18:06:12 +00:00
Treehugger Robot
9561f091e1 [automerger skipped] Merge changes I62c58967,I1dd57fa2 am: 20e39131c9 am: 72b557ac6a am: d558605aeb -s ours 
am skip reason: Change-Id I62c589679052b276927d057d3d5d084bbfb57626 with SHA-1 cacf9aa485 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97017df7c6a222880da0c83da29c3876ebf8ac83
 2021-02-18 17:46:32 +00:00
Lorenzo Colitti
2d6fc470ef [automerger skipped] Stop using ConnectivityManager for VPNs. am: 1434c08600 am: cd7a7d20a1 am: 927ff0169f -s ours 
am skip reason: Change-Id I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff with SHA-1 5c9a042370 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27a49c8a958d4823efae43fe62e0171f500f4ba9
 2021-02-18 17:46:29 +00:00
Treehugger Robot
d558605aeb Merge changes I62c58967,I1dd57fa2 am: 20e39131c9 am: 72b557ac6a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1593774

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I216766fc245cdefacda920dcdde56c0d50f6d6b6
 2021-02-18 17:09:56 +00:00
Lorenzo Colitti
927ff0169f Stop using ConnectivityManager for VPNs. am: 1434c08600 am: cd7a7d20a1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1592132

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie612e6ca5f73330b99f64054a718500647100f42
 2021-02-18 17:09:55 +00:00
Treehugger Robot
72b557ac6a Merge changes I62c58967,I1dd57fa2 am: 20e39131c9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1593774

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibae0be639bd6f0a4af5cc108d750c5f77321e6d7
 2021-02-18 16:53:39 +00:00
Lorenzo Colitti
cd7a7d20a1 Stop using ConnectivityManager for VPNs. am: 1434c08600 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1592132

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I963c04fcf90280bc96a5daa8170dad772a5db955
 2021-02-18 16:53:28 +00:00
TreeHugger Robot
9639db8079 Merge "Fix broken tests" into sc-dev am: cdcd94919c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13614887

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9def241fadb0cc46f4dd2a3b69259bd5b6162931
 2021-02-18 16:53:09 +00:00
TreeHugger Robot
cdcd94919c Merge "Fix broken tests" into sc-dev 2021-02-18 16:27:10 +00:00
Treehugger Robot
20e39131c9 Merge changes I62c58967,I1dd57fa2 
* changes:
  Remove ConnectivityManager from EnterprisePrivacyFeatureProvider.
  Stop using ConnectivityManager for VPNs.
 2021-02-18 15:47:13 +00:00
Lorenzo Colitti
65128bab08 Remove ConnectivityManager from EnterprisePrivacyFeatureProvider. 
It is only used in GlobalHttpPreferenceController. Move it there.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I62c589679052b276927d057d3d5d084bbfb57626
Merged-In: I62c589679052b276927d057d3d5d084bbfb57626
 2021-02-18 23:51:11 +09:00
Lorenzo Colitti
1434c08600 Stop using ConnectivityManager for VPNs. 
These methods have all moved to VpnManager.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
Merged-In: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
 2021-02-18 23:50:59 +09:00
TreeHugger Robot
1a64da8951 Merge "Restructure app info page" into sc-dev am: fcdd955dff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13482645

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d83ecb4dcd4d7ca565d3e63936a02c82648a75a
 2021-02-18 11:20:37 +00:00
TreeHugger Robot
fcdd955dff Merge "Restructure app info page" into sc-dev 2021-02-18 11:03:38 +00:00
Lorenzo Colitti
aefa6f3983 Merge "Remove ConnectivityManager from EnterprisePrivacyFeatureProvider." into sc-dev am: 693fcb5913 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13609302

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84f10ce634d027e9890bbd7177b3b50214253d52
 2021-02-18 11:01:22 +00:00
TreeHugger Robot
d5acb14e75 Merge "Stop using ConnectivityManager for VPNs." into sc-dev am: c9197ec51b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13609293

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf8cff448a6644f59a8bacbc2f9afa88ce644c29
 2021-02-18 11:00:03 +00:00
Lorenzo Colitti
693fcb5913 Merge "Remove ConnectivityManager from EnterprisePrivacyFeatureProvider." into sc-dev 2021-02-18 10:45:22 +00:00
TreeHugger Robot
c9197ec51b Merge "Stop using ConnectivityManager for VPNs." into sc-dev 2021-02-18 10:28:19 +00:00
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
6e3343f522 Merge "Fix WiFi show "Not connected" always issue" into sc-dev am: a4fa394b07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13519005

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04a7ab372a4e403fd0917a9e82e299f44e595c09
 2021-02-18 10:09:46 +00: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
d514134fc5 Merge "Change SIM dialog activity theme" into sc-dev am: 178081cf83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13536591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0dc4fb73da8e0bf4d4c3c3fb302f33c4af0bc6e6
 2021-02-18 09:43:31 +00:00
TreeHugger Robot
178081cf83 Merge "Change SIM dialog activity theme" into sc-dev 2021-02-18 09:18:37 +00:00
Jiashen Wang
064ee3107d Merge "Fix the notification issue after pSIM is auto enabled" into sc-dev am: e74e93b31e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13564226

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1315a8ed2563f53aa16eb0d11f0ff1c0011ca093
 2021-02-18 07:49:09 +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
7061a32c54 Update new owners for battery pages. am: 9a90dc1e8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13609225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e8ef756b93d63334914ce0ffb79d4c311256c50
 2021-02-18 04:06:28 +00:00
Tsung-Mao Fang
9a90dc1e8e Update new owners for battery pages. 
Change-Id: I330d074c6e504493abf4cece51199ec5851b5d3b
 2021-02-18 01:27:27 +00:00
Yomna Nasser
c84fea5f37 Merge "Adds Enable2gPreferenceController and unit tests." into sc-dev am: 977513924c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13534046

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7299d41ccc1df63fb1e04ef512a2f256323923a1
 2021-02-18 00:13:20 +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
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