Peter Kalauskas
2b9f139a2d
Merge "Revert "Revert "Revert "Show "Add users from lock screen" dependent on secure lock screen."""" into sc-dev
2021-02-09 23:03:09 +00:00
Abel Tesfaye
8630f0387f
Merge "Implemented new preference setting screen for face based auto-rotation" into sc-dev am: 7fb3323b1c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13419010
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id7d693f5ebcab4f3cd6ba3336418b07cb2a1e9d7
2021-02-09 22:10:51 +00:00
Abel Tesfaye
7fb3323b1c
Merge "Implemented new preference setting screen for face based auto-rotation" into sc-dev
2021-02-09 21:06:08 +00:00
Chloris Kuo
aa72ee8613
Merge "Remove NAS adjustments related settings" into sc-dev am: 16dfec5d9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13500414
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0a053d229c0c42549753975cfe744bee5216a9b0
2021-02-09 17:17:50 +00:00
Chloris Kuo
16dfec5d9c
Merge "Remove NAS adjustments related settings" into sc-dev
2021-02-09 17:12:24 +00:00
TreeHugger Robot
60201bcbe4
Merge "Fix the issue of the repo upload hooking checker" into sc-dev am: f771e6267a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13532865
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia796793e77a8f46035cbda1a00009b800217504e
2021-02-09 16:49:22 +00:00
TreeHugger Robot
f771e6267a
Merge "Fix the issue of the repo upload hooking checker" into sc-dev
2021-02-09 15:56:03 +00:00
Treehugger Robot
48e39791cd
Merge "Switch Settings from IConnectivityManager to VpnManager." am: ace5a90870 am: 29302ad638 am: ef81307178 am: e04edeca48
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574947
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icabf8cc492236d641aaf353fda0798b37a719433
2021-02-09 14:09:15 +00:00
Sunny Shao
79d0a1fead
Fix the issue of the repo upload hooking checker
...
Fixes: 179608805
Test: repo upload test
Change-Id: I212d4e767a63d5b69ac62fd8e8f0a17f2863b5ef
2021-02-09 21:41:48 +08:00
Treehugger Robot
e04edeca48
Merge "Switch Settings from IConnectivityManager to VpnManager." am: ace5a90870 am: 29302ad638 am: ef81307178
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574947
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1e15b275b641c614e5f55d27204fd72f90f723b8
2021-02-09 13:12:03 +00:00
Treehugger Robot
ef81307178
Merge "Switch Settings from IConnectivityManager to VpnManager." am: ace5a90870 am: 29302ad638
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574947
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I71456415072c95cbb7a91f0538d0c07d323ec612
2021-02-09 12:45:11 +00:00
Treehugger Robot
29302ad638
Merge "Switch Settings from IConnectivityManager to VpnManager." am: ace5a90870
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574947
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d050875038408172e538290a53d10306d986578
2021-02-09 12:21:58 +00:00
Jing Ji
492e985708
Fix crash issue when NetworkSelectSettings UI goes OFF and then ON
...
When updating selected preference instance by index, since
mPreferenceCategory hasn't been updated yet, and then there is a
possibility that the index is over the size of preference, so this
would result to Settings crash because IndexOutOfBoundsException
was detected in NetworkSelectSettings.
After updating the network preferences of mPreferenceCategory, update
the selected preference.
Test: manual - Checked that crash does not occur when
NetworkSelectSettings UI goes OFF and then ON.
Test: auto - Passed NetworkSelectSettingsTest.
Bug: 179754915
Change-Id: Ib736fe8fdcc82c3ac01ad1828d0f2a1c24610f2b
2021-02-09 09:42:03 +00:00
Treehugger Robot
ace5a90870
Merge "Switch Settings from IConnectivityManager to VpnManager."
2021-02-09 09:09:35 +00:00
TreeHugger Robot
fb54a41a20
Merge "[Provider Model] Update Wi-Fi SSID in APM networks type" into sc-dev am: f2d710cfd1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513426
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I77ba665ac5ddedbb2dfb98ea6605fc85ce0fe668
2021-02-09 04:07:26 +00:00
Lorenzo Colitti
62cb87b5d9
Merge "Switch Settings from IConnectivityManager to VpnManager." into sc-dev am: c00fa910ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13519006
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If8de7fcbe38c34f8b7eb07b854748b4984b9e453
2021-02-09 04:07:22 +00:00
TreeHugger Robot
f2d710cfd1
Merge "[Provider Model] Update Wi-Fi SSID in APM networks type" into sc-dev
2021-02-09 03:37:58 +00:00
Lorenzo Colitti
c00fa910ce
Merge "Switch Settings from IConnectivityManager to VpnManager." into sc-dev
2021-02-09 03:24:56 +00:00
TreeHugger Robot
b4b79e6523
Merge "[Provider Model] 1. Use the original string for Calls & SMS 2. Set preferred status in Call & SMS" into sc-dev am: 033923a0d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13480085
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5130aa756050fc3d616971a49e8973593d2f3c91
2021-02-09 01:24:36 +00:00
TreeHugger Robot
b5cd9d9f8f
Merge "Add turn screen darker fragment in a11y settings text and display" into sc-dev am: a97f011ba3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13437251
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib9fa3954639a21c5c4549642bf7471cbf3882977
2021-02-09 01:23:48 +00:00
TreeHugger Robot
033923a0d2
Merge "[Provider Model] 1. Use the original string for Calls & SMS 2. Set preferred status in Call & SMS" into sc-dev
2021-02-09 01:09:11 +00:00
TreeHugger Robot
a97f011ba3
Merge "Add turn screen darker fragment in a11y settings text and display" into sc-dev
2021-02-09 00:44:12 +00:00
Chloris Kuo
a58531fb9a
Remove NAS adjustments related settings
...
The default NAS adjustments will be on by default if NAS is enabled.
Test: manual on device
Bug: 179202657
Change-Id: I8cc9e4b17da44c564b682e5064ab5bf974a14492
2021-02-08 16:15:49 -08:00
Sally Yuen
0656f03126
Merge "Finalize strings for Reduce Brightness for DP2" into sc-dev am: ab26e13a9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13511333
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id39fadd9a420c35d176f9057f44fb687cc527535
2021-02-08 21:06:28 +00:00
Sally Yuen
ab26e13a9a
Merge "Finalize strings for Reduce Brightness for DP2" into sc-dev
2021-02-08 20:44:24 +00:00
Abel Tesfaye
a96775c58b
Implemented new preference setting screen for face based auto-rotation
...
Test: locally with phone and make -j64 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.display.SmartAutoRotatePreferenceControllerTest"
Bug: 172857585
Change-Id: I8aaeb9d726ff71f64fd241c01fe2a1268fff927e
2021-02-08 18:21:03 +00:00
Peter Kalauskas
c08f49cc3a
Revert "Revert "Revert "Show "Add users from lock screen" dependent on secure lock screen."""
...
This reverts commit fa92269759 .
Reason for revert: b/152587665 - Toggle should always be visible
Bug: 152587665
Test: m RunSettingsRoboTests ROBOTEST_FILTER=AddUserWhenLockedPreferenceControllerTest
Change-Id: I93e58b36965387187b4d1ed03ca2f572728157b9
2021-02-08 10:05:20 -08:00
Zoey Chen
35dcb7c7f1
[Provider Model] 1. Use the original string for Calls & SMS 2. Set preferred status in Call & SMS
...
1.
UX modify the string in document
Dual SIMs:
Calls & SMS
Google Fi (preferred), AT&T
Calls & SMS
Google Fi (preferred for calls), AT&T (preferred for SMS)
Calls & SMS
Google Fi (Temporarily unavailable), AT&T
Single SIM:
Calls & SMS
Temporarily unavailable
2.
UX: https://screenshot.googleplex.com/B9BETTwRoa4mfds.png
Implementation: https://screenshot.googleplex.com/4vxMLBynwdTvhEs.png
Bug: 178916743
Test: make
Change-Id: I444eb0e3361707764dae18b9fa942c7f7a80a2c6
2021-02-09 01:41:09 +08:00
Bill Yi
3c79725f1d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4934aa0168 -s ours am: c5bb3e74ff -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513506
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0cd4edfdd957780cb5f89ae5837d44d83f140cd4
2021-02-08 17:12:05 +00:00
Bill Yi
35a2b7cd21
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 432eae5d7b -s ours am: 842217b7a4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513508
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I08deb559bcbca7a687ff1cefb3a4f88a1689d31c
2021-02-08 17:11:10 +00:00
Bill Yi
c5bb3e74ff
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4934aa0168 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513506
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I44fbf6cfb8575b7add5f115ba5cfb074e1fdbada
2021-02-08 16:33:24 +00:00
Bill Yi
842217b7a4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 432eae5d7b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513508
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0c06ab7defb5ec545ec206204d578460c0f207ba
2021-02-08 16:33:19 +00:00
Lorenzo Colitti
b909433528
Switch Settings from IConnectivityManager to VpnManager.
...
The VPN code is moving out of ConnectivityService to a new
VpnManagerService. Update Settings to call into the VpnManager
class instead of using the AIDL interface directly. This way,
the VPN code can be moved without touching Settings.
Bug: 173331190
Test: builds, boots
Test: manually verified VPN settings page
Change-Id: Id2731a166b5d6783acb1c711a54604b69aa8c0d7
2021-02-09 01:16:29 +09:00
Bill Yi
4934aa0168
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-02-08 15:44:47 +00:00
Weng Su
029e2d771e
Fix WiFi show "Not connected" always issue
...
- The WiFi summary is designed to be changed when the
onCapabilitiesChanged() callback is made from the ConnectivityManager,
but there is no guarantee that there will be a callback after the
settings are registered to the ConnectivityManager.
- Need to fatch initial state information to show the correct summary
first when the settings register callback to the ConnectivityManager.
- Screenshot:
https://screenshot.googleplex.com/AwmLX2ZQE2grC7N
Bug: 179335681
Test: manual test
- make RunSettingsRoboTests ROBOTEST_FILTER=WifiSummaryUpdaterTest
Change-Id: Ib5d22bdf34a3832dd5082e6e11cee699694afdee
2021-02-08 23:15:14 +08:00
SongFerngWang
a5035d9ce7
Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo
...
NetworkTypeController set OVERRIDE_NETWORK_TYPE_NR_ADVANCED when
device connect NR and frequency is mmWave.
Bug: 179443240
Bug: 179453836
Test: atest frameworks/opt/telephony/src/java/com/android/internal/telephony/NetworkTypeController.java
atest packages/apps/Settings/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
Change-Id: Ib95f6a012c0f725335f46e17b8414005a76ad5c9
Merged-In: Ib95f6a012c0f725335f46e17b8414005a76ad5c9
2021-02-08 14:04:18 +00:00
Yanting Yang
502ea63044
Merge "Apply FooterPreference to the sub-pages of Special app access" into sc-dev am: d9d9d70184
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13495591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia0228079d49d07208c1996c3658bcff9040d6790
2021-02-08 13:56:16 +00:00
Yanting Yang
d9d9d70184
Merge "Apply FooterPreference to the sub-pages of Special app access" into sc-dev
2021-02-08 13:25:57 +00:00
Chiachang Wang
e53bb99527
Merge "Replace Proxy hidden constants and methods usages" am: e3be1ecb38 am: 5c5b36f19d am: dbd031a46f am: 36999b5d78
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac9eb451d7b116c97ce8e06d5df0823da8368fcb
2021-02-08 12:59:58 +00:00
Chiachang Wang
36999b5d78
Merge "Replace Proxy hidden constants and methods usages" am: e3be1ecb38 am: 5c5b36f19d am: dbd031a46f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I60eb5717af5855b80290af92bed14f2fc702e7a9
2021-02-08 12:12:48 +00:00
Chiachang Wang
dbd031a46f
Merge "Replace Proxy hidden constants and methods usages" am: e3be1ecb38 am: 5c5b36f19d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7f3a634620e6467da136e0454ab98c994d7a23a6
2021-02-08 11:31:48 +00:00
Chiachang Wang
5c5b36f19d
Merge "Replace Proxy hidden constants and methods usages" am: e3be1ecb38
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba522bcd7591747f012918dc87f05f7aab1c2a1b
2021-02-08 11:00:55 +00:00
Chiachang Wang
e3be1ecb38
Merge "Replace Proxy hidden constants and methods usages"
2021-02-08 10:27:05 +00:00
Lorenzo Colitti
04d34ced59
Switch Settings from IConnectivityManager to VpnManager.
...
The VPN code is moving out of ConnectivityService to a new
VpnManagerService. Update Settings to call into the VpnManager
class instead of using the AIDL interface directly. This way,
the VPN code can be moved without touching Settings.
Bug: 173331190
Test: builds, boots
Test: manually verified VPN settings page
Change-Id: Id2731a166b5d6783acb1c711a54604b69aa8c0d7
2021-02-08 16:50:25 +09:00
TreeHugger Robot
674002c56b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 42f0c09a95 -s ours am: 5130730d9b -s ours am: 74eb482fba -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513511
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id952e6797e0da0f5883428da912cb03ae2115aef
2021-02-08 06:31:28 +00:00
TreeHugger Robot
eb8cf99808
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ad376e668d -s ours am: 32a131a0f5 -s ours am: 6289bab031 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513510
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If3423c59dd93a400fe78c2c76e92ef764e0fa919
2021-02-08 06:31:07 +00:00
Ben Chung
359665c3b0
Add turn screen darker fragment in a11y settings text and display
...
Accessibility settings category restructure, add turn screen darker
fragment for related accessibility services.
Bug: 174829936
Test: atest TurnScreenDarkerFragmentTest, atest AccessibilitySettingsTest
Change-Id: I8aef7a0b5a6d407813aadb22d7ade5103533efa4
2021-02-08 06:12:30 +00:00
TreeHugger Robot
74eb482fba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 42f0c09a95 -s ours am: 5130730d9b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513511
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2fd7ef384bd5e8c27018204dc00be4ff7d69f796
2021-02-08 05:58:56 +00:00
TreeHugger Robot
6289bab031
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ad376e668d -s ours am: 32a131a0f5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513510
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie56272d926303029464a457794e3883d4d64639b
2021-02-08 05:58:09 +00:00
TreeHugger Robot
5130730d9b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 42f0c09a95 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513511
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic015a19cf6a67a19a6100ff3e787fc62d2031f0a
2021-02-08 05:03:09 +00:00