Commit Graph

14635 Commits

Author SHA1 Message Date
Stanley Wang
19056c229c Fix the problem that the "Turn off SIM" dialog will be displayed
when the MobileNetwork page is slid to to top.

- Update the onBindViewHolder method of
  SettingsMainSwitchPreference. The root cause is that the
  onBindViewHolder method reset the visibility state of the
  SwitchBar.

Fix: 190652161
Test: robotest and test MobileNetwork page manually.
Change-Id: If0a75579fd4bf0fe987ce5d11d2f11d10f4bc43c
2021-06-15 14:44:22 +08:00
Wesley Wang
027d900daf Merge "Make App info page support new battery entry" into sc-dev am: f2a884b8be am: f294981a7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800151

Change-Id: Ia289536f84e1b0d6423c9dda42de5c52aeb0ef15
2021-06-15 05:12:05 +00:00
Wesley Wang
f2a884b8be Merge "Make App info page support new battery entry" into sc-dev 2021-06-15 04:41:16 +00:00
Weng Su
28e5f4c2fc Revert "[Provider Model] Add WiFi toggle in internet panel"
This reverts commit 04a4060225.

Reason for revert: Need to split the functions for cherry picking to different branches

Bug: 189912933
Change-Id: I8c30a87c83e23b3df88ce2689d500626e1dd28d2
2021-06-15 04:10:13 +00:00
TreeHugger Robot
bd4ea47f6d Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759 am: e919947ad0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: I61d13da7ba7f6edb6a19b790efc9543065b15c28
2021-06-15 01:26:45 +00:00
TreeHugger Robot
052ae78759 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev 2021-06-15 00:57:46 +00:00
Jason Chang
3ab0d7b1b9 Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev am: 5213fbced1 am: 7e61c806e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14804130

Change-Id: I0ba93c73c85b9c8120ed23fa3642921fe73fe87f
2021-06-12 12:06:55 +00:00
Jason Chang
5213fbced1 Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev
* changes:
  Update key visual changes for one handed mode settings
  Remove redundant swipe down notification and one handed sub settings
2021-06-12 11:49:16 +00:00
TreeHugger Robot
5b4f9e63dc Merge "[Provider Model] Add WiFi toggle in internet panel" into sc-dev am: 38df9ce8bb am: 2ba6886bce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880638

Change-Id: I577afae3fa5b5c952a265951f66fccb183d45fcc
2021-06-12 11:07:24 +00:00
Weng Su
c4eb3b1320 [Provider Model] Hide W+ network if it's inactive
Bug: 187854575
Test: manual test
atest -c CarrierWifiTogglePreferenceControllerTest \
         SubscriptionsPreferenceControllerTest

Change-Id: Ib99bc7fef38a99c1da1e365c2002ad30c617d445
2021-06-12 00:55:10 +00:00
Weng Su
04a4060225 [Provider Model] Add WiFi toggle in internet panel
- Move Wi-Fi toggle from menu button to slice row

- Remove Wi-Fi disconnect action

- Show scanning sub-title once only

Bug: 189912933
Test: manual test
atest -c InternetConnectivityPanelTest \
         ProviderModelSliceTest

Change-Id: I2baf05362f5cd0a8ce94c7b3b2b112a7e9fe6894
2021-06-12 00:53:52 +00:00
Syaoran Kuo
956b03d3d8 Fix resource id not match issue.
Bug: 187485845
Test: atest com.android.settings.notification.AppNotificationComponentTest
Change-Id: I4b094dd430127046e08cb1b87706906807c28b32
2021-06-11 17:02:34 +08:00
Bill Lin
3ae771d04a Integrate One handed mode shortcut preference
1) Update AccessibilityShortcutPreferenceFragment extends
   DashboardFragment
2) OneHandedSettings extends AccessibilityShortcutPreferenceFragment
   for shortcut feature
3) Add General Category above shortcut preference

Test: Settings > System > Gesture > One handed mode
Test: Settings > A11y > System Controls > One handed mode
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings
      .OneHandedShortcutPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings
      .OneHandedShortcutPreferenceFragmentTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings
      .OneHandedActionPullDownPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings
      .OneHandedActionShowNotificationPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings
      .OneHandedSettingsUtilsTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings
      .AccessibilityShortcutPreferenceFragmentTest"

Bug: 182425480
Change-Id: I653388beea422e9bf47fd3240367fb374d6f0025
2021-06-11 16:13:59 +08:00
TreeHugger Robot
443a3f03ab Merge "Revert "[Provider Model] Replace WiFi panel to Internet panel"" into sc-dev 2021-06-11 06:35:02 +00:00
Suprabh Shukla
3f5bd0931e Changes to 'Alarms & reminders' permission setting
Not showing apps that are targeting SDK < 31, because the change is not
enabled for them.

Now alarm manager service manages killing the process whenever the
permission gets revoked, so we don't need to do it here.
This also lets us kill the app on "Reset app preferences" if needed.

Adding the preference under "Advanced" in the app info page so it
appears for apps that have requested this permission.

Test: atest SettingsUnitTests:AppStateAlarmsAndRemindersBridgeTest
make -j64 RunSettingsRoboTests \
ROBOTEST_FILTER="AlarmsAndRemindersDetailsTest|
AlarmsAndRemindersDetailPreferenceControllerTest"

Manually:
- There should be no observable difference in behavior when
toggling the setting. ActivityManager logs should still indicate that
the app is killed when the permission is revoked.
- "Alarms & Reminders" should appear under "Advanced" when looking at
the app info detail of an app that appears under "Alarms & reminders"
special app access page.

Bug: 179541791
Bug: 190070171
Change-Id: I2d437cec10ee10e4326fb25b2820de9ef9c31c67
2021-06-10 22:53:05 -07:00
TreeHugger Robot
7bba656513 Merge "Fix Learn more link placement is wrong problem" into sc-dev am: 8dca5ab699 am: 14594156b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928761

Change-Id: I5afa0971ae60ea78706c736e5fd5916ad436a1a4
2021-06-11 01:56:13 +00:00
TreeHugger Robot
8dca5ab699 Merge "Fix Learn more link placement is wrong problem" into sc-dev 2021-06-11 01:23:43 +00:00
Quang Luong
91dcd42319 Add WifiTrackerLib as separate dependency from SettingsLib
WifiTrackerLib should be removed from SettingsLib to avoid tying it to
SettingsLib's min_sdk_version. Modules that need WifiTrackerLib should
now explicitly add it as a static_lib.

Bug: 187099809
Test: build, make RunSettingsRoboTests
ROBOTEST_FILTER=WifiEntryPreferenceTest

Change-Id: I09b7cad0b3b17ba1a24c1200b7ea3255ca4e227f
2021-06-10 14:33:05 -07:00
Wesley.CW Wang
e1b1f67681 Make App info page support new battery entry
- Add new battery entry to app info battery preference, support both
 legacy and new args, controlled by P/H
 - Add a method to check is work profile app or not, use owner context to
 query correct context for feature provider
 - Add string for new args

Bug: 178197718
Test: make RunSettingsRoboTests
Change-Id: Ic93142a0c5e2851917cb3e224340a6e3e81fd801
2021-06-11 04:41:12 +08:00
TreeHugger Robot
bc0da34026 Merge "Check in auto rotate settings summary for rotation resolver service" into sc-dev am: ad84b3dd39 am: 9004a9797c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14830090

Change-Id: Ia8ae5456b0830fb89ec6ea0dab3f52d5a47e7778
2021-06-10 19:40:30 +00:00
Jason Chang
76d6d66353 Update key visual changes for one handed mode settings
Follow new visual UI to change the design.

Bug: 175851783
Bug: 188868459
Bug: 189001678

Test: manual verified on Settings > System > Gesture page
> System controls page
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedEnablePreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedMainSwitchPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedActionPullDownPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedActionShowNotificationPrefControllerTest"

Change-Id: I86535fd9f49726c7234353032b950640346a02c5
2021-06-11 03:30:10 +08:00
Jason Chang
1c310ef44b Remove redundant swipe down notification and one handed sub settings
1. Remove "Swipe down for notification" item code.
2. Remove "Exit when switching apps & "Timeout" items code.

Bug: 175851783

Test: build & verify Settings > System > Gestures
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedEnablePreferenceControllerTest"

Change-Id: I77be5ff5542f6310fa0b9649ddfc1d3c16fa4261
2021-06-11 03:30:10 +08:00
TreeHugger Robot
ad84b3dd39 Merge "Check in auto rotate settings summary for rotation resolver service" into sc-dev 2021-06-10 18:35:43 +00:00
Abel Tesfaye
5131c691b5 Check in auto rotate settings summary for rotation resolver service
Fixes issue where summary text would not properly describe the state of
camera based auto rotation when permission is missing or when another state is blocking the feature

Bug: 190095500
Test: locally with flame & make RunSettingsRoboTests -j$(nproc) ROBOTEST_FILTER=SmartAutoRotatePreferenceControllerTest
Change-Id: I7609ca87658e08831f3bc37c839f00f63946ddec
2021-06-10 17:31:39 +00:00
Dmitri Plotnikov
4f2465b209 Merge "Fix missing time-in-foreground and time-in-background for some apps" into sc-dev am: 6c09370c43 am: 57a55c9be1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14911672

Change-Id: Ib96c88a68ff34951f78aaedd766241f9281d87de
2021-06-10 16:38:13 +00:00
Jack Yu
9deb600326 Add a developer option to increase nfc stack log level
Easier to increase nfc stack log level.

Bug: 187083201
Test: enable/disable from developer option and check nfc log
Change-Id: I0675cbd535a2faf3b77b2842b03b7fb3b1b782fa
2021-06-11 00:37:14 +08:00
Dmitri Plotnikov
6c09370c43 Merge "Fix missing time-in-foreground and time-in-background for some apps" into sc-dev 2021-06-10 16:10:42 +00:00
YUKAI HUNG
0c930affaf Merge "Ignore the flaky test in the ConvertUtils first to investigate" into sc-dev am: 394211dd75 am: a9d833f6ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928763

Change-Id: I3ef02087aa44ed37fc877cad8bd76d49ef8d8674
2021-06-10 12:42:13 +00:00
Weng Su
908d4ffadf Revert "[Provider Model] Replace WiFi panel to Internet panel"
This reverts commit c33f69673a.

Reason for revert: Because Wi-Fi toggle design is rollback, resume the Wi-Fi panel as well.

Bug: 190563749
Merged-In: Ia214ff9abaa7f4f33c485ca9aa72f73749ce7fc3
Change-Id: Ia214ff9abaa7f4f33c485ca9aa72f73749ce7fc3
(cherry picked from commit 368852424c)
2021-06-10 12:23:38 +00:00
YUKAI HUNG
394211dd75 Merge "Ignore the flaky test in the ConvertUtils first to investigate" into sc-dev 2021-06-10 12:18:53 +00:00
Sunny Shao
a6eb37b215 Fix Learn more link placement is wrong problem
- Use the new style of the FooterPreference.

Fixes: 189389674
Test: Robo test
Change-Id: I1529952181cca0eccd18f911eaa265b19dbb97f7
2021-06-10 20:14:56 +08:00
ykhung
671405b6d3 Ignore the flaky test in the ConvertUtils first to investigate
Bug: 190689531
Test: make SettingsRoboTests
Change-Id: Icf4fdd98d087f3e693a33d63030bec880648c356
2021-06-10 17:33:08 +08:00
Kholoud Mohamed
387ce6027f Merge "Fix failing tests" into sc-dev am: 4ee8d6de71 am: 1f9329d010
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881549

Change-Id: Iabfb988437d0afeb47280c86692e3e3e6f9c81be
2021-06-10 09:25:19 +00:00
Kholoud Mohamed
4ee8d6de71 Merge "Fix failing tests" into sc-dev 2021-06-10 08:55:12 +00:00
TreeHugger Robot
ba0325cbae Merge "Fix broken tests for main clear pages" into sc-dev am: 554eaf72b0 am: 4868bf6f2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912505

Change-Id: Ia7a5fc2ab423078ddfc05eee96637c7bd60a3585
2021-06-10 07:50:48 +00:00
TreeHugger Robot
554eaf72b0 Merge "Fix broken tests for main clear pages" into sc-dev 2021-06-10 07:22:38 +00:00
Mill Chen
491bc21fd4 Remove the duplicated skip lock screen setting
Fix: 187366696
Test: robotests
Change-Id: I063ef7c1a43e16aee6d141389896cadecfd3738f
2021-06-10 14:20:44 +08:00
Dmitri Plotnikov
1afe9c0ddc Fix missing time-in-foreground and time-in-background for some apps
The gist of the issue is that many apps have two UIDs associated
with them: a regular, "real" UID, e.g. 10123, and a shared group GID,
e.g. 50123, which is used for multiuser support.

Prior to this fix, the code in BatteryAppListPreferenceController,
would go over the list of all UidBatteryConsumers and would randomly
encounter either the "real" UID or the shared GID for each app first.
The UidBatteryConsumer for a shared GID does not have all of the
properties of the real UID, so some information, such as
time-in-foreground and time-in-background would be lost with
a high probability.

After this fix, we process "real" UIDs before shared GIDs ensuring
that time-in-* and other properties such as package names are obtained
for the real UID.  When we later encounter a shared GID for the same app,
we just add the consumed power and time-in-* durations to the real UID's
BatteryEntry.

Bug: 188656360
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: I4bfea813ac5eb8f866804b2c4a9153eb877fb325
2021-06-10 05:58:15 +00:00
TreeHugger Robot
29d0c3c5dc Merge "Fix shifting problem in location services page" into sc-dev am: c547c43977 am: 86233cd3ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912504

Change-Id: I420a1816d466a88b85e936922fac3e45dfdb0213
2021-06-10 05:52:55 +00:00
TreeHugger Robot
c547c43977 Merge "Fix shifting problem in location services page" into sc-dev 2021-06-10 05:25:16 +00:00
Tom Hsu
b52f7484be Merge "[Settings] Disable gear button if user is not admin." into sc-dev am: a2a570f60b am: 979e486314
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819346

Change-Id: I65fe0a09a754637ece40a57eacc8b1c05741bf19
2021-06-10 04:29:08 +00:00
Tom Hsu
a2a570f60b Merge "[Settings] Disable gear button if user is not admin." into sc-dev 2021-06-10 04:00:12 +00:00
Tsung-Mao Fang
cbf5ccab0e Fix shifting problem in location services page
Controller generates the injection location settings
in updateState() which happens in onResume.
That's the primary reason why we observed the shifting issue.

In a good practice, we generate preference in displayPreference(),
and then update the setting state in updateState().

In this cl, we create a base controller class to encapsulate
most implementation, and developer need to inject location
services in child class.

Test: Add work profile, and see correct services list.
Bug: 183169265
Change-Id: I5735ba974da87ad83b56791abd8a8637c2317571
2021-06-10 11:26:23 +08:00
Weng Su
1b11a28709 Merge "Revert "[Provider Model] Replace WiFi panel to Internet panel"" 2021-06-10 03:17:01 +00:00
Julia Reynolds
0718ee6309 Merge "Update method name" into sc-dev am: a2c2889c78 am: 77b60fb6c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14919903

Change-Id: I1af02eea2b6f94341b4e61807a89a67af05061f5
2021-06-09 18:45:26 +00:00
Weng Su
368852424c Revert "[Provider Model] Replace WiFi panel to Internet panel"
This reverts commit c33f69673a.

Reason for revert: Because Wi-Fi toggle design is rollback, resume the Wi-Fi panel as well.

Bug: 190563749
Change-Id: Ia214ff9abaa7f4f33c485ca9aa72f73749ce7fc3
2021-06-09 17:49:27 +00:00
Julia Reynolds
a2c2889c78 Merge "Update method name" into sc-dev 2021-06-09 17:33:23 +00:00
TreeHugger Robot
469caaf49e Merge changes from topic "free_up_space_card_preference" into sc-dev am: a23533cbdd am: 0dc2fde11e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909652

Change-Id: Id9975e632d7eb3f0159aa4f1aa80ce92b7db5d78
2021-06-09 17:19:55 +00:00
TreeHugger Robot
a23533cbdd Merge changes from topic "free_up_space_card_preference" into sc-dev
* changes:
  Tweak UI of CardPreference and ContextualCard
  'Free up space' uses CardPreference
2021-06-09 16:45:54 +00:00
kholoud mohamed
be0a96bd23 Fix failing tests
Fixed failing tests in InteractAcrossProfilesDetailsTest and removed
unused code in InteractAcrossProfilesSettingsTest.

Test: atest com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetailsTest
Test: atest com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesSettingsTest
Fixes: 190186823
Change-Id: I52c498b9eb9c09401548e557770cd6434de49a2c
2021-06-09 14:11:56 +00:00