PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,366 Commits 1 Branch 0 Tags
bdb967c756f156fa38c78f2734b3fbe51f09236a
Commit Graph

79366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chloris Kuo
bdb967c756 Merge "Remove Feedback UI Settings" into sc-dev am: da031064c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13556692

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7b189201fb37be2ae652b5155e94068cfc07289
 2021-02-12 17:16:30 +00:00
Chloris Kuo
da031064c6 Merge "Remove Feedback UI Settings" into sc-dev 2021-02-12 17:11:30 +00:00
Julia Reynolds
e50ffd6366 Merge "Add package filtering to NLSes" into sc-dev am: 776919fc0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13499641

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99f7c44b694bde8b682a6dade3f5406b650b702d
 2021-02-12 04:48:15 +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
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
bca31c4c62 Merge "[FakeUid] BatteryStats.getCustomMeasuredEnergiesMicroJoules()" into sc-dev am: 76971db7bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13547202

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66ed4953ebcdbd66b8cfa5d6073aadc2d499eb0f
 2021-02-11 17:58:30 +00:00
TreeHugger Robot
76971db7bb Merge "[FakeUid] BatteryStats.getCustomMeasuredEnergiesMicroJoules()" into sc-dev 2021-02-11 17:42:30 +00:00
TreeHugger Robot
c0394c2ba7 Merge "Use InternalActivity when ForceVerifyPath is set" into sc-dev am: 6ef5f04d95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13552669

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e2ede820e427f2d18282cc2b3f6a79ff62b8002
 2021-02-11 14:46: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
a836735535 Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" into sc-dev am: 374ae167e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13515168

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2552756df631eb10a7418c36623c9957dc5bfa8d
 2021-02-11 08:50:32 +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
62625e5873 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: I5dbad269a626baca956deb07dee37e3882c455a3
 2021-02-09 23:41:27 +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
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
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
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