Shireesha Bongarala
e384fa00d9
Add strings for Safety & Emergency section
...
Change-Id: Ie3b0cf6fcd980e966c63aff5c87ad879b50588b5
2021-03-16 11:48:06 +00:00
SongFerng Wang
1beee88d57
Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo"
2021-02-10 08:33:20 +00:00
Peter Kalauskas
a689c1bbff
Merge "Revert "Revert "Revert "Show "Add users from lock screen" dependent on secure lock screen."""" into sc-dev am: 2b9f139a2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13502922
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie8bdd8673766b0dcf2d7bd0750d3d7845ffafc76
2021-02-09 23:42:47 +00:00
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
6af9486183
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: Ic1e2d7a58cd3ec66e871e1939acd7c295f2c0469
2021-02-09 22:10:25 +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
a20ebf86d6
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: I597a6cce00b88702398a3e54628e0d339b82aed1
2021-02-09 17:17:40 +00:00
Chloris Kuo
16dfec5d9c
Merge "Remove NAS adjustments related settings" into sc-dev
2021-02-09 17:12:24 +00:00
TreeHugger Robot
4ef32dfd3d
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: Ie70b91251a23da8f454ca78407a9729043939d1b
2021-02-09 16:48:37 +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
2ec6a04422
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: I1be43e375ca0fc870a7c5e555e0139d6785b6527
2021-02-09 14:08:27 +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
Treehugger Robot
ace5a90870
Merge "Switch Settings from IConnectivityManager to VpnManager."
2021-02-09 09:09:35 +00:00
TreeHugger Robot
2937ee38d6
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: I9df9ffa3ec954a4cbdc638a2a0196a0fd2611422
2021-02-09 04:07:22 +00:00
Lorenzo Colitti
d8b2eaa9cb
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: Ibf379a663748646d3563ab18ed73daacbf8d2ecf
2021-02-09 04:07:15 +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
a9e3170a54
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: Ib9b96eccf2ea0691b70a3bda5127cb3f9804f118
2021-02-09 01:23:03 +00:00
TreeHugger Robot
5e40d43c20
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: I2ab8f9c98a6bbd900634a416bf3a02c3e3ba881d
2021-02-09 01:22:11 +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
94530389cd
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: Id62366a1898a60e82a1f0a2d12b6a14a7abba3d1
2021-02-08 21:06:14 +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
TreeHugger Robot
1a9389ab97
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-02-08 18:07:09 +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
TreeHugger Robot
c380e2959e
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-02-08 17:48:59 +00: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
0ecc636b9f
[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: I2e505a3b3d8e62df76ab930ba08e4847a223bce5
2021-02-08 17:12:00 +00:00
Bill Yi
c5c844ce7f
[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: I2f84ec81a9bacae27986fb9348afed7c4129dee1
2021-02-08 17:10:51 +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
6a7fe19588
Merge changes from topic "presubmit-am-c9a406587c154801a55df788e0aa3a13"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 797e1e30e7
Import translations. DO NOT MERGE ANYWHERE
2021-02-08 15:44:47 +00:00
Bill Yi
4934aa0168
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-02-08 15:44:47 +00:00
Bill Yi
1f9bb31660
Merge changes from topic "presubmit-am-5bc9e6a5da284a399ba4d1d58bd3d258"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 432eae5d7b
Import translations. DO NOT MERGE ANYWHERE
2021-02-08 15:44:39 +00:00
SongFerngWang
961c3184cf
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
2021-02-08 14:00:26 +00:00
Yanting Yang
d93170a400
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: I899ae7a8178ef984839b4bcf22f9f0d7d494bc63
2021-02-08 13:56:52 +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
a7404aacdc
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: I1475bee722aae6b835c16d7c874f165a6f586554
2021-02-08 12:59:04 +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
288a3db069
[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: Ic8d333454770fddd761decab46a18fc9d6f9e8c7
2021-02-08 06:31:24 +00:00