Commit Graph

36397 Commits

Author SHA1 Message Date
Wesley Wang
ff847ec1c3 Merge "Update battery states text to support battery feature(1/2)" into sc-dev am: 1e3a18a355
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111141

Change-Id: I3d57d2ce88ae0c64955a091920863236979c706c
2021-04-08 11:17:13 +00:00
Wesley Wang
1e3a18a355 Merge "Update battery states text to support battery feature(1/2)" into sc-dev 2021-04-08 11:15:05 +00:00
TreeHugger Robot
33ce9d8604 Merge "Add icon to "Open [safety app] button" into sc-dev am: 9bf1412af7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108402

Change-Id: I4256aa5f2c1cb8b00f115e01340edf006b03fa9f
2021-04-08 09:21:41 +00:00
Jeremy Goldman
eddd6625fb Merge "Update string associated with Connected, Always On or Insecure VPNs" into sc-dev am: ea42dd3c49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111133

Change-Id: I5ec16447d130bdd7a5d19db6152831b7b36f1834
2021-04-08 09:21:28 +00:00
TreeHugger Robot
9bf1412af7 Merge "Add icon to "Open [safety app] button" into sc-dev 2021-04-08 08:53:45 +00:00
Jeremy Goldman
ea42dd3c49 Merge "Update string associated with Connected, Always On or Insecure VPNs" into sc-dev 2021-04-08 08:50:53 +00:00
Wesley.CW Wang
6148438546 Update battery states text am: 11d74e7231
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14098542

Change-Id: I74a61775c7e6e364d294922fed90e3a45e20d0d9
2021-04-08 08:01:02 +00:00
Wesley.CW Wang
d324393fac Update battery states text to support battery feature(1/2)
- Update progress bar bottom text when receiving battery feature callback

Bug: 183689347
Bug: 177407113
Test: make SettingsRoboTests
Change-Id: Ic8b24cbb149f7e470d28327a9a1dd84bbd5673f7
2021-04-08 06:39:22 +00:00
Wesley.CW Wang
11d74e7231 Update battery states text
- Update progress bar bottom text when battery states changed(charging,
 discharging, power saver and low battery)

Bug: 183689347
Bug: 177407113
Test: make SettingsRoboTests
Change-Id: I0397eb1dea7fcb14357750f84d1d5b1a7dc7d19a
2021-04-08 05:10:34 +00:00
Arc Wang
f1dbe7a242 Merge "Pop up soft keyboard when rename dialog shows" into sc-dev am: 1f7c6f03b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111143

Change-Id: I56bd581e207a610362c629ddb02c7b066731da92
2021-04-08 02:39:18 +00:00
Arc Wang
1f7c6f03b9 Merge "Pop up soft keyboard when rename dialog shows" into sc-dev 2021-04-08 02:09:08 +00:00
Jeremy Goldman
df35cfe54d Merge "Subscription name has whitespace trimmed to determine uniqueness" into sc-dev am: b71cb56c05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111129

Change-Id: I89f611f2da0c633b61e0321ce34445f6c933443a
2021-04-08 01:56:07 +00:00
Jeremy Goldman
b71cb56c05 Merge "Subscription name has whitespace trimmed to determine uniqueness" into sc-dev 2021-04-08 01:16:14 +00:00
Fan Zhang
eee07aacb9 Add icon to "Open [safety app] button
https://screenshot.googleplex.com/AjFhMECtQ4E9QAa.png

Bug: 184261824
Test: manual
Change-Id: I2b9b74077aec29dee3a34105584c5364fa663a84
2021-04-07 20:29:23 +00:00
TreeHugger Robot
ffca3330d5 Merge "Mark non actionable preferences as non-selectable" into sc-dev am: ec7c17c3cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14114141

Change-Id: I3f06b714d95a6a68ef6e34d9458a93e0df069360
2021-04-07 20:08:59 +00:00
Almaz Mingaleev
abb4a1c9d9 Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils." am: e3d4e39144 am: 90d5572fa5 am: f3a44236e3 am: 18c9ff9bd2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1658001

Change-Id: I398cff2fe75d33c8699b84817b2999c7d6c6b18b
2021-04-07 20:08:27 +00:00
TreeHugger Robot
ec7c17c3cd Merge "Mark non actionable preferences as non-selectable" into sc-dev 2021-04-07 19:55:34 +00:00
Almaz Mingaleev
18c9ff9bd2 Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils." am: e3d4e39144 am: 90d5572fa5 am: f3a44236e3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1658001

Change-Id: I3f3ce9f7dc0528e492473dcf1f8344f0518119e1
2021-04-07 19:28:22 +00:00
Bonian Chen
625a8d53e1 Merge "[Settings] More log to help analysis" into sc-dev am: 44a45f0c49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103370

Change-Id: I18a8db8adbd5d8618fd79178509a57b0670481f8
2021-04-07 19:06:56 +00:00
YUKAI HUNG
e005379e2c Merge "Remove options menu from BatteryUsage to align material next" into sc-dev am: 8477cf1892
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14112967

Change-Id: I9f957ce3c0e957b8c3ff9a53024910266f25ae62
2021-04-07 19:06:19 +00:00
Abel Tesfaye
14c5ba8648 Merge "Add warning message when camera privacy lock is enabled for smart auto rotate settings fragment" into sc-dev am: 28ad67dac2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13857227

Change-Id: I077e308dd13308a6767c8b16e9b22a0e0906ebfd
2021-04-07 19:03:58 +00:00
Almaz Mingaleev
f3a44236e3 Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils." am: e3d4e39144 am: 90d5572fa5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1658001

Change-Id: I75ef99ef2f008e98c12642c442e94f7daf860f69
2021-04-07 19:03:43 +00:00
Julia Reynolds
14cdcfdee9 Mark non actionable preferences as non-selectable
Test: navigate the conversations page with switch access enabled
Fixes: 178765656
Change-Id: If5d5dd301e2d95b4aa7512f58a6e1adf01f3dbf0
2021-04-07 14:35:39 -04:00
Bonian Chen
44a45f0c49 Merge "[Settings] More log to help analysis" into sc-dev 2021-04-07 18:11:32 +00:00
YUKAI HUNG
8477cf1892 Merge "Remove options menu from BatteryUsage to align material next" into sc-dev 2021-04-07 17:17:04 +00:00
Abel Tesfaye
28ad67dac2 Merge "Add warning message when camera privacy lock is enabled for smart auto rotate settings fragment" into sc-dev 2021-04-07 17:13:44 +00:00
Bonian Chen
998554d68f [Settings] More log to help analysis
Add log for supporting issue analysis.

Bug: 184602966
Test: local
Change-Id: I739ac827e0da1caca045e88599fafb293e25b65c
2021-04-07 16:12:38 +00:00
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
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
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
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
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
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
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
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
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
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
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