Xin Li
7d646a5182
Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master
2021-08-17 18:14:14 +00:00
Treehugger Robot
e016e0b03f
Merge "Add biometric OWNERS to unit tests." am: 9689490c22
am: 2fbbcd3d9d
am: 9ee42fc623
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029
Change-Id: I4e704c29fa65197dbe1ba6e6471d925c0ad19a60
2021-08-17 09:37:38 +00:00
Treehugger Robot
9ee42fc623
Merge "Add biometric OWNERS to unit tests." am: 9689490c22
am: 2fbbcd3d9d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029
Change-Id: I56890f77bf79e84953a0ce01f2cec4089682fbf4
2021-08-17 09:22:56 +00:00
Weng Su
1fe8220afa
Add new ACTION_WIFI_DETAILS_SETTINGS to Settings
...
- Need to export the interface to Quick Settings to launch Wi-Fi Network
details settings.
- Rename WifiNetworkDetailsFragment.class
Bug: 191475923
Test: manual test with the topic CLs.
make RunSettingsRoboTests
atest -c SettingsUnitTests:com.android.settings.wifi \
SettingsUnitTests:com.android.settings.network
Change-Id: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
(cherry picked from commit e8a4e13a80
)
Merged-In: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
2021-08-17 08:14:55 +00:00
ykhung
0791d77df0
[QPR1] Add time unit into battery usage chart and refine some UI
...
- add time unit into battery chart for 12/24 hours
- refine the radius size for chart bar
- use fixed font size for timestamp and percentage
screenshots:
24-hour format: https://screenshot.googleplex.com/3VNedE2nAx6LrXu
12-hour format: https://screenshot.googleplex.com/3tpTXjYfrasrenW
fixed-size: https://screenshot.googleplex.com/nPRKm7XCkmFzW6K
Bug: 194836607
Test: make SettingsRoboTests
Change-Id: I5b35b0fa808eb8a5f607962ee973c2896529b078
Merged-In: I5b35b0fa808eb8a5f607962ee973c2896529b078
2021-08-17 06:09:56 +00:00
Curtis Belmonte
36a42b630b
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Ia1824f9bbb81d95e928f32f39f088a4a6aeaef9e
2021-08-17 01:02:08 +00:00
Curtis Belmonte
474fba01f1
Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp am: 2b318b3b69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Ibb2a4c9f98a1c6f302288252201d12f28de4a1e1
2021-08-17 01:01:47 +00:00
Curtis Belmonte
7fb2316a21
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev
2021-08-17 00:47:58 +00:00
Curtis Belmonte
dbef2415d3
[automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Ief92774377376ea11b4e099f7c0cf5764cbf7f31
2021-08-16 21:44:39 +00:00
Curtis Belmonte
dc9b53c446
Remove/replace old fingerprint icon in SUW/Settings
...
Replaces instances of the old fingerprint icon shown during Setup Wizard
or in Settings with either an updated version or an entirely different
icon.
Test: Manual
Fixes: 196600265
Change-Id: If78e8f0dbdb033f557614a019d4c9dde4493b6c6
2021-08-16 14:44:15 -07:00
TreeHugger Robot
f680c9b0b5
Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055
Change-Id: If4c7ffd19e06965e34f5185e63b22d58d3ca08d8
2021-08-14 07:26:53 +00:00
Alfred Lin
7f8e775754
Prototyping : Demo Image on color setting
...
Implement prototyping of demo image on color setting
Bug: 182797883
Test: adb shell am instrument -w -e class com.android.settings.display.ColorModePreferenceFragmentTest com.android.settings.tests.unit/androidx.test.runner.AndroidJUnitRunner test pass
Change-Id: Iebaaa6867f2039a25a5e1fd280a89b5bc9297e6b
2021-08-13 15:08:58 +00:00
Zoey Chen
6ce608787b
[Provider Model] Redirect Settings Internet panel request to SystemUI.
...
From QPR, the panel should be launched from SystemUI, so redirect the panel to SystemUI
Test: make
Bug: 187779230
Change-Id: I5b4131c4d986399944c038f8bce0723fcb5ba3b3
(cherry picked from commit ab8a922f77
)
Merged-In: I5b4131c4d986399944c038f8bce0723fcb5ba3b3
2021-08-13 14:07:01 +00:00
Tsung-Mao Fang
74b1a46cb1
Move Automatic System Updates from Developer Options to System
...
- Move the preference to the system xml file.
- DisableAutomaticUpdatesPreferenceController should not
inherit from the developer preference controller now since it's not used
in developer page anymore. Instead, just use toggle preference
controller for changing the state.
- Rewrite the test cases based on new controller.
Test: The ui works well and search can navigate to correct path.
Fix: 196001125
Change-Id: Iaea3e11d9cdbfa073ebd41bc3c84356d564c7e71
2021-08-13 08:11:22 +00:00
TreeHugger Robot
597ca951a9
Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623
Change-Id: I31d94c633afda15f05d660e6854c2b6c552a6d7a
2021-08-13 04:27:14 +00:00
TreeHugger Robot
1741d5d12c
Merge "Handle spanned conversation labels" into sc-qpr1-dev
2021-08-13 04:11:04 +00:00
Joe Bolinger
74efeebf5c
Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813
Change-Id: I28682e9fbbbb6c83b08ef45f10fd923d156c7742
2021-08-13 01:14:44 +00:00
Joe Bolinger
2296f618cc
Add biometric OWNERS to unit tests.
...
Fix: 196452210
Test: N/A
Change-Id: I6f76bef97dd61130dd546749591338864665352b
2021-08-12 16:17:03 -07:00
Julia Reynolds
2ffbb747d4
Handle spanned conversation labels
...
Test: Robotests
Fixes: 194446117
Change-Id: If21f727e00b181f0da127b09e5a1c46ec3257836
2021-08-12 20:11:00 +00:00
Joe Bolinger
9e9f1249d4
Refresh biometric preference controllers on lifecycle events.
...
Fix: 195961101
Test: make RunSettingsRoboTests
Test: manual (enroll via settings and verify preferences enabled after enrolling)
Change-Id: Ie50cd862a42c96eb95f2156a33f34748b2b8b50c
2021-08-10 13:29:05 -07:00
Joe Bolinger
0b705abada
Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178
Change-Id: I2cebeaef5456520f8d4a40fa20c6c8f469007218
2021-08-07 00:21:37 +00:00
Joe Bolinger
336d3e5501
Merge "Fix extra password confirm prompts during managed setup." into sc-dev
2021-08-07 00:07:22 +00:00
Guojing Yuan
11655705db
Remove CDM entries in Connected Device.
...
BUG: 191992001
Test: Robotest
Change-Id: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
2021-08-06 23:24:24 +00:00
Bonian Chen
a5517006b3
Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991
Change-Id: Idb67e48147c633e60c317876abdb19c48fcb90cf
2021-08-06 03:31:26 +00:00
Joe Bolinger
c11e01f39d
Fix extra password confirm prompts during managed setup.
...
Managed accounts may set the pin/pattern before enrollment begins.
Fix: 191608999
Test: atest BiometricEnrollActivityTest
Change-Id: I4065989ecc26ce72ffd0e06e7c6e68029a11908f
2021-08-05 11:08:48 -07:00
Bonian Chen
35df60f316
[Settings] eSIM existance detection rule change
...
1. eSIM retrieved from SubscriptionManager#getAvailableSubscriptionInfoList()
should be considered as existed all the time.
2. When SIM are both inactive(or active), sorted the ordering based on ordering provided by telephony framework.
Bug: 195090132
Bug: 195091953
Bug: 194197762
Test: local
Change-Id: I2fe43a35e5b7965bde3b579e2297e9cdd89ec228
(cherry picked from commit 848d097b94
)
(cherry picked from commit 824deb0ee3727f23ab68a75176825c4c73f482a9)
2021-08-05 06:31:35 +00:00
TreeHugger Robot
f42a8893c6
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: I0daddb467799ae48f25a1ecbf2e9b76081f96f1b
2021-08-04 07:28:12 +00:00
TreeHugger Robot
6f1bc2f52e
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev
2021-08-04 07:16:35 +00:00
Hugh Chen
a3a0661d1b
Fix "USB tethering" will auto turn on then off when turn off "USB tethering"
...
This CL only updates the "USB tethering preference" when
onTetheredInterfacesChanged() is invoked to avoid the
"USB tethering preference" being changed when received
non-tethering change intent.
Bug: 185590309
Test: make -j42 RunSettingsRoboTests
Change-Id: Ifed9f5c7edef670eeb21baf3841999382ee10ff2
2021-08-02 10:34:56 +08:00
Evan Severson
1ea7d23088
Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614
Change-Id: I23b162a2acae20a9621e84ba3953c12ebbe57e41
2021-07-29 20:00:10 +00:00
Evan Severson
405fac1ca0
Merge "Set toggle state for profile group" into sc-dev
2021-07-29 19:45:59 +00:00
SongFerngWang
9d9d06ab24
Fix the wrong comparison am: 1bcba3d23f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429
Change-Id: If39ce68a76790912d69dfce084bbf8b9421f8ec0
2021-07-28 17:03:56 +00:00
SongFerngWang
1bcba3d23f
Fix the wrong comparison
...
Bug: 173387374
Test: atest NetworkSelectSettingsTest (PASS)
test on real device (PASS)
Change-Id: Ib1135b0457b4e35db67e671cad142657457d6d75
2021-07-28 14:15:31 +00:00
Zoey Chen
046c8d4a97
Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev am: 1a6982f195
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372352
Change-Id: I6e15a328c230cae09f8a980cf86cb9f09a577655
2021-07-28 03:40:11 +00:00
Zoey Chen
1a6982f195
Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev
2021-07-28 03:21:12 +00:00
Zoey Chen
9894f347f2
[BackupCall] The toggle doesn't work when try to disable/enable it.
...
Bug: 192060713
Test: atest NetworkProviderBackupCallingGroupTest
Change-Id: I250c321d682f77e95967824ec033dd3c1ea64b65
2021-07-28 09:11:05 +08:00
Joe Bolinger
1841f0f132
Merge "Use RestrictedPreference for all biometric settings." into sc-dev am: 7e9077fd14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15394293
Change-Id: I2c400fb7daffee7abf6e1df4a3636e593b13586e
2021-07-27 17:41:42 +00:00
Joe Bolinger
61d998406d
Use RestrictedPreference for all biometric settings.
...
Fix hardcoded preference key in settings controller.
Fix: 194708564
Bug: 194246380
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I86bdd40fd848c5ba2d39acfde4771f5969e640d1
2021-07-26 18:36:32 -07:00
Evan Severson
7d1835a319
Set toggle state for profile group
...
The toggle state should be set for all users in the current profile
group; for example a profile user.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SensorToggleControllerTest
Fixes: 194280328
Change-Id: Ib0b74e7b27722b44b116e614dc960bff72983a38
2021-07-23 16:04:39 +00:00
SongFerng Wang
9b1493a789
Merge "aggregate the items of network selection list" into sc-dev am: 9e6928ae2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15340173
Change-Id: I4769f0bcb21bf6b56f8dad38f535472b85437ebe
2021-07-23 09:18:40 +00:00
SongFerngWang
7f5c984655
aggregate the items of network selection list
...
According to bug comment#44, modem only report one PLMN per RAT
for different cells reported for the same PLMN/RAT combination,
UI affregate those items.
Bug: 173387374
Test: atest NetworkSelectSettingsTest
Change-Id: I155abc8dda7c8ec42cf4fd677bd2aa99d1033ad1
Merged-In: I8e05b9f6784bad7f0de4e79cc6e707749745f0c1
2021-07-23 07:27:30 +00:00
YUKAI HUNG
65bdf5f805
Merge "Remove items from not allowed show summary list (legacy rule)" into sc-dev am: d7753f4c23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15343066
Change-Id: Ieb8ff72560d7b2a0eecb5ba27265e76b277b2246
2021-07-21 13:20:19 +00:00
YUKAI HUNG
9bb7d79438
Merge "Include new "dex2oat64" process to map into App Optimization name" into sc-dev am: 9d2048ab5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15343065
Change-Id: Iaa89d42b141defa3e3fb1ab8d5b03260d55fe2af
2021-07-21 13:20:11 +00:00
YUKAI HUNG
d7753f4c23
Merge "Remove items from not allowed show summary list (legacy rule)" into sc-dev
2021-07-21 13:07:19 +00:00
ykhung
09e1164c0c
Remove items from not allowed show summary list (legacy rule)
...
Bug: 191991503
Test: make SettingsRoboTests
Change-Id: Ieadc97eddcbd149e04ec85477859a9b3ffd8f06b
(cherry picked from commit b6d95d1c4f
)
2021-07-21 09:40:30 +00:00
ykhung
26af50c21e
Include new "dex2oat64" process to map into App Optimization name
...
Bug: 191991503
Test: make SettingsRoboTests
Change-Id: Ib392ed3adf7fe37fdaf73076dd1c3cd8361468eb
(cherry picked from commit d76c12f69c
)
2021-07-21 09:39:12 +00:00
Edgar Wang
eff77ffd0d
Merge "Find the double twist sensor using the type instead of the name" into sc-dev am: 6e972e81ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270335
Change-Id: Ie95f0de5bd7ed35c1e3494e0823dd99a00032c9b
2021-07-19 13:11:44 +00:00
Edgar Wang
6e972e81ef
Merge "Find the double twist sensor using the type instead of the name" into sc-dev
2021-07-19 12:58:43 +00:00
Stanley Wang
8172520329
Merge "Fix the problem that the SIM status and IMEI after the "Build number"." into sc-dev am: 2ea54cc143
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270337
Change-Id: I32a8dde99dbe338554f3ba9984569886174a290e
2021-07-19 02:30:21 +00:00
Stanley Wang
2ea54cc143
Merge "Fix the problem that the SIM status and IMEI after the "Build number"." into sc-dev
2021-07-19 02:10:21 +00:00