Alex Salo
5315f373fa
Merge "Promotes screen timeout setting." into sc-dev
2021-02-22 18:40:59 +00:00
Manish Singh
4b0a19f44e
Merge "Introduce controller for transcode notifications" into sc-dev
2021-02-22 17:39:43 +00:00
Ben Murdoch
a9f0903581
Merge "Correctly select peak refresh rate." into sc-dev
2021-02-22 12:43:08 +00:00
SongFerng Wang
63ed1b3f9f
Merge "EnabledNetworkModePreferenceController redo Init after sim activate" into sc-dev
2021-02-22 10:36:32 +00:00
Yi Jiang
ef851e84ed
Promotes screen timeout setting.
...
This change puts the screen timeout setting before the 'advanced' tab in
Settings->Display.
Test: manual
Bug: 180759324
Change-Id: I32081fa289be5b9c2bb1cc5089161ad70386ed39
2021-02-22 09:03:56 +00:00
SongFerngWang
f3b21931a5
EnabledNetworkModePreferenceController redo Init after sim activate
...
Failed to get RadioAccessFamily information from
TelephonyManager.getSupportedRadioAccessFamily due to SIM inactivated
Bug: 180360457
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: Icfce6c319e9a84318c9496125718cd60dda6afbb
2021-02-22 16:42:51 +08:00
Thiebaud Weksteen
10ebd252e0
Merge "Add onPreferenceChange_update tests" into sc-dev
2021-02-22 08:10:10 +00:00
TreeHugger Robot
ba17639a13
Merge "Update battery saver switch string" into sc-dev
2021-02-22 08:07:38 +00:00
Tom Hsu
a2b98fe18a
Merge "[Provider model] Show a string on internet picker when mobile data off" into sc-dev
2021-02-22 06:46:36 +00:00
TreeHugger Robot
4133b7c147
Merge "Tweak UI for make profile pattern visible" into sc-dev
2021-02-22 06:25:36 +00:00
TreeHugger Robot
d9fe64bec6
Merge "Remove enroll animation from touch sensor page" into sc-dev
2021-02-22 06:25:04 +00:00
TreeHugger Robot
7f171ee860
Merge "Update FingerprintEnrollEnrolling for UDFPS" into sc-dev
2021-02-22 06:24:52 +00:00
Wesley.CW Wang
2fb3390ce6
Update battery saver switch string
...
Bug: 180749420
Test: Test: make RunSettingsRoboTests -j40
Change-Id: Ibd65573a50a9c4f4ab2a055e7bdff6800cf1d873
2021-02-22 14:23:00 +08:00
Bob Badour
a173e4eee5
Merge "resolve merge conflicts of cfcf58354c
to sc-dev" into sc-dev
2021-02-21 20:09:42 +00:00
Bob Badour
0b209e94e2
Merge "resolve merge conflicts of cfcf58354c
to sc-dev" into sc-dev
2021-02-21 19:50:22 +00:00
Manish Singh
cbbe9da1ad
Introduce controller for transcode notifications
...
This is to provider users with control over whether to show transcoding
notifications or not.
By default we show the notifications.
The controller resides within the Media transcoding settings under
Developer Options.
BUG: 170973510
Test: manual. unit test added.
Change-Id: I7172f583ce4c1a53e5d5ccc07625f201852db43a
2021-02-21 18:31:06 +00:00
Bob Badour
0e73d05c74
[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
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: I81f11a66b5977cb5096e262819084706af5fa54c
Merged-in: I81f11a66b5977cb5096e262819084706af5fa54c
2021-02-21 08:50:16 -08:00
Adam Bookatz
e71853e687
[automerger skipped] Merge "Update new owners for battery pages." am: c2c5de6199
am: 9e3bb7026c
am: 227d74be02
-s ours
...
am skip reason: Change-Id I330d074c6e504493abf4cece51199ec5851b5d3b with SHA-1 9a90dc1e8e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1595832
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I374fc14a6caa59f3d09cfa421cb84cb582f1c1a0
2021-02-20 17:40:35 +00:00
Treehugger Robot
26e6c1852c
Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657
am: 00eaf3f7e0
am: fef782861a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1581223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I05a62b623436440c077018d11d6d27a1d3ec63f6
2021-02-20 17:40:26 +00:00
Lorenzo Colitti
5320dbda4e
Merge "Reset VPN settings by calling VpnManager." am: be4a0e84ef
am: 9e072f09a0
am: e584f62ac4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1594351
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I24d89cb5138f86d86a0981b7580f52c50b70133b
2021-02-20 17:32:39 +00:00
Bob Badour
5cdada2888
[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings" am: 7d8e27cbb5
am: 358e0966fc
am: cfcf58354c
-s ours
...
am skip reason: skipped by user jeffv
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1588487
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie23e5f0ee4a9d4e4fb2a2afbc174818528862721
2021-02-20 17:22:59 +00:00
TreeHugger Robot
a48e464981
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-02-20 15:52:38 +00:00
Bill Yi
46865bb769
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9f3516fd312c8dc0048777e85934029ef6d5e086
2021-02-20 12:15:49 +00:00
Mill Chen
5fea7c9a46
Remove enroll animation from touch sensor page
...
During the setup flow, the enrolling animation will be shown in the
touch sensor page. This was caused by using the old layout during the
setup flow. Removing the overrided method getContentView to fix this
issue.
Fixes: 179447737
Test: visual verified
1) adb shell am start -n
com.google.android.setupwizard/.SetupWizardTestActivity
2) Follow the setup flow and check if the touch sensor page has an
animation
Change-Id: I249535d6c0e8a5f12d86aeeac5308489e469bf71
2021-02-20 17:30:59 +08:00
Mill Chen
2ad549e13a
Update FingerprintEnrollEnrolling for UDFPS
...
The BC theme didn't work in the fingerprint enrollment page since this
page was using a customized layout and wasn't following the SUD
template. Also the fingerprint sensor icon has been moved to SysUI so
it's unnecessary to have the customized layout.
This CL is trying to merge two layouts together and make BC theme apply
to the fingerprint enrollment page.
Bug: 177026664
Test: visual verified
Change-Id: Ia22ea14244cd4b508a1fa6341aa15bd741c195f4
2021-02-20 16:58:32 +08:00
Chiachang Wang
cb95bfdb16
Merge "Replace NetworkUtils methods" into sc-dev
2021-02-20 08:41:45 +00:00
Bonian Chen
9bad17d5e8
Merge "Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657" into sc-dev
2021-02-20 08:29:58 +00:00
tom hsu
00798a5902
[Provider model] Show a string on internet picker when mobile data off
...
- https://screenshot.googleplex.com/6JE9ma6UZmGCNFQ
Bug: 178680922
Test: Manual test passed
Test: atest passed
Change-Id: Id276e3f97b4380f648eb9e35ca7780a0ba32bdb2
2021-02-20 15:03:47 +08:00
Bob Badour
0adbf158bc
resolve merge conflicts of cfcf58354c
to sc-dev
...
Change-Id: I2134f96e3d7246e441fc1e05ca4c896b28a5d8e3
2021-02-20 02:15:33 +00:00
Bob Badour
a37f7acb6e
resolve merge conflicts of cfcf58354c
to sc-dev
...
Change-Id: If4ac23728393cf6d2855f54ac2030ccd605f4582
2021-02-20 01:58:48 +00:00
Ben Murdoch
38567b98d4
Correctly select peak refresh rate.
...
Currently we will get an arbitrary value that is greater than the
default depending on the order returned by the Display.
Bug: 180723012
Test: make RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.display.PeakRefreshRatePreferenceControllerTest"
Change-Id: Id2c99f2bea9c6b2814d82a9db3a417e4a93ee06d
2021-02-19 22:31:12 +00:00
Fan Zhang
cb2c6bf3fa
Merge "Use EmergencyNumberUtils to get/set emergency settings." into sc-dev
2021-02-19 21:59:16 +00:00
Julia Reynolds
44e53efb52
Merge "Fix exception sorting conversations" into sc-dev
2021-02-19 19:43:01 +00:00
Adam Bookatz
227d74be02
Merge "Update new owners for battery pages." am: c2c5de6199
am: 9e3bb7026c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1595832
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic7f02e3d702a6e0aa9425d8a1dd973d33ea3aa89
2021-02-19 18:57:56 +00:00
Julia Reynolds
85511dbef8
Fix exception sorting conversations
...
Test: robotests
Fixes: 178618139
Change-Id: I524187a5840163d65dce35827785f3139b6fede7
2021-02-19 13:22:31 -05:00
Adam Bookatz
9e3bb7026c
Merge "Update new owners for battery pages." am: c2c5de6199
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1595832
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1177d1ceb9c73e18bc203267931021bc908a8221
2021-02-19 18:18:50 +00:00
Adam Bookatz
c2c5de6199
Merge "Update new owners for battery pages."
2021-02-19 17:26:50 +00:00
TreeHugger Robot
afaee1a202
Merge "Reorder the new notification settings page" into sc-dev
2021-02-19 16:46:53 +00:00
Mill Chen
51513522b3
Tweak UI for make profile pattern visible
...
Removing the summary placeholder from Make profile pattern visible
preference, since this preference has nothing to show in its summary.
Bug: 180573775
Test: visual verified
1) Create a work profile through TestDPC
2) Settings -> Security -> disable Use one lock
3) Setting pattern for Work profile lock
4) Observe Make profile pattern visible and check if it's central
aligned
Change-Id: I66b828aa6f719cdefc6b81efcc3c2c9e54cdcaf1
2021-02-20 00:35:05 +08:00
Tom Hsu
917021a2bd
Merge "Only default APN type can make preference selectable." into sc-dev
2021-02-19 15:47:00 +00:00
Victoria Lestari
f92211eb6f
Merge "Show VoiceInput settings at all times" into sc-dev
2021-02-19 14:16:20 +00:00
Wesley.CW Wang
f4bc35333b
Update battery percentage column to UsageProgressBarPref (1/2)
...
- Change battery percentage column to new design
- Remove debug info case
Screenshots:
https://screenshot.googleplex.com/9rvRfK3wBtpnarZ.png
https://screenshot.googleplex.com/5iAjNXTptDechAm.png
Bug: 177407113
Test: make RunSettingsRoboTests -j40
Change-Id: I5d046be29a036910036e72edb677b69bc2c0a03f
2021-02-19 10:23:53 +00:00
Treehugger Robot
b500638838
Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1581223
Bug: 179754915
Change-Id: Ic7975ae92fa2be360b20dfc4d18f4ad9af789ebe
(cherry picked from commit 00eaf3f7e0
)
2021-02-19 10:00:49 +00:00
TreeHugger Robot
2e47875c06
Merge "Remove search and help menu items from toolbar" into sc-dev
2021-02-19 09:37:38 +00:00
SongFerng Wang
851a2f8557
Merge "Can't show 5GE at summary" into sc-dev
2021-02-19 09:24:12 +00:00
Thiébaud Weksteen
203b5203d9
Add onPreferenceChange_update tests
...
Bug: 180688212
Test: atest -c Enable2gPreferenceControllerTest
Change-Id: Ie7bc7a49f2ce4d5e8b8d75914fa46b613569566f
2021-02-19 09:24:02 +00:00
Treehugger Robot
fef782861a
Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657
am: 00eaf3f7e0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1581223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2792e10c7808d9a0d31c8b7136d60c594c4b2abf
2021-02-19 09:18:02 +00:00
Lorenzo Colitti
e584f62ac4
Merge "Reset VPN settings by calling VpnManager." am: be4a0e84ef
am: 9e072f09a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1594351
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I09ebb58281e60c246550426b2b962a4dce6b72ad
2021-02-19 09:16:56 +00:00
Treehugger Robot
00eaf3f7e0
Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1581223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic7975ae92fa2be360b20dfc4d18f4ad9af789ebe
2021-02-19 09:04:14 +00:00
Treehugger Robot
b086fed657
Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON"
2021-02-19 08:53:56 +00:00