Commit Graph

81697 Commits

Author SHA1 Message Date
ykhung
48dce3c0b7 Remove options menu from BatteryUsage to align material next
Bug: 180607918
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I846668283d8c210f3b30fcf8c0ba5949588310d3
2021-04-07 16:03:34 +00:00
YUKAI HUNG
a13c0160e9 Merge "Remove the current battery usage chart and replace it with new one" into sc-dev am: babe3b0e73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111128

Change-Id: Ia1c23e7f70d463a575b0efbcb5cf654e0b0c4927
2021-04-07 15:30:59 +00:00
YUKAI HUNG
babe3b0e73 Merge "Remove the current battery usage chart and replace it with new one" into sc-dev 2021-04-07 14:57:47 +00:00
Arc Wang
2fde8d8c2a Use ConstraintLayut to improve UI of storage items
- To prevent title overlaps summary.
- Align text base line of title & summary.
- Remove deprecated attribute - fadingEdge.

Bug: 184710253
Test: manual visual
Change-Id: I2a21ec31b059b89450ce40daee9ed28064ee8666
2021-04-07 21:31:47 +08:00
TreeHugger Robot
518e1235a4 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: Ib44ed2fe517966034cc9f064eeff8eb85d3c56f7
2021-04-07 12:44:08 +00:00
TreeHugger Robot
5ca377b85f 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: I0bb4f31cdaa2bfe83925742637fddb9827f8b2f9
2021-04-07 12:44:03 +00:00
tim peng
dd1f254c07 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: Ibe2ca67f4f96b5c111a8cb81d1f90a65be379c5a
2021-04-07 12:43:31 +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
Arc Wang
741c1e4298 Pop up soft keyboard when rename dialog shows
Request focus for the EditText.

Bug: 184710864
Test: manual
      At Storage Settings, select USB drive -> option menu
      -> Rename. Observe if soft keyboard pops up.
Change-Id: Ia73829ee505c94a255306bd817d01b6bc1b80e26
2021-04-07 20:34:12 +08: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
9640ef1c7f [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: Icf9680ae948b86452df4d313fd4c17acc8847917
2021-04-07 12:23:41 +00:00
Wesley.CW Wang
7f372c74ef Update StringUtil#formatElapsedTime method (2/3) am: 50f314e45d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14063748

Change-Id: Idb5dad8aa7105650d6a6cc7155d8e2786b0bc4d5
2021-04-07 12:22:33 +00:00
Arc Wang
24fe5922de Sets Storage Settings progress bar unselectable
Since it does nothing if users click it.

Bug: 184712147
Test: manual
Change-Id: I7d243ad465a5fa3f23297ac80c82bef4d078e34a
2021-04-07 20:13:36 +08: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
ykhung
1599313caf Remove the current battery usage chart and replace it with new one
Bug: 183921876
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I06f0eb5c09d07a9db0d1a93cda751e8fad672c79
2021-04-07 11:52:16 +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
3fc4a00faa 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: If7aaa999c20776b38dbae10087b48a3e399e561a
2021-04-07 09:50:58 +00:00
TreeHugger Robot
dbe3028f97 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: Icc97f097c2b71ca92b21be940fb0868651d527f1
2021-04-07 09:50:39 +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
Jeremy Goldman
d62b2c23cf Update string associated with Connected, Always On or Insecure VPNs
Previously these strings were separated with a comma, but the new design
is to separate them with a "/" and to not include always-on information
if the vpn is also insecure.

Comment thread on the strings doc: https://docs.google.com/document/d/1hjaYuGmvNzCKPOrmjixpmLLXBV8cbxgrZ3eN4KvC4E8/edit?resourcekey=0-zo7B2GVc9luQTut0o8THNA&hl=zh-TW&forcehl=1&disco=AAAAIF3eiQY
screenshot: https://screenshot.googleplex.com/BmBroUZtmUPJz9s
Test: atest -c SettingsUnitTests
Bug: 176821216

Change-Id: Ib9c273de61c9722b0beb6fba127e7481e6c64705
2021-04-07 17:04:13 +08:00
Sunny Shao
fe885c96c1 Use "Passwords & accounts" instead of "Passwords and accounts"
Bug: 184713810
Test: manual test
Change-Id: I48a7ae4f89b2a1df76254978173949ba463ed4a7
2021-04-07 16:58:17 +08:00
Ryan Lin
4ad147b31e 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: I8a9d6415dffb557f8603bc7e4fcd57132fff7643
2021-04-07 08:33:24 +00:00
ykhung
a4c8c4440e 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: Ib025b2d4ab25a3ea743f4e1934aaf771d4ef0533
2021-04-07 08:32:28 +00:00
Jeremy Goldman
a51780f35d Subscription name has whitespace trimmed to determine uniqueness
For example, if a subscription has the name "subsc" and another has
"subsc    " the extra unique information will be added to the
subscriptions.

Test: atest -c SubscriptionUtilTest
Bug: 183664625
Change-Id: Ia137169f6cdd9804ab04126e5045c9fb61556d54
2021-04-07 16:26:52 +08: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
cb25cd4df1 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: Ie90c1fb2ac5da9346a9027b039a2ba0ce10ed4e9
2021-04-07 02:42:27 +00:00
Arc Wang
636e70fbf2 Hide non-system overlay window on ActivityPicker
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I43bb0f47a96719c61c5beb4ddf486b14cbdd6ee8
Merged-In: I6e2845cc19dc012cba2933318a067bbb8db90a23
2021-04-07 10:06:45 +08: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
Abel Tesfaye
b7a66b3068 Add warning message when camera privacy lock is enabled for
smart auto rotate settings fragment

Test: locally with flame, make RunSettingsRoboTests -j$(nproc)
ROBOTEST_FILTER=SmartAutoRotateCameraStateControllerTest,SmartAutoRotateControllerTest

Bug: 177462182
Change-Id: If443bd2456f3fbe76876777be912b204a50f4088
2021-04-06 19:49:04 +00: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
3bf131201e [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: I47953b9bfea74f6f66589cc5099f5fc663cf3e3c
2021-04-06 18:18:25 +00:00
TreeHugger Robot
3aa5c0ef32 [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: I6a4144e0f0c61256252dbc7273fb11755ee07e2b
2021-04-06 18:18:08 +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
50ea1ac06d 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: Ibaeeef7a9f0240997d9a5f0533623e67cecd6fb7
2021-04-06 17:12:44 +00:00
Sally Yuen
00c6344d72 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: I8930b5cabaa6f38b83ac376ac47e0d259b258aa4
2021-04-06 17:11:23 +00:00
TreeHugger Robot
9789cfb7b4 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: I7e66da2ec0e8abeab515e4323a5e5456d61cdf4a
2021-04-06 16:49:26 +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
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