Commit Graph

80368 Commits

Author SHA1 Message Date
Andras Kloczl
0e9cbfc86e Prevent using invalid result uri during multi user image change am: 07e414017c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98dd17745edd2e700169959537e640a33b81e07b
2021-03-11 10:24:24 +00:00
Andras Kloczl
94872d6be0 [automerger skipped] Prevent using invalid result uri during multi user image change am: e36357b20c -s ours
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 07e414017c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58a14824bee13043f07ced00fd31bae1a6d14526
2021-03-11 10:24:19 +00:00
Andras Kloczl
373b53a7cc [automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c374ecf934e3356f6d656908dab6f02ab215763
2021-03-11 10:24:17 +00:00
András Klöczl
f1125282f9 Merge "Prevent using invalid result uri during multi user image change" into pi-dev 2021-03-11 09:48:07 +00:00
TreeHugger Robot
4082b27b0a Merge "Declare activities for factory reset pages" into sc-dev 2021-03-11 09:05:58 +00:00
Mill Chen
b0548113d2 Fix no apps text overlapping with filter bar
Since Settings UI has been changed and the filter bar will be staying
in a fixed place, the "no apps" text will be overlapped with filter bar.
To make the text seperate from filter bar, the string will be put
in the bottom of text view.

Fixes: 182173848
Test: visual verified
1) Settings -> Notifications -> See all from last 7 days -> select
Turned off on filter bar
2) Observe and see if the "no apps" is overlapping with filter bar

Change-Id: Ib99bb5122fb72f05a2404b8f61b025a46d6d53dd
2021-03-11 16:44:48 +08:00
Wesley Wang
1d5d101aa6 Merge "Update UsageProgressBarPref icon when device is charging or low battery" into sc-dev 2021-03-11 07:53:12 +00:00
Arc Wang
3d1658e93d Merge "Hide non-system overlay window on ActivityPicker" into sc-dev 2021-03-11 07:45:43 +00:00
Bill Yi
0bd6866b6e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4858792cf94ada11fa80e777d321ac02f7259353
2021-03-10 23:33:56 -08:00
Bill Yi
2e4d6058d3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id310e8b22e9d0d422e66ebf61b7bde73ef537abc
2021-03-10 22:46:02 -08:00
Wesley.CW Wang
e940dcb448 Update UsageProgressBarPref icon when device is charging or low battery
- Add new icon for battery low state
 - Update UsageProgressBarPref icon when charging or low battery
 Screenshots:
   https://screenshot.googleplex.com/9HBvV6t6dVsG8eD.png
   https://screenshot.googleplex.com/6TsRu6BTN338FvT.png
   https://screenshot.googleplex.com/nGE29cfsmgKuuaP.png
   https://screenshot.googleplex.com/85NWXSg2PevXAsy.png

Bug: 179237746
Test: make RunSettingsRoboTests -j40
Change-Id: I057874bbf45594c90466cf346b054bf033815dac
2021-03-11 06:32:20 +00:00
TreeHugger Robot
53d7495162 Merge "Use title area for enrollment error messages" into sc-dev 2021-03-11 06:16:42 +00:00
Yi Jiang
5c11109ffc Merge "Fixes UI style issues in Screen Timeout setting" into sc-dev 2021-03-11 04:48:04 +00:00
Arc Wang
3b4853e109 Hide non-system overlay window on ActivityPicker
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I6e2845cc19dc012cba2933318a067bbb8db90a23
2021-03-11 12:10:18 +08:00
Treehugger Robot
2817c677b1 Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f am: eda1be644f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I755a0f00c44dfd39b84e4f843a1553de2e8850a2
2021-03-11 03:23:22 +00:00
Treehugger Robot
eda1be644f Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80ebc15814491a28b3da23b6554b81022ab49db3
2021-03-11 02:41:39 +00:00
Abel Tesfaye
70c11a7047 Update auto-rotate UI to comply with guidelines
Bug: 182411771

Test: locally with flame
Change-Id: Id94ae379dcf2590460b9cbbdf7a292290666796d
2021-03-11 01:52:18 +00:00
Kevin Chyn
13b05b6fb8 Merge changes from topics "fp-revokeChallenge", "new-revokeChallenge" into sc-dev
* changes:
  Update fingerprint revokeChallenge with frameworks/base
  Update revokeChallenge together with frameworks/base
2021-03-11 01:14:15 +00:00
Treehugger Robot
dac69ccd8f Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74024fbb550f8c405f2850bd20b90599370b0bad
2021-03-11 00:58:01 +00:00
Sooraj Sasindran
1ce8eb765a update isCrossSimCallingEnabledByUser name
update isCrossSimCallingEnabledByUser name to
isCrossSimCallingEnabled

Bug: 179143945
Test: build
Change-Id: I8bb0196cc04dc437ed709548ecd569c4dd7828a1
2021-03-10 16:43:49 -08:00
Andras Kloczl
6746add669 Prevent using invalid result uri during multi user image change
Test: manual
Bug: 172939189
Change-Id: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:16:46 +00:00
Andras Kloczl
9c0024f455 Prevent using invalid result uri during multi user image change
Test: manual
Bug: 172939189
Change-Id: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:16:03 +00:00
Andras Kloczl
e0f8214e80 Prevent using invalid result uri during multi user image change
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:15:46 +00:00
Andras Kloczl
798bdd90b0 Prevent using invalid result uri during multi user image change
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:15:27 +00:00
Andras Kloczl
e36357b20c Prevent using invalid result uri during multi user image change
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:14:59 +00:00
Andras Kloczl
07e414017c Prevent using invalid result uri during multi user image change
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:13:05 +00:00
jasonwshsu
ffe8521b9f Add seekBar properties 'tickMark' to LabeledSeekBarPreference
Bug: 173940869
Test: manual
Change-Id: I135e52181bdb86ded6187a3fa30b9cffeb69d451
(cherry picked from commit 9584ba6b57)
2021-03-10 23:34:26 +00:00
Abel Tesfaye
bf182903ed Merge "Update autorotate search terms" into sc-dev 2021-03-10 23:25:37 +00:00
Treehugger Robot
e9dff191b0 Merge "Update src/com/android/settings/inputmethod/OWNERS" 2021-03-10 23:05:57 +00:00
Yi Jiang
01f1c660a0 Fixes UI style issues in Screen Timeout setting
1. Remove help url and search icon.
2. Uses BannerMessage for permission missing notification.

Test: manual
Bug: 182297705
Change-Id: Id4dc998d7276f4c4f7593b1b0312d92097ec83cf
2021-03-10 12:58:46 -08:00
Ahaan Ugale
e9355553ee Merge "AF: Unit tests for PasswordsPreferenceController." into sc-dev 2021-03-10 20:08:08 +00:00
Yohei Yukawa
5878a77218 Update src/com/android/settings/inputmethod/OWNERS
Let's update this legacy OWNERS file based on the current reality.

Hopefully this would make it easier for contributers to find available
owner reviewers.

Fix: 182385491
Test: n/a
Change-Id: If47b5c0b83d561dceacc58c8fbd3643524432d62
2021-03-10 10:37:51 -08:00
Mill Chen
0023100e7f Declare activities for factory reset pages
When trying to trigger factory reset from Settings app, it's unexpected
that Settings will get a fatal ActivityNotFoundException, causing
Settings crash. The factory reset pages have changed their launching
way from by SubSettingsLauncher to by startActivity directly. These
activities haven't been declared in AndroidManifest.xml, which caused
this issue.

Fixes: 182144129
Test: rebuild and manual
1) Flash the device with aosp build
2) Navigate to Reset options (Settings -> System -> Reset options)
3) Observe and check if Settings gets crashed

Change-Id: Ia99f269e237d7c84153d4b903cbca14c33835dc1
2021-03-11 01:39:03 +08:00
Weng Su
6a0ef56917 [Provider Model] Adjust slice title and subtitle
- Show "Airplane mode" title when airplane mode is enabled

- Remove "Airplane mode is on" subtitle

- Show "Wi-Fi is turned on" subtitle when both airplane mode and Wi-Fi
is enabled

- Remove the function related to isApmNetworksAvailable()

- Screenshot:
  https://screenshot.googleplex.com/6X9nzmXRCUfw4Lp
  https://screenshot.googleplex.com/6jQryMjU2yDDpmM

Bug: 181858434
Test: manual test
atest -c InternetConnectivityPanelTest \
         InternetPreferenceControllerTest \
         InternetUpdaterTest

Change-Id: I84e5d4c60ed91d58443b27c35286a84bf72ac173
2021-03-10 22:34:35 +08:00
TreeHugger Robot
8c6564b67e Merge "Prevent a larger title from displaying incompletely" into sc-dev 2021-03-10 12:10:10 +00:00
Mill Chen
a01f882e61 Use title area for enrollment error messages
This CL is trying to put the enrollment error messages into the title
area for UDFPS, and left the red text for the older devices with a rear
fingerprint.

Fixes: 178432748
Test: visual verified
Change-Id: Ib3a81531219dc963723ad0de99f079a230c580f5
2021-03-10 19:46:13 +08:00
Almaz Mingaleev
ab05918e08 Move GeoTZ toggle to Date&Time settings screen.
Previous sub-menu is deleted.

Toggle is always enabled and shows current configuration
setting. If MLS or auto time zone detection is off,
the toggle has not effect.

Bug: 152746236
Test: toggled and checked dumpsys time_zone_detector
Test: checked summary info on different MLS/set time zone automatically
states combinations
Test: m -j30 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceControllerTest"

Change-Id: I75ee41cfcaaf34b1b63e18809be4cd614446017d
Merged-In: I75ee41cfcaaf34b1b63e18809be4cd614446017d
2021-03-10 11:07:36 +00:00
Yanting Yang
16b6910b7d Merge "Update metrics category for new app page" into sc-dev 2021-03-10 08:43:13 +00:00
Ahaan Ugale
1515b2bb78 AF: Unit tests for PasswordsPreferenceController.
Bug: 169455298
Test: atest SettingsUnitTests:com.android.settings.applications.autofill.PasswordsPreferenceControllerTest
Change-Id: I5cbbb17f192b963a634690a95a591d3f51f47436
2021-03-09 20:08:06 -08:00
mincheli
205182c725 Updates magnification settings string
See Accessibility strings for S
b/182118401#comment5

Bug: 182118401
Test: manual test
Change-Id: I6e0d972d725c4f3e95072d5df1badfbbde6394d5
2021-03-10 04:01:59 +00:00
Mill Chen
a5c91ef0fe Prevent a larger title from displaying incompletely
Some larger titles in the accessibility will be wrapped into 2 lines and
the tille looks like incomplete. This is because after starting to
scroll down, the collasping toolbar detected the length of title is
longer than the width of container and wrapped the title into 2 lines.

To prevent this, we intented to reduce the end margin for the collapsing
toolbar.

Fixes: 182235627
Test: visual verified
1) Adjust font size to largest
2) Navigate to Settings -> Accessibility -> Text and display -> Color
correction
3) Observe and see if the title is wrapped into 2 lines

Change-Id: I1595b9ab4f8406bf6505f56786438c9030b5be59
2021-03-10 10:51:38 +08:00
Kevin Chyn
39b2fe8bd5 Update fingerprint revokeChallenge with frameworks/base
Bug: 181977689
Test: manual
Change-Id: I92e6dae58d67f1355c6d0ba3bbf95ff2ad5247ed
2021-03-09 18:12:54 -08:00
TreeHugger Robot
38e19abdf7 Merge "[Provider Model] Add Wi-Fi toggle slice" into sc-dev 2021-03-10 01:44:42 +00:00
Kevin Chyn
e91e39b604 Update revokeChallenge together with frameworks/base
Bug: 181977689
Test: Inspect logs
Change-Id: I588ec46896d57d89489f78505a6f2c932462b2d2
2021-03-09 16:25:28 -08:00
Salud Lemus
b687a9757c Merge "Remove default admin support message for an Enterprise device" into sc-dev 2021-03-10 00:21:37 +00:00
TreeHugger Robot
48f6ec410e Merge "Implement temporary asset in settings page" into sc-dev 2021-03-09 23:50:44 +00:00
Abel Tesfaye
da3a845c4f Update autorotate search terms
Test: local

Bug: 182226081
Change-Id: I6665046a34aad19c245585bfd3d997d631c52bea
2021-03-09 21:12:36 +00:00
Abel Tesfaye
e604c56241 Merge "Fix for NPE in ScreenTimeoutSettingsTest" into sc-dev 2021-03-09 17:39:50 +00:00
Ahaan Ugale
c21337d44f Merge "Use androidx LifecycleObserver for wiring up controller lifecycles." into sc-dev 2021-03-09 17:11:53 +00:00
Ahaan Ugale
b4b0207e09 Merge "Add javadoc about lifecycles for xml defined Controllers." into sc-dev 2021-03-09 17:11:53 +00:00