Commit Graph

79285 Commits

Author SHA1 Message Date
Bill Yi
9172c947b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf789f35a -s ours am: d3ee559603 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93350bdec9f8e3f42dbb33b6f856d91c78739c11
2021-02-13 19:25:58 +00:00
Bill Yi
d3ee559603 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf789f35a -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4676a7e5b838ff558ecd79f3ea1e3f2159c7048d
2021-02-13 18:32:38 +00:00
Bill Yi
bdcdfac39c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1c109b18f -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3d1fc9eb229a7279789e1d832a85107755499a4
2021-02-13 18:32:17 +00:00
Peter Kalauskas
d7af6821dc Merge "Revert "Update icons and text for guest user"" into sc-dev 2021-02-12 17:26:47 +00:00
Chloris Kuo
da031064c6 Merge "Remove Feedback UI Settings" into sc-dev 2021-02-12 17:11:30 +00:00
Bill Yi
acf789f35a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9f6118a293ecb1c5d671398e9253e8908cf18c94
2021-02-12 04:56:56 -08:00
Bill Yi
e1c109b18f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I92331438bfe6ec4d779d6238a9892f6d1cb72de1
2021-02-12 08:02:38 +00:00
Julia Reynolds
776919fc0a Merge "Add package filtering to NLSes" into sc-dev 2021-02-12 02:16:52 +00:00
Chloris Kuo
c22654c075 Remove Feedback UI Settings
remove settings from developers option and use deviceconfig to control

Test: manual on device
Bug: 180057146
Change-Id: Ic72d0f49e6f47aaeb541b997779d2cd66ca2b287
2021-02-11 17:21:01 -08:00
Peter Kalauskas
06b235e497 Revert "Update icons and text for guest user"
Revert submission 13278947-new-guest-user-strings

Reason for revert: Use same strings and text as Android R
Reverted Changes:
I8e9b7992d:Update icons and text for guest user
I42c0b46fd:Update icons and text for guest user

Bug: 169783558
Change-Id: Id038ec708e9098c856c4d24ae55a3b7e2bad391d
2021-02-11 22:29:38 +00:00
Julia Reynolds
20814ed5c7 Add package filtering to NLSes
Now users can prevent a given notification listener from seeing
notifications from particular apps.

Test: settings unit tests
Bug: 173052211
Change-Id: Ia868d6dc2da1ae7f75c0dca47034e28910584acd
2021-02-11 19:00:57 +00:00
TreeHugger Robot
76971db7bb Merge "[FakeUid] BatteryStats.getCustomMeasuredEnergiesMicroJoules()" into sc-dev 2021-02-11 17:42:30 +00:00
TreeHugger Robot
6ef5f04d95 Merge "Use InternalActivity when ForceVerifyPath is set" into sc-dev 2021-02-11 14:23:26 +00:00
Rubin Xu
11ba18ad94 Use InternalActivity when ForceVerifyPath is set
ConfirmLockPassword enforces that ForceVerifyPath
can only be set when caller is launching InternalActivity,
so the builder needs to launch that activity instead.
This is regressed from Idf6fcb43f7497323d089eb9c37125294e7a7f5dc

Bug: 179172552
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: I8e03fc69c4748d09f17c29edaa77594e233f79ea
2021-02-11 12:40:09 +00:00
SongFerng Wang
374ae167e1 Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" into sc-dev 2021-02-11 08:28:21 +00:00
Adam Bookatz
738376dbaa [FakeUid] BatteryStats.getCustomMeasuredEnergiesMicroJoules()
Fake Uid.getCustomMeasuredEnergiesMicroJoules() for new BatteryStats API.

Bug: 179107328
Bug: 174818228

Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsNoteTest
Test: atest FrameworksCoreTests:com.android.internal.power.MeasuredEnergyStatsTest
Change-Id: Id55d52cad6622289aa0f39cfdb24799cac393878
2021-02-10 13:18:43 -08: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
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
16dfec5d9c Merge "Remove NAS adjustments related settings" into sc-dev 2021-02-09 17:12:24 +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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
32a131a0f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ad376e668d -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: I5178301f18df626ea068796c638a59a436029e11
2021-02-08 05:02:34 +00:00