Commit Graph

37011 Commits

Author SHA1 Message Date
Wesley.CW Wang
8d5010f6ec Update battery usage summary
- Set up different summary for AOSP

Bug: 185855825
Bug: 187667156
Test: make SettingsRoboTests
Change-Id: I94dccfc325ecfcff8013fe4d3b5b65c427dcae5c
2021-05-10 13:03:12 +00:00
Tom Hsu
fa024d6fc8 Merge "Show W+ when connected to Carrier Wi-Fi Network" into sc-dev 2021-05-10 08:35:36 +00:00
tom hsu
2519077d97 Show W+ when connected to Carrier Wi-Fi Network
Internet picker
  - https://screenshot.googleplex.com/7k4ojF65a8Bis5R
 Internet panel
  - https://hsv.googleplex.com/6749112168873984
Bug: 185431894
Test: atest passed

Change-Id: Ic79686b47f033870ad8e7741f9baf3230dde7b7c
2021-05-10 14:08:05 +08:00
TreeHugger Robot
57d8d38a3c Merge "Merge existing bundle with ActivityOptions" into sc-dev 2021-05-10 06:05:37 +00:00
Weng Su
72c3debb0b Merge "[Provider Model] Add progress bar to internet panel" into sc-dev 2021-05-10 05:28:15 +00:00
Weng Su
c407a2d9f8 [Provider Model] Add progress bar to internet panel
- Show progress bar when Wi-Fi scanning

- Show "Searching for networks..." sub-title when Wi-Fi scanning

- Remove "Wi-Fi" from searching networks string

Bug: 178774497
Test: manual test
atest -c InternetConnectivityPanelTest
make RunSettingsRoboTests ROBOTEST_FILTER=PanelFragmentTest

Change-Id: Ic05b939bef3b106845fe90db41eb09f0e15756f4
2021-05-10 05:27:59 +00:00
YUKAI HUNG
48535ffd29 Merge "Support old pixel devices to adopt non-clickable chart design" into sc-dev 2021-05-10 03:44:31 +00:00
TreeHugger Robot
257b3ec584 Merge "Commit changes only when activity is closed" into sc-dev 2021-05-10 02:49:31 +00:00
ykhung
28896636b0 Support old pixel devices to adopt non-clickable chart design
For clickable devices:
https://screenshot.googleplex.com/ktBfjhhHQVYfTmF
https://screenshot.googleplex.com/BYutnpu9Dys2sa6
For non-clickable devices:
https://screenshot.googleplex.com/64NaKhRDrhfBqBQ

Bug: 185308803
Test: make SettingsRoboTests
Change-Id: I5bc0bb31946ccb20007ea31d90c05673a200e072
2021-05-09 16:30:11 +00:00
ykhung
d8d5335096 Build a bridge to control whether the graph is clickable or not
Create a bridge to read phenotype flag from GoogleSettings to control
whether each time slot in the graph is clickable or not.

Bug: 185308803
Test: make SettingsRoboTests
Change-Id: If8b58dcaa50ad5fb6b447ca5b7146639ee31a9df
2021-05-09 04:46:41 +00:00
ykhung
5b27fd923a Fix UI flashes issue when entering to the app in the cold start
1. fix the chart % info will flash issue by deferring the showing time
until the chart content is ready to show (set default as invisible)
2. fix the category title will flash issue by set the default value as
empty to avoid refresh the title twice in the start time

Bug: 177406865
Test: make SettingsRoboTests
Change-Id: If8f247cf5b01c529bc5e4d18fcf409ba296cc2f4
2021-05-09 01:56:09 +00:00
Yu-Han Yang
f730edaaac Merge "Revert "Remove dynamic location settings footer"" into sc-dev 2021-05-08 15:58:10 +00:00
Curtis Belmonte
5ece4babd3 Merge "Revert "Turn on the transition flag"" into sc-dev 2021-05-08 07:38:45 +00:00
Xin Li
bb6f5b264f DO NOT MERGE - Merge RQ2A.210505.003.
Bug: 187544653
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Change-Id: I9a8ebe5b65b682015225c8c1ba9de1984bac7a8d
2021-05-07 23:32:36 -07:00
TreeHugger Robot
67fd37c837 Merge "Controls/Wallet privacy settings" into sc-dev 2021-05-08 02:46:54 +00:00
Curtis Belmonte
1e1b259445 Revert "Turn on the transition flag"
This reverts commit 1be773da62.

Reason for revert: b/187517936

Fixes: 187517936
Change-Id: I57d0a7a16bdb76e105b0febd43bdf81521e69e3a
2021-05-07 22:43:05 +00:00
TreeHugger Robot
0842cc9adc Merge "Prevent multi-sensor enrollment from doing nothing." into sc-dev 2021-05-07 20:25:35 +00:00
Julia Reynolds
540ad99d88 Fix work profile setting appearing too often
That is, when the user didn't have work profile

Test: robotests, manual
Fixes: 187520760
Change-Id: I9394359a6bc278d58ef13b30f8ce99cbaa595c25
2021-05-07 15:02:54 -04:00
Matt Pietal
a13e30c11a Controls/Wallet privacy settings
Addressing feedback from ag/14353975

Fixes: 185597511
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I4de5b7f94d4be44820b1fa463d97f4f098f64bff
2021-05-07 14:54:54 -04:00
Julia Reynolds
2fe3273f3a Handle NLS metadata when provided as strings
Test: atest
Bug: 181175697
Change-Id: I40d935ffb7c1fb9f978160d28297da84412501fb
2021-05-07 18:37:10 +00:00
ykhung
bf5dd80d4f Fix corner case IndexOutOfBound exception for null content
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: Icf35b4084bcea62c2879a100d1b35b5448d8276d
2021-05-08 01:15:21 +08:00
Alex Stetson
413893244d Merge "Use shared model for non-system overlay toggle" into sc-dev 2021-05-07 14:08:52 +00:00
TreeHugger Robot
180051cf05 Merge "Refine the interpolation rule and clip the usage time data" into sc-dev 2021-05-07 09:35:35 +00:00
TreeHugger Robot
ac1b7661ad Merge "Turn on the transition flag" into sc-dev 2021-05-07 09:01:00 +00:00
Yanting Yang
c37abc9edb Merge "Add summary back to the homepage" into sc-dev 2021-05-07 09:00:32 +00:00
ykhung
4280a7f897 Refine the interpolation rule and clip the usage time data
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I6c115beed34abd393e5c615cc59d3c4c323dfa0b
2021-05-07 16:36:56 +08:00
Yi-Ling Chuang
1be773da62 Turn on the transition flag
Test: robotests
Bug: 186701900
Change-Id: I09c821e17fca88ee532f6535031a52c4c832a1e8
2021-05-07 13:21:42 +08:00
TreeHugger Robot
db624992ed Merge "Wallet/controls - Migrate existing settings" into sc-dev 2021-05-07 05:05:34 +00:00
Joe Bolinger
955c8349ed Prevent multi-sensor enrollment from doing nothing.
Fix: 186499864
Test: manual (setup with managed account)
Change-Id: If2b2623b2e348ef9d335c81189dbe23e4fe5f003
2021-05-06 21:41:43 -07:00
Suprabh Shukla
ce53343669 Commit changes only when activity is closed
The consequences of revoking the permission are irreversible so delay
committing until the user navigates out of the activity.

Test: Manual

Bug: 186280600
Change-Id: Ib53496fd4e39fe15dca4aadc5bcc773d5433131c
2021-05-06 21:39:09 -07:00
Treehugger Robot
e24cba9b59 Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c am: 026ecdd388
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923

Change-Id: If7854bb03db1b001bb6dfd35f28f074a66b77abe
2021-05-07 03:39:34 +00:00
Yi-Ling Chuang
377410de6d Merge existing bundle with ActivityOptions
Use Bundle.putAll() to take both the bundle passed in to the
startActivity(Intent, Bundle) and also the new created ActivityOptions
bundle, so no extra info will be lost.

Test: rebuild and add log to make sure all bundle info are kept
Bug: 187471344
Change-Id: I69c2978488f51f1c8ee705dc1bcd1bf17928fe33
2021-05-07 11:30:21 +08:00
Treehugger Robot
026ecdd388 Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923

Change-Id: I8aa67688d4c88a64c549e1094f3311ec4a4b2499
2021-05-07 03:11:46 +00:00
TreeHugger Robot
b1b7029fa6 Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev 2021-05-07 02:58:16 +00:00
TreeHugger Robot
b7ffc45052 Merge "Adopt new battery history map with interpolation method" into sc-dev 2021-05-07 02:09:43 +00:00
TreeHugger Robot
b3b59d6edd Merge "Refactor ChooseLockGenericController" into sc-dev 2021-05-06 23:59:17 +00:00
Treehugger Robot
9119105da9 Merge "Move myself to the emeritus section" 2021-05-06 22:24:55 +00:00
Rubin Xu
8e4acdbf51 Refactor ChooseLockGenericController
* Move all logics around aggregating password policies
  to the controller
* Replace HIDE_DISABLED_PREFS and MINIMUM_QUALITY_KEY
  with HIDE_INSECURE_OPTIONS as all call sites are just
  using them to hide insecure screenlock options.
* Remove password policy aggregation logic from
  ChooseLockPassword and make it use policies passed in.
* Remove padlock from disabled screen lock options,
  per UX mock.
* Increase char limit for some strings

Bug: 177638284
Bug: 177641868
Bug: 182561862
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Test: 1. set profile password quality/complexity and enroll device lock
      2. set profile password quality/complexity and enroll work challenge
      3. set parent password quality/complexity and enroll device lock
      4. set parent password quality/complexity and enroll work challenge
      5. set profile and parent password complexity, then enroll work challenge
      6. set profile and parent password complexity, then unify work challenge
      7. Enroll device lock during SUW
Change-Id: Iba1d37e6f33eba7b7e8e1f805f8e37aaec108404
2021-05-06 23:09:27 +01:00
Yu-Han Yang
bac25a750c Revert "Remove dynamic location settings footer"
Revert submission 13809184-location_footer

Reason for revert: b/187211885

Reverted Changes:
Iaf14044e0:Remove dynamic location settings footer
Ifa6468b11:Remove dynamic location settings footer
If3ab49241:Remove dynamic location settings footer

Bug: 187211885
Test: on device

Change-Id: If9fdefee60d191607ed777ce0046e4cf6d0e4018
2021-05-06 11:38:10 -07:00
ykhung
f76ba1189a Adopt new battery history map with interpolation method
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I5c45a443d0a72df352d4bb707412328ad009f6d4
2021-05-07 00:25:33 +08:00
Alex Stetson
aff80d1e14 Use shared model for non-system overlay toggle
Allows settings applications on other platforms to re-use values by
migrating to Settings.secure and moving HideNonSystemOverlayMixin to
SettingsLib.

Bug: 184967544
Test: atest SettingsUnitTests
Change-Id: If9aaeca29ebb8b481d75622934503e368d7435d3
2021-05-06 08:28:19 -07:00
Eran Messeri
6f3630c393 Move myself to the emeritus section
As I no longer expect to be working on security-related settings, move
myself to the emeritus section.

Bug: 187395769
Test: N/A
Change-Id: Ic91dd36f6de39ef79f1ced90083e1c5c7836c651
2021-05-06 15:16:40 +01:00
Matt Pietal
8850c3c677 Wallet/controls - Migrate existing settings
Step 2 of 2. Move wallet settings from System -> Gestures -> Power
Menu to Display -> Lockscreen. Split the existing sensitivity setting
into two separate toggles to give users better control of their
privacy settings.

Bug: 185597511
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display

Change-Id: Ifc390945a45258bbcc3c0a6ac67a0c4a3f7a9e91
2021-05-06 08:35:13 -04:00
TreeHugger Robot
bbb6562684 Merge "Fix inconsist color filling on collapsing toolbar" into sc-dev 2021-05-06 11:04:31 +00:00
Menghan Li
fa0ef8f2d9 Merge "Fix Sound Amplifier does not have 'Open XXX' button" into sc-dev 2021-05-06 10:48:19 +00:00
Mill Chen
872db9c41a Add require scrolling button for FingerprintEnrolling intro
The consent in the fingerprint introduction has been updated. Users are
required to read through the content. Adding a scrolling button is to
prevent directly going to next page from this page. It also makes sure
the content has to be scrolled down to the bottom of page.

Fix: 184591438
Test: visual verified
1) Prepare a device with fingerprint sensor
2) Settings > Security > Fingerprint unlock
3) Entering the enrollment flow and see if the introduction has a button
named "More" on the right-bottom side.

Change-Id: I1916293807ca9fb04f5d576cf4f6aaccbbe1ff00
2021-05-06 17:29:38 +08:00
menghanli
924506e131 Fix Sound Amplifier does not have 'Open XXX' button
SettingsMainSwitchPreference does not allow hide switch bar. For support
this launch preference, we hide the SettingsMainSwitchPreference and add
new preference into the list.

Bug: 184711985
Test: Manual testing
Change-Id: I293800e83aafb387e0bb0a4988af774b56f508e6
2021-05-06 17:01:39 +08:00
TreeHugger Robot
e6b78a5ada Merge "Fix the section below "Pair new device" moves up a few pixels" into sc-dev 2021-05-06 07:58:25 +00:00
Les Lee
eb9ec7f664 Merge "wifi: Use new API for wifi data usage function" am: 7469890c87 am: f38761e027
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1628759

Change-Id: I40404277f44a14d60654911e168a482794355971
2021-05-06 07:30:41 +00:00
Yi Jiang
d0af03e11c Merge "Fixes NPE in Screen attention setting" into sc-dev 2021-05-06 06:55:33 +00:00