PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,732 Commits 1 Branch 0 Tags
ef0f32b7963b25837a7589f495e051c0cadb65cc
Commit Graph

80732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
0c4a622b49 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iccfaa49e229aeb8c5365144394c6fd2635ee2a91
 2021-03-14 18:08:33 +00:00
Bill Yi
97e669d333 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iba69fb0c0a9d7edb15865e4444f8d558465ce2f4
 2021-03-14 17:36:32 +00:00
Minche Li
869f92c092 Merge "Updates magnification settings string" into sc-dev am: 29ff0e0552 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815931

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4039523da9619ddc9e5efc763c296643496d6583
 2021-03-14 02:32:58 +00:00
Minche Li
29ff0e0552 Merge "Updates magnification settings string" into sc-dev 2021-03-14 02:02:20 +00:00
Dmitri Plotnikov
656c67c01d Encapsulate BatterySipper and BatteryConsumer in BatteryEntry 
Bug: 173745486
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryEntryTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.AdvancedPowerUsageDetailTest

Change-Id: I67ab825c25b85012b5713736db62e0beb4d98a16
 2021-03-13 12:51:47 -08:00
Yanting Yang
7880411a96 Merge "Fix NPE for ConfigureNotificationSettings" into sc-dev am: d604ca93dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849827

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d82fe3b483f581f3786e3b6fb17cae83581ec35
 2021-03-13 17:07:24 +00:00
TreeHugger Robot
0f3f0c33d8 Merge "Fix the issue of the repo upload hooking checker" into sc-dev am: f575da48e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849842

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia272c7d7dd79e2381b04c1433d16e65696464276
 2021-03-13 17:07:17 +00:00
Yanting Yang
d604ca93dc Merge "Fix NPE for ConfigureNotificationSettings" into sc-dev 2021-03-13 16:56:29 +00:00
TreeHugger Robot
f575da48e5 Merge "Fix the issue of the repo upload hooking checker" into sc-dev 2021-03-13 16:40:53 +00:00
TreeHugger Robot
ef44fde1fd Merge "Move WiFi/Bluetooth scanning toggles to new pages" into sc-dev am: 041966442f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13812148

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c5c8efc52b855a9f92d010a244786c4f72b7787
 2021-03-13 03:42:45 +00:00
TreeHugger Robot
041966442f Merge "Move WiFi/Bluetooth scanning toggles to new pages" into sc-dev 2021-03-13 02:35:13 +00:00
Abel Tesfaye
e57c87528d Fix auto-rotate summary not updating on devices without smart-auto-rotate 
Test: locally with crosshatch

Bug: 181585193
Change-Id: I571b10556ff2f4f4d6ff960fcfdf7866405d5ee5
 2021-03-13 02:14:57 +00:00
Yu-Han Yang
d8df0d97e2 Move WiFi/Bluetooth scanning toggles to new pages 
Screenshots: http://shortn/_ZmO6y9Zi5S

Bug: 180533061
Test: on device
Change-Id: I1223c9f5641bcc24b3e16af45138643f62849b8b
 2021-03-12 16:52:17 -08:00
TreeHugger Robot
7184295054 Merge "Transition BatteryInfo and BatteryUtils to BatteryUsageStats API" into sc-dev am: 38e0dae439 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13803384

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06231512af655da4f29e16f2108533fd6d6b759d
 2021-03-13 00:25:23 +00:00
TreeHugger Robot
38e0dae439 Merge "Transition BatteryInfo and BatteryUtils to BatteryUsageStats API" into sc-dev 2021-03-12 23:52:00 +00:00
Dmitri Plotnikov
820bee81d6 Transition BatteryInfo and BatteryUtils to BatteryUsageStats API 
Bug: 173745486
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryHistoryPreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryInfoLoaderTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryInfoTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryUtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.batterytip.detectors

Change-Id: I469ff8b88aa3307422c02f51943df4ef1759db56
 2021-03-12 14:08:42 -08:00
Adam Bookatz
03efe79d07 FakeUid: measured energy for Wifi, Bluetooth 
Updates FakeUid for the new BatteryStats APIs:
getWifiMeasuredBatteryConsumptionUC()
getBluetoothMeasuredBatteryConsumptionUC

Test: atest BatteryStatsTests
Bug: 174818228
Change-Id: I60b4a7dbc24b5fe6d91502a942cab8a32daacf96
 2021-03-12 13:41:23 -08:00
TreeHugger Robot
a54126545f Merge "Add getCpuMeasuredBatteryConsumptionUC to FakeUid" into sc-dev am: 45a3450d6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13781348

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c0301bebbefc173ad5248c64298e94596362668
 2021-03-12 21:06:20 +00:00
TreeHugger Robot
45a3450d6f Merge "Add getCpuMeasuredBatteryConsumptionUC to FakeUid" into sc-dev 2021-03-12 20:51:44 +00:00
SongFerng Wang
fd8d5b5c7c Merge "Change the behavior of notifyAllowedNetworkTypesChanged." into sc-dev am: 516042b160 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13740140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b32dd44562fbe0eb9d3a8b37b42007563eadb5b
 2021-03-12 18:59:57 +00:00
SongFerng Wang
516042b160 Merge "Change the behavior of notifyAllowedNetworkTypesChanged." into sc-dev 2021-03-12 18:49:49 +00:00
TreeHugger Robot
3e4e0befff Merge "Remove interactors from voice input settings" into sc-dev am: 9edb779e45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774548

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib783c1ff5eedcb72096731111eb080c9398822d8
 2021-03-12 17:16:31 +00:00
TreeHugger Robot
9edb779e45 Merge "Remove interactors from voice input settings" into sc-dev 2021-03-12 17:16:16 +00:00
TreeHugger Robot
63dbfe49ee Merge "Launch channel settings as half sheet" into sc-dev am: d0fa5b2054 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13844943

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5db8ab3c01fb336ee6dec0fdf02a500976607a1
 2021-03-12 17:15:38 +00:00
TreeHugger Robot
d0fa5b2054 Merge "Launch channel settings as half sheet" into sc-dev 2021-03-12 16:45:56 +00:00
Julia Reynolds
efe26e2d44 Launch channel settings as half sheet 
If opening app has requested only a subset of fields

Test: manual - launch from an app, filtered and unfiltered, for
normal channels and conversations
Bug: 177246841
Change-Id: Ifd70478101d1ea1340d2ecc55033fab55e65ca92

Change-Id: I5194b959c82b2cfa7990c84285aaf69464cff3a8
 2021-03-12 09:58:41 -05:00
Victoria Lestari
b3729f6675 Remove interactors from voice input settings 
Bug: 180960127

Tested: on device, emulator

Change-Id: I53a74e5d003a662b1e86a1c2d77e73ba84262201
 2021-03-12 14:42:38 +00:00
Sunny Shao
1e508a4280 Fix the issue of the repo upload hooking checker 
Fixes: 182555684
Test: repo upload test
Change-Id: I80a4d4de84b6d54a7b50c325b51b832b7b40b133
 2021-03-12 22:25:10 +08:00
TreeHugger Robot
c1b9468efd Merge "[Provider Model] Show Off if WFC is disabled by user" into sc-dev am: 8d73578b5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849826

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d251557d1f07d58aca263070e764ada5dd1aec1
 2021-03-12 13:04:42 +00:00
TreeHugger Robot
8d73578b5f Merge "[Provider Model] Show Off if WFC is disabled by user" into sc-dev 2021-03-12 12:32:38 +00:00
Stanley Wang
751dff2bf6 Remove the non-translatable tags from MainSwitch titles. 
The titles of MainSwitch need to be translated.

Fix: 182540501
Test: run Robotest
Change-Id: I4a07c599e607644729718543a12d4e9147117e78
 2021-03-12 19:52:07 +08:00
Zoey Chen
b8a639f8fd [Settings] Use TelephonyManasger.registerTelephonyCallback instead of TelephonyManager.listen 
Bug: 175270951
Test: make and atest
Change-Id: I15e1a199e6a34914db97055bfea9392c5bbdc9c6
 2021-03-12 19:27:05 +08:00
TreeHugger Robot
1d98f112cd Merge "[Provider Model] Adjust slice title and subtitle" into sc-dev am: cba72ddc2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824394

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16e5f5e1815602d36401b9801e4d368868c93eca
 2021-03-12 10:57:36 +00:00
TreeHugger Robot
cba72ddc2e Merge "[Provider Model] Adjust slice title and subtitle" into sc-dev 2021-03-12 10:19:26 +00:00
tim peng
a5ab8a1b6f Merge "Update strings and tag it translatable" into sc-dev am: f90be25ca8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13839796

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic310868d1b25a8c7b773d1dfb9e4ea9353e3ef3f
 2021-03-12 09:02:34 +00:00
Tsung-Mao Fang
121041cf58 Only display single line for title 
When a malicious device admin app’s name includes
a bunch of CRLF characters, it will cause incorrect shows
and selection confusion in Settings Device admin apps listView.

Change-Id: Ifc3cc689a221830c6687b7d69cf86f1ed7f2d698
Test: Built the apk and saw single line title.
Bug: 169936038
Merged-In: I0c9d80273ed752c5a83afcad18d67400bcfc1618
 2021-03-12 08:34:57 +00:00
tim peng
f90be25ca8 Merge "Update strings and tag it translatable" into sc-dev 2021-03-12 08:22:12 +00:00
Yanting Yang
a1a30296ae Fix NPE for ConfigureNotificationSettings 
The NPE is caused by that we have removed the advanced category from
Notification page for android S design but it still tries to get
category and call setInitialExpandedChildrenCount in onCreate().

Only run the relevant logic on the old design since it’s only used to
expand the advanced category and we don’t need the expand feature
anymore for android S.

Bug: 182237530
Fixes: 182532954
Test: robotest & manual
Change-Id: I96f35fa40221079d5498d9d2fab9c75d64698808
 2021-03-12 16:11:23 +08:00
Zoey Chen
dc1ec2d092 [Provider Model] Show Off if WFC is disabled by user 
Bug: 182232693
Test: make and atest
Change-Id: I0ef0a09adb1c9636ec14e0ab71116fd2834f1f97
 2021-03-12 15:30:07 +08:00
Weng Su
7b04b316ed Merge "[Provider Model] Update Airplane mode message" into sc-dev am: d0e98010c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815926

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I181d2ad73e8c82424dab13cbc7489c01ec8145e9
 2021-03-12 07:29:54 +00:00
Weng Su
d0e98010c4 Merge "[Provider Model] Update Airplane mode message" into sc-dev 2021-03-12 07:04:52 +00:00
Hugh Chen
9d00364da4 Fix bluetooth settings will broadcast to anywhere when some cases 
BluetoothPermissionActivity and DevicePickerFragment will send
broadcast to return the result to calling apps. As this broadcast
intent is from Settings with uid 1000, it will be sent to any
protected BroadcastReceivers in the device. It can make an attacker
send broadcast to protected BroadcastReceivers like factory reset intent
(android/com.android.server.MasterClearReceiver) via
BluetoothPermissionActivity or DevicePickerFragment.

This CL will compare to calling package name with launch package name.
If they are not equal, the broadcast will not send to launch package name.

Bug: 179386960
Bug: 179386068
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify factory reset not started and no system UI notification.

Change-Id: Ib8a5acde663e875912d300dd4912c4e9416f02f1
 2021-03-12 14:56:57 +08:00
Sooraj Sasindran
7f444ead2f Merge "update isCrossSimCallingEnabledByUser name" into sc-dev am: 14a2fd6bc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13832226

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2bcaee92a2e2c26431e9928780cda8e6d004ee25
 2021-03-12 04:19:51 +00:00
Weng Su
8ce423cdd2 [Provider Model] Update Airplane mode message 
- Show Airplane mode message when Airplane mode is enabled

- Show the same message whether Wi-Fi is enabled or disabled

- Screenshot:
  https://screenshot.googleplex.com/9FgqG7WWskRLZxo
  https://screenshot.googleplex.com/4g4kvnAT6aYN57s

Bug: 181858434
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I3cb5a8bc7cb4d1e8678eb6d75116effd00ac9432
 2021-03-12 11:49:46 +08:00
Tim Peng
624770a51d Update strings and tag it translatable 
-"Use bluetooth" -> "Use Bluetooth"
-"Use Dark Theme" -> "Use Dark theme"

Bug: 181358643
Test: manual
Change-Id: Ia999ddca2244653c3d2d32f5ea4c4e53f1c72d89
 2021-03-12 10:57:35 +08:00
Sooraj Sasindran
14a2fd6bc1 Merge "update isCrossSimCallingEnabledByUser name" into sc-dev 2021-03-11 23:55:50 +00:00
TreeHugger Robot
1f657a95ae Merge "Fallback to AOSP eSOS settings page if OEM impl fails" into sc-dev am: 9086ed36a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13828690

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3636c58d85d3df9945418203333f62ec20ced928
 2021-03-11 23:14:48 +00:00
TreeHugger Robot
9086ed36a8 Merge "Fallback to AOSP eSOS settings page if OEM impl fails" into sc-dev 2021-03-11 22:37:50 +00:00
TreeHugger Robot
73fd0ea929 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 36288fc240 -s ours am: 9444cfa8cf -s ours am: 0936026260 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e3c3442413c64768b24a7f911b8169b38e07a56
 2021-03-11 20:46:43 +00:00
TreeHugger Robot
671037ed02 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f6ba91f322 -s ours am: d3faa11064 -s ours am: 952a6a9214 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic152fa390a94346181803e15a96de950c61594ab
 2021-03-11 20:45:50 +00:00