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

35785 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Fan Zhang
9fdceaea78 Fallback to AOSP eSOS settings page if OEM impl fails 
When OEM eSOS implementation fails for any reason (app disabled,
misconfigured, etc), Emergency SOS settings should fallack to the
default settings page (rather than hiding the setting entirely)

Bug: 180959553
Test: robotests
Change-Id: I31c08449eff3f01d4c33bf827023f17beade93c2
 2021-03-11 20:30:55 +00:00
Sally Yuen
c2025d7180 Merge "Add seekBar properties 'tickMark' to LabeledSeekBarPreference" into sc-dev 2021-03-11 17:41:42 +00:00
Almaz Mingaleev
5238602615 Merge "Move GeoTZ toggle to Date&Time settings screen." into sc-dev am: 4a3ff95367 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816452

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia67d2fba5b231a7508158c61df75cae77717b4ab
 2021-03-11 14:22:19 +00:00
Almaz Mingaleev
4a3ff95367 Merge "Move GeoTZ toggle to Date&Time settings screen." into sc-dev 2021-03-11 14:04:01 +00:00
Wesley Wang
54b58b9a97 Merge "Update UsageProgressBarPref icon when device is charging or low battery" into sc-dev am: 1d5d101aa6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13805543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id96b38dce8a4dc895bbd2263df16c17294bf0fa4
 2021-03-11 08:07:53 +00:00
Arc Wang
c57f2917bd Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: 3d1658e93d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824398

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief0358d51ddbace52059bbe3f8860fcac6ef1629
 2021-03-11 08:07:40 +00:00
Wesley Wang
1d5d101aa6 Merge "Update UsageProgressBarPref icon when device is charging or low battery" into sc-dev 2021-03-11 07:53:12 +00:00
Arc Wang
3d1658e93d Merge "Hide non-system overlay window on ActivityPicker" into sc-dev 2021-03-11 07:45:43 +00:00
TreeHugger Robot
921567214d Merge "Use title area for enrollment error messages" into sc-dev am: 53d7495162 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824391

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id960686ac67fad4be87622d6ad81bf745bd42a62
 2021-03-11 06:44:26 +00:00
Wesley.CW Wang
e940dcb448 Update UsageProgressBarPref icon when device is charging or low battery 
- Add new icon for battery low state
 - Update UsageProgressBarPref icon when charging or low battery
 Screenshots:
   https://screenshot.googleplex.com/9HBvV6t6dVsG8eD.png
   https://screenshot.googleplex.com/6TsRu6BTN338FvT.png
   https://screenshot.googleplex.com/nGE29cfsmgKuuaP.png
   https://screenshot.googleplex.com/85NWXSg2PevXAsy.png

Bug: 179237746
Test: make RunSettingsRoboTests -j40
Change-Id: I057874bbf45594c90466cf346b054bf033815dac
 2021-03-11 06:32:20 +00:00
TreeHugger Robot
53d7495162 Merge "Use title area for enrollment error messages" into sc-dev 2021-03-11 06:16:42 +00:00
Yi Jiang
5531480a80 Merge "Fixes UI style issues in Screen Timeout setting" into sc-dev am: 5c11109ffc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13828187

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If656cd60942d21319e1f49044285141bdfb5643f
 2021-03-11 05:14:04 +00:00
Yi Jiang
5c11109ffc Merge "Fixes UI style issues in Screen Timeout setting" into sc-dev 2021-03-11 04:48:04 +00:00
Arc Wang
3b4853e109 Hide non-system overlay window on ActivityPicker 
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I6e2845cc19dc012cba2933318a067bbb8db90a23
 2021-03-11 12:10:18 +08:00
Treehugger Robot
c96d4d9328 Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f am: eda1be644f am: 2817c677b1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91223c2147f0ea173fe4bb8675d692fba0f80615
 2021-03-11 03:59:54 +00:00
Treehugger Robot
2817c677b1 Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f am: eda1be644f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I755a0f00c44dfd39b84e4f843a1553de2e8850a2
 2021-03-11 03:23:22 +00:00
Treehugger Robot
eda1be644f Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80ebc15814491a28b3da23b6554b81022ab49db3
 2021-03-11 02:41:39 +00:00
Kevin Chyn
4ff118db02 Merge changes from topics "fp-revokeChallenge", "new-revokeChallenge" into sc-dev am: 13b05b6fb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13820985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6343bd4f0c9cfcb3d76cb11ed627f8ec54680ab
 2021-03-11 02:00:45 +00:00
Kevin Chyn
26e7d7d23a Update revokeChallenge together with frameworks/base am: e91e39b604 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13818078

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76939100b1559b07ef29c58e7e348296f246bbc0
 2021-03-11 02:00:43 +00:00
Kevin Chyn
13b05b6fb8 Merge changes from topics "fp-revokeChallenge", "new-revokeChallenge" into sc-dev 
* changes:
  Update fingerprint revokeChallenge with frameworks/base
  Update revokeChallenge together with frameworks/base
 2021-03-11 01:14:15 +00:00
Sooraj Sasindran
1ce8eb765a update isCrossSimCallingEnabledByUser name 
update isCrossSimCallingEnabledByUser name to
isCrossSimCallingEnabled

Bug: 179143945
Test: build
Change-Id: I8bb0196cc04dc437ed709548ecd569c4dd7828a1
 2021-03-10 16:43:49 -08:00
jasonwshsu
ffe8521b9f Add seekBar properties 'tickMark' to LabeledSeekBarPreference 
Bug: 173940869
Test: manual
Change-Id: I135e52181bdb86ded6187a3fa30b9cffeb69d451
(cherry picked from commit 9584ba6b57)
 2021-03-10 23:34:26 +00:00
Treehugger Robot
e9dff191b0 Merge "Update src/com/android/settings/inputmethod/OWNERS" 2021-03-10 23:05:57 +00:00
Yi Jiang
01f1c660a0 Fixes UI style issues in Screen Timeout setting 
1. Remove help url and search icon.
2. Uses BannerMessage for permission missing notification.

Test: manual
Bug: 182297705
Change-Id: Id4dc998d7276f4c4f7593b1b0312d92097ec83cf
 2021-03-10 12:58:46 -08:00
Ahaan Ugale
6819eb7a83 Merge "AF: Unit tests for PasswordsPreferenceController." into sc-dev am: e9355553ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13797113

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7276a0f144ca9787c220efbb884a07841dda0a4
 2021-03-10 20:15:17 +00:00