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

79561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
05089a9491 Merge "Fix broken test" into sc-dev am: efbf7d4f07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13639636

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id519f9512b113f30b8a45a11dbae8f773826a0ad
 2021-02-23 04:33:54 +00:00
Colin Cross
f7a19e77a4 Merge changes from topic "SettingsGoogle-bp-rvc-qpr-dev-plus-aosp" into sc-dev am: e1cd3ba760 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13630935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30fbb0441ccb95c13818385a240da92c3e167ea3
 2021-02-23 04:33:20 +00:00
Colin Cross
e884797695 Merge changes from topic "SettingsGoogle-bp-rvc-qpr-dev-plus-aosp" into sc-dev am: ce44abb97d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13630934

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0f7f10a50efab04bbec161ebe41759b979542d5
 2021-02-23 04:33:18 +00:00
TreeHugger Robot
efbf7d4f07 Merge "Fix broken test" into sc-dev 2021-02-23 04:19:24 +00:00
Colin Cross
e1cd3ba760 Merge changes from topic "SettingsGoogle-bp-rvc-qpr-dev-plus-aosp" into sc-dev 
* changes:
  [automerge] Build Settings-robo-testutils for use by SettingsGoogleRoboTests 2p: dc7bc483a3
  Build Settings-robo-testutils for use by SettingsGoogleRoboTests
 2021-02-23 04:12:51 +00:00
Colin Cross
ce44abb97d Merge changes from topic "SettingsGoogle-bp-rvc-qpr-dev-plus-aosp" into sc-dev 
* changes:
  [automerge] Export proguard.flags, manifest and sources for use by SettingsGoogle 2p: 38d3b0fa18
  Export proguard.flags, manifest and sources for use by SettingsGoogle
 2021-02-23 04:12:51 +00:00
Mingguang Xu
94ab80cdbc Merge "Set Wifi scoring status when Adaptive Connectivity toggle status changes" into sc-dev am: 9a46cfcfa0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13486381

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d529edbe6cb1d46a1a7b2132b783c4265278465
 2021-02-23 03:11:00 +00:00
Mingguang Xu
9a46cfcfa0 Merge "Set Wifi scoring status when Adaptive Connectivity toggle status changes" into sc-dev 2021-02-23 02:31:41 +00:00
Alex Salo
a9f20366e3 Merge "Promotes screen timeout setting." into sc-dev am: 5315f373fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13659177

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54dc3ce8d4879fa8e302aba6088e76c288d2874f
 2021-02-22 21:10:10 +00:00
Mingguang Xu
107baf6216 Set Wifi scoring status when Adaptive Connectivity toggle status changes 
Bug: 177440342

Test: make RunSettingsRoboTests
Test: manual

Signed-off-by: Mingguang Xu <mingguangxu@google.com>
Change-Id: Ic0a3ce834c9a55a8eab702b82adb4d27642ca543
 2021-02-22 10:57:30 -08:00
Alex Salo
5315f373fa Merge "Promotes screen timeout setting." into sc-dev 2021-02-22 18:40:59 +00:00
Manish Singh
06732582ff Merge "Introduce controller for transcode notifications" into sc-dev am: 4b0a19f44e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13556052

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39e21d46537a06d273230da9dcdac3ec844f657d
 2021-02-22 18:02:11 +00:00
Manish Singh
4b0a19f44e Merge "Introduce controller for transcode notifications" into sc-dev 2021-02-22 17:39:43 +00:00
Ben Murdoch
6309c48439 Merge "Correctly select peak refresh rate." into sc-dev am: a9f0903581 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13630151

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6791071c8934ee1e0a819f777907bd1b26a2f9c
 2021-02-22 13:06:00 +00:00
Ben Murdoch
a9f0903581 Merge "Correctly select peak refresh rate." into sc-dev 2021-02-22 12:43:08 +00:00
SongFerng Wang
81c417ea37 Merge "EnabledNetworkModePreferenceController redo Init after sim activate" into sc-dev am: 63ed1b3f9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13627531

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7707094ae60024194f2de7f177d48394535bbcd
 2021-02-22 11:25:19 +00:00
SongFerng Wang
63ed1b3f9f Merge "EnabledNetworkModePreferenceController redo Init after sim activate" into sc-dev 2021-02-22 10:36:32 +00:00
Yi Jiang
ef851e84ed Promotes screen timeout setting. 
This change puts the screen timeout setting before the 'advanced' tab in
Settings->Display.

Test: manual
Bug: 180759324
Change-Id: I32081fa289be5b9c2bb1cc5089161ad70386ed39
 2021-02-22 09:03:56 +00:00
SongFerngWang
f3b21931a5 EnabledNetworkModePreferenceController redo Init after sim activate 
Failed to get RadioAccessFamily information from
TelephonyManager.getSupportedRadioAccessFamily due to SIM inactivated
Bug: 180360457
Test: atest EnabledNetworkModePreferenceControllerTest

Change-Id: Icfce6c319e9a84318c9496125718cd60dda6afbb
 2021-02-22 16:42:51 +08:00
Thiebaud Weksteen
b8754ba9df Merge "Add onPreferenceChange_update tests" into sc-dev am: 10ebd252e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13580622

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1adf75da4f35e8da621853d5dbceeec9fba5e5a
 2021-02-22 08:33:31 +00:00
TreeHugger Robot
924a74b29e Merge "Update battery saver switch string" into sc-dev am: ba17639a13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13639632

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8139d973d3d754a63226d41389fa1d80427e9ff8
 2021-02-22 08:33:13 +00:00
Thiebaud Weksteen
10ebd252e0 Merge "Add onPreferenceChange_update tests" into sc-dev 2021-02-22 08:10:10 +00:00
TreeHugger Robot
ba17639a13 Merge "Update battery saver switch string" into sc-dev 2021-02-22 08:07:38 +00:00
Tsung-Mao Fang
8e25dcaece Fix broken test 
- Remove a test which is a non-public method.
- Re-implemented the test.

Fix: 180874869
Test: Run robo test
Change-Id: Ic9716278653c874a8f7d98b56b7e32f19d157382
 2021-02-22 07:34:30 +00:00
Tom Hsu
221fb4a7fc Merge "[Provider model] Show a string on internet picker when mobile data off" into sc-dev am: a2b98fe18a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13627530

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9f96ad4906ecc9573b6cb9aa3bf5118c4787493
 2021-02-22 06:57:22 +00:00
TreeHugger Robot
e3c9b10200 Merge "Tweak UI for make profile pattern visible" into sc-dev am: 4133b7c147 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13627533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib83e31c3d54a68f83232e81620fa3e7173d32b9b
 2021-02-22 06:57:16 +00:00
TreeHugger Robot
2039331d7c Merge "Remove enroll animation from touch sensor page" into sc-dev am: d9fe64bec6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13640528

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3cfa750732e3a5a84f68237b5753d128f2472c9f
 2021-02-22 06:57:10 +00:00
TreeHugger Robot
039e402a60 Merge "Update FingerprintEnrollEnrolling for UDFPS" into sc-dev am: 7f171ee860 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13639139

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8723109b5b9aefc71046dac15d1e78ffcf6b381a
 2021-02-22 06:56:52 +00:00
Tom Hsu
a2b98fe18a Merge "[Provider model] Show a string on internet picker when mobile data off" into sc-dev 2021-02-22 06:46:36 +00:00
TreeHugger Robot
4133b7c147 Merge "Tweak UI for make profile pattern visible" into sc-dev 2021-02-22 06:25:36 +00:00
TreeHugger Robot
d9fe64bec6 Merge "Remove enroll animation from touch sensor page" into sc-dev 2021-02-22 06:25:04 +00:00
TreeHugger Robot
7f171ee860 Merge "Update FingerprintEnrollEnrolling for UDFPS" into sc-dev 2021-02-22 06:24:52 +00:00
Wesley.CW Wang
2fb3390ce6 Update battery saver switch string 
Bug: 180749420
Test: Test: make RunSettingsRoboTests -j40
Change-Id: Ibd65573a50a9c4f4ab2a055e7bdff6800cf1d873
 2021-02-22 14:23:00 +08:00
Bob Badour
8e5d48b8b5 Merge "resolve merge conflicts of cfcf58354c to sc-dev" into sc-dev am: a173e4eee5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13633063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3b243c494fd1c8aefbeb9319ae806bc2ea41181
 2021-02-21 20:25:05 +00:00
Bob Badour
6c6bae7ae8 Merge "resolve merge conflicts of cfcf58354c to sc-dev" into sc-dev am: 0b209e94e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13636365

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If53d9e82558dddcd22c7053231d0bf691bd1c65d
 2021-02-21 20:24:58 +00:00
Bob Badour
a173e4eee5 Merge "resolve merge conflicts of cfcf58354c to sc-dev" into sc-dev 2021-02-21 20:09:42 +00:00
Bob Badour
0b209e94e2 Merge "resolve merge conflicts of cfcf58354c to sc-dev" into sc-dev 2021-02-21 19:50:22 +00:00
Bob Badour
8144f76a6f [automerger skipped] [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings am: 0e73d05c74 -s ours 
am skip reason: Change-Id I81f11a66b5977cb5096e262819084706af5fa54c with SHA-1 6695ff84d9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic68c70e60c1c207b7ff2f70ff9a221543d01cf4f
 2021-02-21 18:58:16 +00:00
Manish Singh
cbbe9da1ad Introduce controller for transcode notifications 
This is to provider users with control over whether to show transcoding
notifications or not.

By default we show the notifications.

The controller resides within the Media transcoding settings under
Developer Options.

BUG: 170973510
Test: manual. unit test added.
Change-Id: I7172f583ce4c1a53e5d5ccc07625f201852db43a
 2021-02-21 18:31:06 +00:00
Bob Badour
0e73d05c74 [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings 
Added SPDX-license-identifier-Apache-2.0 to:
  Android.bp
  protos/Android.bp
  tests/anomaly-tester/Android.bp
  tests/perftests/Android.bp
  tests/robotests/Android.bp
  tests/uitests/Android.bp
  tests/unit/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work

Change-Id: I81f11a66b5977cb5096e262819084706af5fa54c
Merged-in: I81f11a66b5977cb5096e262819084706af5fa54c
 2021-02-21 08:50:16 -08:00
Adam Bookatz
7aca7e8a88 [automerger skipped] Merge "Update new owners for battery pages." am: c2c5de6199 am: 9e3bb7026c am: 227d74be02 -s ours am: e71853e687 -s ours 
am skip reason: Change-Id I330d074c6e504493abf4cece51199ec5851b5d3b with SHA-1 9a90dc1e8e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ee0cf1c61c66c62c97c7f52ed3434648e196fe5
 2021-02-20 18:26:08 +00:00
Treehugger Robot
b032ef3393 Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657 am: 00eaf3f7e0 am: fef782861a am: 26e6c1852c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1581223

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I058c180e53fade9859bd14b1cd88720af70d62e1
 2021-02-20 18:25:25 +00:00
Lorenzo Colitti
d7bbf96b04 Merge "Reset VPN settings by calling VpnManager." am: be4a0e84ef am: 9e072f09a0 am: e584f62ac4 am: 5320dbda4e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1594351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I73ee4a3ab2c96f886d0dac18f834c5e74d7601de
 2021-02-20 18:23:02 +00:00
Bob Badour
1bb0e0c6b6 [automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings" am: 7d8e27cbb5 am: 358e0966fc am: cfcf58354c -s ours am: 5cdada2888 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1588487

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I512d78a9afc9f17e0209747093b0c69e226b889e
 2021-02-20 18:08:00 +00:00
Adam Bookatz
e71853e687 [automerger skipped] Merge "Update new owners for battery pages." am: c2c5de6199 am: 9e3bb7026c am: 227d74be02 -s ours 
am skip reason: Change-Id I330d074c6e504493abf4cece51199ec5851b5d3b with SHA-1 9a90dc1e8e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I374fc14a6caa59f3d09cfa421cb84cb582f1c1a0
 2021-02-20 17:40:35 +00:00
Treehugger Robot
26e6c1852c Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657 am: 00eaf3f7e0 am: fef782861a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1581223

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05a62b623436440c077018d11d6d27a1d3ec63f6
 2021-02-20 17:40:26 +00:00
Lorenzo Colitti
5320dbda4e Merge "Reset VPN settings by calling VpnManager." am: be4a0e84ef am: 9e072f09a0 am: e584f62ac4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1594351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24d89cb5138f86d86a0981b7580f52c50b70133b
 2021-02-20 17:32:39 +00:00
Bob Badour
5cdada2888 [automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings" am: 7d8e27cbb5 am: 358e0966fc am: cfcf58354c -s ours 
am skip reason: skipped by user jeffv

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie23e5f0ee4a9d4e4fb2a2afbc174818528862721
 2021-02-20 17:22:59 +00:00
TreeHugger Robot
613ae2b291 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a48e464981 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9057e357cfadecf73718c8f021d1fdd1f27e42a
 2021-02-20 16:37:35 +00:00
TreeHugger Robot
a48e464981 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-20 15:52:38 +00:00