Bill Yi
226146afee
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 090db24c56 -s ours am: b702fdea6d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356374
Change-Id: I6bb725127c897cead36281c2e7f483425a11de2f
2021-04-30 03:24:24 +00:00
TreeHugger Robot
58bc66b149
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 041b99ccd5 -s ours am: e30f685d83 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356625
Change-Id: Iaf925bcfc2a6d543310c036252fe94983d705a30
2021-04-30 03:22:49 +00:00
TreeHugger Robot
8f8666e3d0
Merge "Retain and restore showSystem state when rotated" into sc-dev
2021-04-30 03:19:41 +00:00
TreeHugger Robot
bf0ef5b73a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fb47f1e143 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356372
Change-Id: Id4e60f2c23a41d97a346fa2dc13b233217f54cdc
2021-04-30 03:07:42 +00:00
Bill Yi
ff5e910f46
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6bb78b6d1b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356373
Change-Id: I437a411a2a7e2691520722955b963699c6710511
2021-04-30 03:05:22 +00:00
TreeHugger Robot
016f441365
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6c7771a521 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356378
Change-Id: I52d508ee6476430e6bc48ed732505a11073d96ab
2021-04-30 02:59:48 +00:00
TreeHugger Robot
e30f685d83
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 041b99ccd5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356625
Change-Id: Ib05c6186fcc1752800cd65f83b311ec2ab84dbf2
2021-04-30 02:58:37 +00:00
TreeHugger Robot
b1802372ab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 01aeea2e4a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356624
Change-Id: Ic2ad52edf6ccdea95b351c1c20ee333307753a9e
2021-04-30 02:56:47 +00:00
Bill Yi
b702fdea6d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 090db24c56 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356374
Change-Id: Ic9e3f7394d14440fc23b25b34547ebf492df66a7
2021-04-30 02:56:10 +00:00
TreeHugger Robot
fb47f1e143
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-04-30 02:35:40 +00:00
TreeHugger Robot
6c7771a521
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-30 02:30:38 +00:00
TreeHugger Robot
041b99ccd5
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-30 02:23:38 +00:00
TreeHugger Robot
01aeea2e4a
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-04-30 02:21:29 +00:00
Menghan Li
a52bf99fd1
Merge "Improve search by adding the settings keywords for supported framework feautres" into sc-dev am: 1576980095 am: 3e0080956d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299189
Change-Id: Icbd6b911a29aac29b41f21b45bd24e507ff9e0fe
2021-04-30 00:12:58 +00:00
Menghan Li
3e0080956d
Merge "Improve search by adding the settings keywords for supported framework feautres" into sc-dev am: 1576980095
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299189
Change-Id: Ic5d918e2ee2ffced61e5ab9f1011411c4e95094a
2021-04-29 23:52:07 +00:00
Menghan Li
1576980095
Merge "Improve search by adding the settings keywords for supported framework feautres" into sc-dev
2021-04-29 23:23:34 +00:00
menghanli
cdcc3ae52c
[Material Next] Update accessibility tool footer style
...
1. Implement API extends Material Next FooterBarPreference and support Accessibility API for icons
2. Apply solutions to accessibility tools and framework tools in
accessibility settings page.
3. Apply DashboardFragment for Caption preference for xml parser
Bug: 185973304
Test: make RunSettingsRoboTests -j52
Change-Id: I6b80bc80190d6666e3fbcd462442a9f2c0e60bba
2021-04-30 07:19:29 +08:00
Yu-Han Yang
c2ea62d1f8
Retain and restore showSystem state when rotated
...
Bug: 182275573
Test: on device
Change-Id: I8a7e2d1ceb715cb6df470d7e3131b82d12ba6fa1
2021-04-29 15:39:28 -07:00
Bill Yi
f8b4a0e963
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia4358bb5d5d07fb2401926298d083bc716834c5f
2021-04-29 21:10:54 +00:00
Bill Yi
8c5796014f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0a606fcf13d894d280306449b80991be0f3234e5
2021-04-29 21:03:06 +00:00
Bill Yi
090db24c56
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I10014f28a6678e3510e293bde00e2ccd909406f7
2021-04-29 20:58:45 +00:00
Bill Yi
98cbf6d0a9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2c4d8200a195a4c1ec9b7d140254085e6762219d
2021-04-29 20:55:07 +00:00
Bill Yi
6bb78b6d1b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I273a20694088e7716213b38d7983319fc10ef3fb
2021-04-29 20:52:24 +00:00
Bill Yi
9b1f0ab131
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I97875f1775c63f4a62f82808da766d37da190f2f
2021-04-29 20:48:53 +00:00
Julia Reynolds
c16c0d4628
Add placeholder values to placeholder settings
...
So there are no animations when the real data is available.
Test: manually view notification paget
Fixes: 186494741
Fixes: 182232213
Fixes: 183177992
Change-Id: Ic210fa1b545537689df9b69eb5fe6b990f65ad13
2021-04-29 16:38:53 -04:00
Almaz Mingaleev
af9aa076df
Merge "Place GeoTZ toggle under auto time zone toggle." into sc-dev am: c51cefb2b9 am: e291bcfdd8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353668
Change-Id: If2adfb297a40cdc4decdd183092a514f56fb46d0
2021-04-29 20:11:51 +00:00
Almaz Mingaleev
e291bcfdd8
Merge "Place GeoTZ toggle under auto time zone toggle." into sc-dev am: c51cefb2b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353668
Change-Id: Ib087abea81bfb49d0ebd6b30a8ac96de4bd1d989
2021-04-29 19:49:46 +00:00
Almaz Mingaleev
c51cefb2b9
Merge "Place GeoTZ toggle under auto time zone toggle." into sc-dev
2021-04-29 19:09:37 +00:00
Almaz Mingaleev
ac584f2911
Place GeoTZ toggle under auto time zone toggle.
...
This moves the two toggles that control the time zone detection
behavior next to each other, rather than having them either side
of the current device time zone. This is intended to making it
clear they are both influencing detection behavior. It will ensure
that future text we put under the auto time zone toggle for the
tablet use case (where there is no telephony detection) explaining
that "Use location to set time zone" has to be on will be right
next to the toggle that needs to change.
Bug: 152746236
Bug: 186625820
Test: flashed device, checked manually
Change-Id: Ifd43db3d5cc7e764b12f8da20e552b1a5479ac4a
2021-04-29 18:43:27 +00:00
Yi Jiang
240ef2d1e1
Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: 16b0f660ae am: 2b25a6cec4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14114425
Change-Id: I0b72a2f0dc742efad756a84212786820c4cb22dc
2021-04-29 17:47:42 +00:00
Amit Mahajan
93b4b46cf2
Merge "Fix incorrect logging." into sc-dev am: 6402ac45e6 am: 748bbd8a06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330728
Change-Id: If36d6a5884bfbc76ebf52736b864cc50ecaf6ff9
2021-04-29 17:46:56 +00:00
Yi Jiang
2b25a6cec4
Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: 16b0f660ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14114425
Change-Id: I1e5b63729f31d7d0e9fdd64c2b8bf500fe25edba
2021-04-29 17:23:43 +00:00
Yi Jiang
16b0f660ae
Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev
2021-04-29 17:19:34 +00:00
Amit Mahajan
748bbd8a06
Merge "Fix incorrect logging." into sc-dev am: 6402ac45e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330728
Change-Id: I19bdf202606748de850fc68fa2abf7c1b58ab197
2021-04-29 17:16:13 +00:00
Amit Mahajan
c58284d2b5
Get rid of redundant mSubId.
...
Test: none
Bug: 182326102
Change-Id: I0be2923ed28551aef57fb85f2914f7f8f40a12f9
2021-04-29 09:56:58 -07:00
Amit Mahajan
6402ac45e6
Merge "Fix incorrect logging." into sc-dev
2021-04-29 16:54:06 +00:00
Jan Tomljanovic
07bffff454
Launch SecurityHub fragment on SECURITY_SETTINGS intent when available.
...
Test: atest SettingsUnitTests
Test: adb shell am start -a android.settings.SECURITY_SETTINGS opens
SecurityHub screen (when SecurityHub enabled)
Test: assistant opens SecurityHub screen (when SecurityHub enabled) when
given instrucion to "open security settings"
Bug: 183930061
Change-Id: Ie8fcb2f2dce4cd0a2a84c6cd21a0a1c0b2b3665e
2021-04-29 17:38:52 +01:00
Yichi Chen
70a9e8ea3e
RefreshRatePrefCtr: Correct the check of peak refresh rate
...
The peak refresh rate will not be guaranteed to be integer, but
config_defaultPeakRefreshRate only takes integer into the comparison.
To expose the smooth display is enabled by default in Settings, the
patch corrects the check of peak refresh rate with proper rounding.
Bug: 185102566
Test: Enable smooth display by default in Settings
Change-Id: I658ce22cf0b0a108c4b721e3e5320caf9c379639
2021-04-29 23:34:12 +08:00
Weng Su
1f24c6a968
[DO NOT MERGE] Modify Wi-Fi details settings to restricted style
...
- Show restricted text in guest mode
- Screenshot:
https://screenshot.googleplex.com/6nYcmazMM46TxaB
Bug: 177573895
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiNetworkDetailsFragmentTest
Change-Id: I5f857b2079e0f550e4be601d27dd54dac56b2f57
Merged-In: I5f857b2079e0f550e4be601d27dd54dac56b2f57
2021-04-29 14:38:27 +00:00
Weng Su
649bed1524
[DO NOT MERGE] Modify Wi-Fi details settings to restricted style
...
- Show restricted text in guest mode
- Screenshot:
https://screenshot.googleplex.com/6nYcmazMM46TxaB
Bug: 177573895
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiNetworkDetailsFragmentTest
Change-Id: I5f857b2079e0f550e4be601d27dd54dac56b2f57
Merged-In: I5f857b2079e0f550e4be601d27dd54dac56b2f57
2021-04-29 13:11:33 +00:00
Matt Pietal
d17b6d022a
Merge "SUW - Apply theme to FRP PIN pages" into sc-dev am: 0ddacf1152 am: eadf475e12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339991
Change-Id: I566e454c3ff2349f34574f9aa9bd423295167bd8
2021-04-29 12:36:28 +00:00
Matt Pietal
eadf475e12
Merge "SUW - Apply theme to FRP PIN pages" into sc-dev am: 0ddacf1152
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339991
Change-Id: I8480d5b9775393c969026b7932b23551cd7f639d
2021-04-29 12:20:17 +00:00
ryanlwlin
6269a92e16
Move Magnification Mode Settings to the main page
...
We move the mode settings because currently there is
only one item in the settings page. To fully test all logic,
we don't use fragament anymore in the controllerTest, and
test the interaction between the controller and the fragment
in the test of these two fragments.
Bug: 182992338
Test: atest ToggleScreenMagnificationPreferenceFragmentTest
atest MagnificationModePreferenceControllerTest
atest MagnificationSettingsFragmentTest
manually test
Change-Id: Ia6b0ea4f116f3215407637d7aeaddb8d8196d8fb
2021-04-29 20:12:35 +08:00
Matt Pietal
0ddacf1152
Merge "SUW - Apply theme to FRP PIN pages" into sc-dev
2021-04-29 12:04:44 +00:00
Wesley.CW Wang
6adeed1a2c
Update batter saver page footer (1/2)
...
- Remove iconSpaceReserved since settings theme already handle it
- Add underline
Bug: 183689347
Test: make SettingsRoboTests
Change-Id: Ib52cfb48453d49b1ead3bf19183449cc18018dd3
2021-04-29 11:12:50 +00:00
Tom Hsu
7c7f779b71
Merge "[ApnEditor] Create another string id for translation" into sc-dev am: 58fb70f8d6 am: 0a930e3e91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327014
Change-Id: Ib1183617dff27afb93de5359529fe0388d58e6da
2021-04-29 09:31:10 +00:00
Wesley Wang
37fa9c79fc
Merge "Make app usage page active time support time period" into sc-dev am: 04e14e41f0 am: ec3961fab1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297857
Change-Id: I3fa96de61655f440698b4091318976860965c2b9
2021-04-29 09:30:49 +00:00
Tom Hsu
0a930e3e91
Merge "[ApnEditor] Create another string id for translation" into sc-dev am: 58fb70f8d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327014
Change-Id: I34cdfcd694606fcddad85d689a68e5c049df6f89
2021-04-29 09:24:36 +00:00
Wesley Wang
ec3961fab1
Merge "Make app usage page active time support time period" into sc-dev am: 04e14e41f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297857
Change-Id: Idfc4fda23a670fe7a2de255818af13daf14c3910
2021-04-29 09:23:44 +00:00
Tsung-Mao Fang
96a4e396fb
[automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 697a73dfdf -s ours am: c12e5f2455 -s ours am: ea699a1d2c -s ours am: 2e807e4f0b -s ours
...
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 80c3f6d4d8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794
Change-Id: I2548ce0d6e6715166176786dafb69eac04cdc09f
2021-04-29 09:22:31 +00:00