Commit Graph

81141 Commits

Author SHA1 Message Date
TreeHugger Robot
c5991233b2 Merge "Fix ANR on ShorcutManager#getPinnedShortcuts" into sc-dev am: 82b44b24cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14100762

Change-Id: Ic84f3eb554122ddd6c615a025f4051a8b05c128b
2021-04-07 12:44:49 +00:00
TreeHugger Robot
9fca11053f Merge "Fix AddNetworkFragment bottom buttons position problem" into sc-dev am: 97e98f0e44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14110465

Change-Id: I6cc37ecd77778c2abc9e5148056fca42c444432d
2021-04-07 12:44:44 +00:00
tim peng
94b467bb83 Merge "BTHS will have no sound after disable HD audio" into sc-dev am: 49244d8075
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14065246

Change-Id: I6906e3507b89cb6f879fe2ada1361cd12186058f
2021-04-07 12:44:38 +00:00
TreeHugger Robot
82b44b24cf Merge "Fix ANR on ShorcutManager#getPinnedShortcuts" into sc-dev 2021-04-07 12:43:23 +00:00
TreeHugger Robot
97e98f0e44 Merge "Fix AddNetworkFragment bottom buttons position problem" into sc-dev 2021-04-07 12:38:14 +00:00
tim peng
49244d8075 Merge "BTHS will have no sound after disable HD audio" into sc-dev 2021-04-07 12:26:15 +00:00
Treehugger Robot
8c06cd318e [automerger skipped] Merge "Modify the value of intent-filter" am: 15ecc3610d am: e7ff215244 am: 53fa14267f -s ours am: 3b71dd2042 -s ours
am skip reason: skip tag Change-Id I40dfeec1c25cd549bbe5559e3c3ce21813fbf922 with SHA-1 aaf21230a1 is already in history

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

Change-Id: I40c21835b51b7f4c1c7a943a670a499181b7b981
2021-04-07 12:24:23 +00:00
Wesley.CW Wang
610c1a32f0 Update StringUtil#formatElapsedTime method (2/3) am: 50f314e45d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14063748

Change-Id: Ibfbc4d0469ef1ed5f0b213d3c2b0d19d1697e70f
2021-04-07 12:22:48 +00:00
Treehugger Robot
3b71dd2042 [automerger skipped] Merge "Modify the value of intent-filter" am: 15ecc3610d am: e7ff215244 am: 53fa14267f -s ours
am skip reason: skip tag Change-Id I40dfeec1c25cd549bbe5559e3c3ce21813fbf922 with SHA-1 aaf21230a1 is already in history

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

Change-Id: Ic1f8a90abc0092cfd0c96e5863b48d50c9d4539f
2021-04-07 12:06:15 +00:00
Treehugger Robot
53fa14267f Merge "Modify the value of intent-filter" am: 15ecc3610d am: e7ff215244
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1579989

Change-Id: If539b29f4ebdcdac637fb8ff61e1752de5af5cd2
2021-04-07 11:25:59 +00:00
Treehugger Robot
e7ff215244 Merge "Modify the value of intent-filter" am: 15ecc3610d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1579989

Change-Id: Ic58bf302f23ae363d22a3ca7b636c9586dc04364
2021-04-07 10:42:47 +00:00
Wesley.CW Wang
50f314e45d Update StringUtil#formatElapsedTime method (2/3)
- Update the usage and the test case
 - Update discharging string to follow new string doc

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: I1e14e7da8cb02755d8cf6e12626a0d94fad87121
2021-04-07 10:19:10 +00:00
Treehugger Robot
15ecc3610d Merge "Modify the value of intent-filter" 2021-04-07 10:11:06 +00:00
TreeHugger Robot
135bca46ac Merge "Refine the summary of "Open by default" in "App info" page" into sc-dev am: acacad4cdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14100754

Change-Id: Iffbddf663d4acac38b3180061c0e34d812d69d26
2021-04-07 09:56:51 +00:00
TreeHugger Robot
ea58000b91 Merge "Maximize compatibility string update" into sc-dev am: 437e7e7a04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103365

Change-Id: Ib1ce50e8a05d02acaa2031ce6d5ca170bd8b27ca
2021-04-07 09:56:46 +00:00
TreeHugger Robot
acacad4cdf Merge "Refine the summary of "Open by default" in "App info" page" into sc-dev 2021-04-07 09:26:24 +00:00
TreeHugger Robot
437e7e7a04 Merge "Maximize compatibility string update" into sc-dev 2021-04-07 09:24:44 +00:00
Ryan Lin
0f4ee3464c Merge "Change illustrations of Magnification Settings" into sc-dev am: 7bb5b8f326
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14098543

Change-Id: I45a908855bf96ea4b0c88aa5ac99f464636ff679
2021-04-07 08:33:34 +00:00
ykhung
211d9ea824 Move the battery components from SettingsGoogle to Settings am: b350c66d97
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108646

Change-Id: Ibf061708de17eb959d265d9bfbf0822e87041135
2021-04-07 08:32:48 +00:00
Ryan Lin
7bb5b8f326 Merge "Change illustrations of Magnification Settings" into sc-dev 2021-04-07 08:19:32 +00:00
Arc Wang
cb8d0704dc Fix AddNetworkFragment bottom buttons position problem
AddNetworkFragment bottom buttons align parent bottom,
it has display problem because collapsing toolbar changes
its height and squeeze the bottom buttons out of the screen.

This change sets the bottom buttons align the bottom of
other content.

Bug: 179656154
Test: manual visual
Change-Id: I6f0062d10c603e40e3f8c2683d5610418df6522a
2021-04-07 06:44:23 +00:00
ykhung
b350c66d97 Move the battery components from SettingsGoogle to Settings
Bug: 183921876
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I47cbba1cbfd6cb17745e7aaaf56b22e3c9dcd30e
2021-04-07 12:09:54 +08:00
ykhung
852fe71e5a Add new battery usage design required string and dimesions am: 0a03f8e2d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103384

Change-Id: I413bc5810c9998283cffe7da72f33209f4ed440c
2021-04-07 02:43:37 +00:00
ykhung
0a03f8e2d2 Add new battery usage design required string and dimesions
Bug: 183921876
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I82fed0a38168aba47e8267ab4a5fa072d54dce67
2021-04-07 09:44:10 +08:00
Weng Su
4981dc6ea1 Maximize compatibility string update
- Single AP device:
  Title: Extend compatibility
  Summary: Helps other devices find this hotspot. Reduces hotspot connection speed.

- Dual AP device:
  Title: Extend compatibility
  Summary: Helps other devices find this hotspot. Increases battery usage.

- Screenshot:
  https://screenshot.googleplex.com/84sFvsDegjvJfWT

Bug: 184595717
Test: manual test
atest -c WifiTetherMaximizeCompatibilityPreferenceControllerTest

Change-Id: Idca20d4cf5b174110f800fbed91c404d13994b94
2021-04-07 02:27:00 +08:00
TreeHugger Robot
4e42bf589c [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d -s ours am: a5715ed5c9 -s ours am: 04c2f0b19a -s ours am: 47c4492d09 -s ours am: 8ad7f62a65 -s ours am: ec2f5b30a3 -s ours am: aef00cff46 -s ours am: 75020d834a -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d is already in history

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

Change-Id: I548fd0b13b7dddf8c825acfc069e1480dec7ded7
2021-04-06 18:18:26 +00:00
TreeHugger Robot
48d9ef090f [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d -s ours am: a5715ed5c9 -s ours am: 04c2f0b19a -s ours am: 47c4492d09 -s ours am: 8ad7f62a65 -s ours am: 4602a52b36 -s ours am: 39da8197d7 -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 855b1f428d is already in history

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

Change-Id: I6649eb58004a71256c0eeb8d1e04cd4d229d559d
2021-04-06 18:18:09 +00:00
TreeHugger Robot
75020d834a [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d -s ours am: a5715ed5c9 -s ours am: 04c2f0b19a -s ours am: 47c4492d09 -s ours am: 8ad7f62a65 -s ours am: ec2f5b30a3 -s ours am: aef00cff46 -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d is already in history

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

Change-Id: Ibbe4216c0cf3a95f5692ff847fc3c3497e8ca15a
2021-04-06 17:40:57 +00:00
TreeHugger Robot
39da8197d7 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d -s ours am: a5715ed5c9 -s ours am: 04c2f0b19a -s ours am: 47c4492d09 -s ours am: 8ad7f62a65 -s ours am: 4602a52b36 -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 855b1f428d is already in history

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

Change-Id: I631c47e8414f878ac0397ac8d45b8131c0bb606f
2021-04-06 17:40:06 +00:00
Arc Wang
29386314ed Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85 am: 89d14a36dc am: 30ab86df65 am: 767f72b09b am: fe3572be66 am: 2a20e51f91 am: e8e227c363
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366

Change-Id: I48c759827c3c79187d7e85670777a1e885882bff
2021-04-06 17:13:10 +00:00
Sally Yuen
439717eb3c Merge "Add search keywords for Reduce Bright Colors" into sc-dev am: ccda90bd83
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13700903

Change-Id: I8cdb13c4a4789895e5953bb3c0d9da30ebafd539
2021-04-06 17:10:56 +00:00
TreeHugger Robot
c4b2ad2099 Merge "Handle modern OPEN_BY_DEFAULT action" into sc-dev am: 24cad3e713
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14078596

Change-Id: I1979c56dbf79791f5d09966dc1054b17278b5e18
2021-04-06 16:50:38 +00:00
TreeHugger Robot
aef00cff46 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d -s ours am: a5715ed5c9 -s ours am: 04c2f0b19a -s ours am: 47c4492d09 -s ours am: 8ad7f62a65 -s ours am: ec2f5b30a3 -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 855b1f428d is already in history

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

Change-Id: I73f06fb323f6ddab7c9ca48de8b81bb632240446
2021-04-06 16:49:14 +00:00
Arc Wang
e8e227c363 Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85 am: 89d14a36dc am: 30ab86df65 am: 767f72b09b am: fe3572be66 am: 2a20e51f91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366

Change-Id: I415c89bf591503bc8b1dbff8e0f13da03db309fd
2021-04-06 16:33:08 +00:00
Sally Yuen
ccda90bd83 Merge "Add search keywords for Reduce Bright Colors" into sc-dev 2021-04-06 16:32:53 +00:00
TreeHugger Robot
24cad3e713 Merge "Handle modern OPEN_BY_DEFAULT action" into sc-dev 2021-04-06 16:32:07 +00:00
TreeHugger Robot
4602a52b36 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d -s ours am: a5715ed5c9 -s ours am: 04c2f0b19a -s ours am: 47c4492d09 -s ours am: 8ad7f62a65 -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 855b1f428d is already in history

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

Change-Id: I87e3d728a2c10c857062b706541a26c939b09902
2021-04-06 16:06:59 +00:00
Arc Wang
e45d9f9aca Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85 am: 89d14a36dc am: 30ab86df65 am: 767f72b09b am: bd35c42fd6 am: d10cc6c80d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366

Change-Id: I9cda92abb9537e37fc2c37f0ef957d05b1df8032
2021-04-06 16:02:38 +00:00
Rubin Xu
379d084015 Merge "Correctly save credential on config changes" into sc-dev am: 9527ee9aed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103545

Change-Id: Idd7937c5b9d7ce6243e8fc553d53b09623137c91
2021-04-06 16:02:26 +00:00
TreeHugger Robot
ec2f5b30a3 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d -s ours am: a5715ed5c9 -s ours am: 04c2f0b19a -s ours am: 47c4492d09 -s ours am: 8ad7f62a65 -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 855b1f428d is already in history

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

Change-Id: Ia5e57f1a3b06ef105cf209df0f70c05783e05471
2021-04-06 16:02:14 +00:00
Arc Wang
d10cc6c80d Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85 am: 89d14a36dc am: 30ab86df65 am: 767f72b09b am: bd35c42fd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366

Change-Id: I2ac3093f0d111e42e58e518ab3977920d6012a36
2021-04-06 15:47:25 +00:00
Arc Wang
2a20e51f91 Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85 am: 89d14a36dc am: 30ab86df65 am: 767f72b09b am: fe3572be66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366

Change-Id: Ib575416cf0f1de16cbac939d3e16ba08281a40d4
2021-04-06 15:42:49 +00:00
Rubin Xu
9527ee9aed Merge "Correctly save credential on config changes" into sc-dev 2021-04-06 15:22:13 +00:00
TreeHugger Robot
8ad7f62a65 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d -s ours am: a5715ed5c9 -s ours am: 04c2f0b19a -s ours am: 47c4492d09 -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 855b1f428d is already in history

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

Change-Id: Ic3d1e0553dee77abe9930df9f70423f41048af21
2021-04-06 15:20:44 +00:00
Arc Wang
bd35c42fd6 Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85 am: 89d14a36dc am: 30ab86df65 am: 767f72b09b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366

Change-Id: Ic69d0cc8020b52a65c9d60a03e98e6c8ad753e60
2021-04-06 15:06:21 +00:00
Arc Wang
fe3572be66 Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85 am: 89d14a36dc am: 30ab86df65 am: 767f72b09b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366

Change-Id: I9fe6a78f1970d85fd30ee3d69b465de523ffddbc
2021-04-06 15:01:42 +00:00
TreeHugger Robot
47c4492d09 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d -s ours am: a5715ed5c9 -s ours am: 04c2f0b19a -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 855b1f428d is already in history

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

Change-Id: I03ab6cfd3dcf31340f4beacc1782881db3fa7bde
2021-04-06 14:40:35 +00:00
Arc Wang
a68c163d04 Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44 am: e1660daab4 am: 83d11bebe2 am: eeb0bcc1b7 am: ab59455727 am: 2d20ab7ea7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815

Change-Id: Ia687e1cff833ab9ea15d2aa85abfdeff0691d6f2
2021-04-06 14:21:13 +00:00
Arc Wang
767f72b09b Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85 am: 89d14a36dc am: 30ab86df65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366

Change-Id: I5a1cc56ebca9f1f9dc289a4622b4db22a62a6f73
2021-04-06 14:19:47 +00:00
Arc Wang
2d20ab7ea7 Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44 am: e1660daab4 am: 83d11bebe2 am: eeb0bcc1b7 am: ab59455727
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815

Change-Id: I3c9fb98bb5e280597d912e58a03df2337794af82
2021-04-06 14:02:53 +00:00