Commit Graph

83843 Commits

Author SHA1 Message Date
TreeHugger Robot
e438ee94a1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 51f4ffc818 -s ours am: 575e06dbb1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I021f7e67cc85b52f108146e5a01282983c9204ba
2021-06-15 15:16:43 +00:00
TreeHugger Robot
4a60392fe6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-15 15:15:14 +00:00
TreeHugger Robot
575e06dbb1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 51f4ffc818 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I39c51016f6aa5fd5f6133bf3ef730c68faa39755
2021-06-15 15:13:28 +00:00
Bill Yi
aa175423f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf3c5c098 -s ours am: cb28fd1d30 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5d736fa841ac0ceac2511564a5eb1731fa6d2380
2021-06-15 15:13:01 +00:00
TreeHugger Robot
d99ea16f1f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c2989e3d1c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I887130ef39d637d70471d18562c506f1a87663bc
2021-06-15 15:12:49 +00:00
TreeHugger Robot
c1a7c656d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 59205fce57 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3fa36283732c14f8863e22d9086b685d9ec33f55
2021-06-15 15:12:34 +00:00
Bill Yi
cb28fd1d30 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf3c5c098 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If2412a5d6b1ec925ca9b9e8404b75110519b9809
2021-06-15 15:12:33 +00:00
TreeHugger Robot
51f4ffc818 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-15 15:02:11 +00:00
TreeHugger Robot
c2989e3d1c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-15 14:57:42 +00:00
TreeHugger Robot
59205fce57 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-15 14:56:52 +00:00
Zimuzo Ezeozue
fdfebb9ff9 Merge "Turn off transcoding notification by default" into sc-dev am: 653e7c91c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964377

Change-Id: I88a6a60d78ee4e0b5fc37cdbb73c4b70f082466b
2021-06-15 13:59:20 +00:00
Bill Yi
af994f1ee2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie1f5759a3bb75dc44970be04baff77093925ef39
2021-06-15 13:50:46 +00:00
Zimuzo Ezeozue
653e7c91c8 Merge "Turn off transcoding notification by default" into sc-dev 2021-06-15 13:49:19 +00:00
Bill Yi
94ab13af15 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8ed8b655dd1025abc355482a2b85489c47f8cb6e
2021-06-15 13:41:45 +00:00
Bill Yi
acf3c5c098 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibdaa7a59ef596ef9bbcd939ba148b62c972100c4
2021-06-15 13:37:16 +00:00
Bill Yi
532ae047f0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia1ba0b60387c6aa399159adb1d5f0f5dc2bb9f79
2021-06-15 13:33:58 +00:00
Bill Yi
249bbe6eb2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I73596799727795b1b40049069e52ee2980ffd937
2021-06-15 13:29:45 +00:00
Menghan Li
b75edfa43d Merge "Add strings for use accessibility gesture" into sc-dev am: 92aaef1dac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934763

Change-Id: Id84c3120ee7e2155df932246f997415143c4b69e
2021-06-15 12:49:27 +00:00
TreeHugger Robot
91d1b6640a Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev am: ab04f86066
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964828

Change-Id: Ic475adfb73db01568b37e557b6ba7b418de694fe
2021-06-15 12:49:15 +00:00
Menghan Li
92aaef1dac Merge "Add strings for use accessibility gesture" into sc-dev 2021-06-15 12:43:16 +00:00
TreeHugger Robot
ab04f86066 Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev 2021-06-15 12:36:38 +00:00
Syaoran Kuo
294c9201ea Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880643

Change-Id: I3108b14e2d0433fcd365487dca02d9819d27aab7
2021-06-15 11:36:07 +00:00
Syaoran Kuo
66eaa371ff Merge "Fix resource id not match issue." into sc-dev 2021-06-15 10:48:58 +00:00
Peter Wang
655375feff Merge "Use BC theme for ChooseSimActivity" into sc-dev am: 03d2f8d749
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942792

Change-Id: Ia0bf224ad24c0d8a4913f3bc80eeec7cbf499f1d
2021-06-15 10:18:26 +00:00
Peter Wang
03d2f8d749 Merge "Use BC theme for ChooseSimActivity" into sc-dev 2021-06-15 10:02:34 +00:00
Weng Su
58a651566f [Provider Model] Remove Wi-Fi disconnect action
Bug: 189912933
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: I964bf8de4f5eee1523943876567bf565ccb7f995
2021-06-15 17:43:31 +08:00
TreeHugger Robot
43dad72bff Merge "Add loading progress to Internet Settings" into sc-dev am: 2ff8b363da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934764

Change-Id: I9c63453411446c05b0f959861c4b0fac6e1c404a
2021-06-15 09:36:10 +00:00
TreeHugger Robot
479c1a1c5d Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760

Change-Id: Ibb9fbd5e9013b1696d3c43358f270fef286a3bec
2021-06-15 09:36:05 +00:00
TreeHugger Robot
2ff8b363da Merge "Add loading progress to Internet Settings" into sc-dev 2021-06-15 09:24:27 +00:00
TreeHugger Robot
1ce0d1117e Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev 2021-06-15 09:23:58 +00:00
TreeHugger Robot
033a6c3eec Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev am: 153c3a1dc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14956530

Change-Id: I484d68f6faa3ad4b6f6720542bcf27430a1fd685
2021-06-15 09:19:14 +00:00
TreeHugger Robot
153c3a1dc2 Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev 2021-06-15 09:11:18 +00:00
TreeHugger Robot
d441988494 Merge "Revert "[Provider Model] Add WiFi toggle in internet panel"" into sc-dev am: 68079c7bd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964819

Change-Id: Iac506e82bc506374ccc5e341a659da7df4623a02
2021-06-15 08:16:37 +00:00
ykhung
64112f65fd [GAR] fix spoke a percentage number is not the same as displayed content
in the Battery Saver and Battery Share, we have customized rule to map
the seekbar progresss to another displayed percentagge value, which
cause the a11y will speak the incorrect state, since the state is
referenced the original progress value. we add a method to override it
into our cusromized value.

Bug: 187780942
Bug: 190958777
Test: make SettingsGoogleRoboTests
Change-Id: Ie630ac03e66c2f8da1df00d6d2616b2e6979aa3e
2021-06-15 08:09:17 +00:00
TreeHugger Robot
68079c7bd2 Merge "Revert "[Provider Model] Add WiFi toggle in internet panel"" into sc-dev 2021-06-15 07:59:57 +00:00
menghanli
6fa82981a6 Add strings for use accessibility gesture
Bug: 190563948
Test: Manual test
Change-Id: Id9d23bd7a4e4d57b3ab7fb84815cc3df226fc00d
2021-06-15 14:39:15 +08:00
TreeHugger Robot
1c7f9846a1 Merge "Fix test failures" into sc-dev am: ffd695983c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964818

Change-Id: Ib3a0515d090845098292479f01be16fa31afaf3d
2021-06-15 06:29:56 +00:00
TreeHugger Robot
ffd695983c Merge "Fix test failures" into sc-dev 2021-06-15 06:17:52 +00:00
Wesley Wang
f294981a7d Merge "Make App info page support new battery entry" into sc-dev am: f2a884b8be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800151

Change-Id: I958acb81047e0e459ddc8efb458ee7f0effb1afe
2021-06-15 04:58:02 +00:00
Wesley Wang
f2a884b8be Merge "Make App info page support new battery entry" into sc-dev 2021-06-15 04:41:16 +00:00
Weng Su
28e5f4c2fc Revert "[Provider Model] Add WiFi toggle in internet panel"
This reverts commit 04a4060225.

Reason for revert: Need to split the functions for cherry picking to different branches

Bug: 189912933
Change-Id: I8c30a87c83e23b3df88ce2689d500626e1dd28d2
2021-06-15 04:10:13 +00:00
Midas Chien
c5a736f633 Merge "Change strings for force highest refresh rate in Developer options" into sc-dev am: 9598398df3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934758

Change-Id: I046cd43607ef3abe416967bdb3acbfacb3f15590
2021-06-15 04:10:06 +00:00
Midas Chien
9598398df3 Merge "Change strings for force highest refresh rate in Developer options" into sc-dev 2021-06-15 04:00:43 +00:00
Arc Wang
ff5bb849ba Fix test failures
Add the color contextual_card_background to fix.

Bug: 190868608
Bug: 190870129
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SliceContextualCardRendererTest
      make RunSettingsRoboTests ROBOTEST_FILTER=SliceHalfCardRendererHelperTest
Change-Id: I430dab9c72a8f4efb2402e44fd015c1c1ce0f7e6
2021-06-15 10:25:06 +08:00
TreeHugger Robot
e919947ad0 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: Ibbef8459369b5f31315e0680f69e8e2a3e4d2868
2021-06-15 01:11:37 +00:00
TreeHugger Robot
052ae78759 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev 2021-06-15 00:57:46 +00:00
Peter Wang
43fe473265 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: I55ec0dbdc4484a507558624e9a4ffc0afde4baea
2021-06-14 18:15:02 +00:00
Peter Wang
5a6655d356 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev 2021-06-14 17:58:40 +00:00
TreeHugger Robot
958d43aa1d Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev am: 46bcf5ae17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14948330

Change-Id: Ibea486f6596099fe558b226e421e15b34e197ec5
2021-06-14 17:14:05 +00:00
TreeHugger Robot
46bcf5ae17 Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev 2021-06-14 17:01:00 +00:00