Commit Graph

80546 Commits

Author SHA1 Message Date
Alex Salo
f23dcc7776 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: I1bb808335b5f4a044412ff372862c78d315cbf8a
2021-02-22 21:10:01 +00:00
Yu-Han Yang
e93c1298fc Move LocationServicePreference to Location > LocationServices
Bug: 180533061
Test: manual on device
Change-Id: Idd700f5c530af67f4936e207e42988267185f256
2021-02-22 11:49:14 -08: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
a80c9c396a 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: I59140ece443a8d0f12629d2d2a4b5f57aa2be5da
2021-02-22 18:01:36 +00:00
Manish Singh
4b0a19f44e Merge "Introduce controller for transcode notifications" into sc-dev 2021-02-22 17:39:43 +00:00
Ben Murdoch
f9f346e4a7 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: I4d18a7a2e3e57c06f3e2d3b0e887237eda483da6
2021-02-22 13:05:35 +00:00
Ben Murdoch
a9f0903581 Merge "Correctly select peak refresh rate." into sc-dev 2021-02-22 12:43:08 +00:00
SongFerng Wang
a7abe16b0c 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: I1b6b04bd3ad95a69dd8869c2c394f8d22b27ca86
2021-02-22 11:25:23 +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
5227a76ef3 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: Iadc4f55aef42ade37dba915b41bc2a332ecadd64
2021-02-22 08:33:33 +00:00
TreeHugger Robot
ef0dfe0d86 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: I057c9b68cd749ade203f215f1af2f2407d0bbf4a
2021-02-22 08:33:10 +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
Chiachang Wang
0f40c023f6 Replace NetworkUtils methods
NetworkUtils is moved to connectivity mainline module which is
not accessible for module outside. getNetworkPart() method is
used by wifi lib and Settings but no usage inside the module,
so move the method to framework lib to share with wifi lib and
Settings.

Also, NetworkUtils.numericToInetAddress() method is also hidden
and deprecated. It should be replaced by
InetAddresses.parseNumericAddress().

Update the corresponding usage to refer to these methods.

Bug: 172183305
Test: atest SettingsRoboTests
Change-Id: I8240b1c74b53d5d66850d9a3ec7d5e5c11558e6a
Merged-In: I2fb674e0d7da0b11ba70177853fd6259bce372a3
2021-02-22 15:35:17 +08: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
543d46be36 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: Ieae780dde69ab48db48042bc0e241f8802d570cb
2021-02-22 06:57:23 +00:00
TreeHugger Robot
7f3e751277 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: Ieb6d5888db3216cbd2d9c9dc4cae6e9bc274794a
2021-02-22 06:57:19 +00:00
TreeHugger Robot
b2ffdda55d 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: Ib3fbcd76ac6f9e0fabc20045339248fdccaa4133
2021-02-22 06:57:13 +00:00
TreeHugger Robot
d3493f159f 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: I8abde456b90e7a530635ce3f819066fe30564635
2021-02-22 06:56:26 +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
Calvin Pan
5691d50272 Show VoLTE UI when VoIMS opt-in enabled
Show VoLTE settings if VoIMS opt-in has been enabled irrespective
of other VoLTE settings.

Bug: 177010560
Test: Override hide_enhanced_4g_lte_bool to true and check the UI.
Change-Id: Ib305bae904f0028571874e204a415dfcd4457982
2021-02-22 04:32:53 +00:00
Bob Badour
fb00d1c5b3 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: I94782b1ab3e5c237d804cbb5941c264fc7990fe1
2021-02-21 20:24:42 +00:00
Bob Badour
50e3d50753 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: Ie37237ed214a3e09f8fde48469bbbf4c96c18900
2021-02-21 20:24:35 +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
9512b0f9ce [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: I918a0bc2349cb131c61f692380b33660ac36e844
2021-02-21 18:57:51 +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
Xin Li
ad3fa60e26 Merge ab/7061308 into stage.
Bug: 180401296
Merged-In: I35fe00aeeb112d5d9971985619e3ec5095dcdb7b
Change-Id: I07d008e38827280c9e9c6b7fa31393309f9de8a3
2021-02-21 09:25:11 -08: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
Bill Yi
90dccc1703 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-20 20:07:46 +00:00
Adam Bookatz
4a0ddee053 [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: I08ea4022a74fcc0dd327dc3691ec599e6e4f9e6f
2021-02-20 18:27:07 +00:00
Treehugger Robot
87bd9a8179 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: I662b436248adf06a5b2956b5874fd99f9ef85385
2021-02-20 18:26:38 +00:00
Lorenzo Colitti
3061f7f1c0 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: I7d209c095b6929961747e7506a3d98c5791d20f8
2021-02-20 18:23:15 +00:00
Bob Badour
a20b01cc46 [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: I2adcd446d2f9c8805084b035b74d55525bb76415
2021-02-20 18:07:40 +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
9ce3035190 [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: Ie3f3ffaa54204258d428620ec9012e90745dfb86
2021-02-20 16:40:10 +00:00
TreeHugger Robot
71cc762f14 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-20 16:14:47 +00:00
TreeHugger Robot
a48e464981 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-20 15:52:38 +00:00
Weng Su
880e2ab494 Owners updates
- Add wengsu to network path for provider model feature implementation

- Add wifi/OWNERS to tests/unit/src/com/android/settings/wifi/OWNERS

Bug: 180778022
Test: N/A, just owners update
Change-Id: I9255fb4980dbbe163850be2459528a3380c15d76
2021-02-20 12:58:25 +00:00
Bill Yi
46865bb769 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9f3516fd312c8dc0048777e85934029ef6d5e086
2021-02-20 12:15:49 +00:00