Commit Graph

118522 Commits

Author SHA1 Message Date
Wesley Wang
cf5ef77340 Merge "Refactor battery saver schedule method" 2022-12-23 06:16:17 +00:00
Zoey Chen
88972a7fa5 [Settings] get wrong toggle when handle the WFC changed am: aee115ee3b am: d6bf9262b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20806352

Change-Id: If4ff3e6d5e7ef2b0a1f70a6aacb08a37433357fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-23 06:09:45 +00:00
Zoey Chen
d6bf9262b5 [Settings] get wrong toggle when handle the WFC changed am: aee115ee3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20806352

Change-Id: Icf924f45689bfa0906661be1bfee032520cafab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-23 05:11:39 +00:00
XingHai Lu
7f919a3c1b Merge "Cleanup some plurals in Settings Change <one> to <1> in string res file, and update related java files. Test: Update, existing test still pass. bug: 199230342" 2022-12-23 02:34:31 +00:00
Bonian Chen
5e9e92b10a Merge "[Settings] Extend the capacity of title text" 2022-12-22 16:04:22 +00:00
Vaibhav Devmurari
327260b3c2 Merge "Change keyboard layout parameters to include Layout type." 2022-12-22 15:58:11 +00:00
Chaohui Wang
366649ed1c Merge "Set setModeByUid to align with current behavior" 2022-12-22 14:14:17 +00:00
Bonian Chen
07ea595cc9 [Settings] Extend the capacity of title text
Requested by localization team.

Bug: 259611847
Test: local

Change-Id: I4f9067de6de29dd029e7321bf4a5cb107d10eb78
2022-12-22 13:38:23 +00:00
Wesley Wang
934700b559 Refactor battery saver schedule method
- Move schedule method and definition into BatterySaverUtils and reuse
   them from utils

Bug: 260302999
Test: make SettingsRoboTests
Change-Id: I402c57629d1a6f3317f0a7c14529508ce81f999c
2022-12-22 11:45:09 +00:00
Zoey Chen
aee115ee3b [Settings] get wrong toggle when handle the WFC changed
WFC toggle's state(EXTRA_TOGGLE_STATE) is set to the newValue after each notifyChange.
However, WFC slice gets the same newValue from EXTRA_TOGGLE_STATE when users change the toggle state
before the EXTRA_TOGGLE_STATE is updated.

Need to get the "correct" new value to set the WFC

Follow the original logic(ag/3820815), 1. don't turn on WFC and only can turn off WFC  if activationApp is not null. 2. turn on/off if  no activationApp.

Bug: 261922170
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSliceHelperTest
Change-Id: I823f00029c24f1901f40757ba13e7c0f90d6c0bc
2022-12-22 11:13:54 +00:00
Bonian Chen
d308b891fa Merge "[Settings] Present EID in About phone page" 2022-12-22 11:04:31 +00:00
xinghailu
897fd74731 Cleanup some plurals in Settings
Change <one> to <1> in string res file, and update related java files.
Test: Update, existing test still pass.
bug: 199230342

Change-Id: Idd0ba3c6adc060da21574d98f8ed765fae00cef8
2022-12-22 16:05:13 +08:00
Daniel Huang
b603ff7b19 Merge "Implement modifier keys settings UI." 2022-12-22 05:50:40 +00:00
PETER LIANG
6f1639c935 Merge "Fix when adjusting the display size, the font size flashes." 2022-12-22 05:11:11 +00:00
Sandeep Jawalkar
0a1d5710f0 Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" am: 749c2dddbc am: aa0205daf9 am: 3279e1a211
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361542

Change-Id: I2b3d05a4332f98892154ae7f6d6d1fd59737a4c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 05:02:38 +00:00
Sandeep Jawalkar
3279e1a211 Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" am: 749c2dddbc am: aa0205daf9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361542

Change-Id: I663ea43a6e1e06b456a5a024bc7773e10cd03a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 04:26:13 +00:00
Sandeep Jawalkar
aa0205daf9 Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" am: 749c2dddbc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361542

Change-Id: I8fc86403f5dc64beec53d6c93d09f8c0dd3a2f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 03:52:50 +00:00
Sandeep Jawalkar
749c2dddbc Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" 2022-12-22 03:15:34 +00:00
Bonian Chen
dda58d5255 [Settings] Present EID in About phone page
Present EID within about phone page.

Bug: 260540995
Test: local

Change-Id: If5f512c1da6b4b3b1adc1d13dbe11226b7ecad41
2022-12-21 17:39:28 +00:00
TreeHugger Robot
cf9fd9941d Merge changes from topic "credManSettings"
* changes:
  Calling isServiceEnabled with the context in credential manager settings
  Revert "Revert "Add Credential Manager settings""
2022-12-21 17:32:05 +00:00
Tetiana Meronyk
e257606508 Merge "Add UI for multiple admins on Headless" 2022-12-21 17:00:48 +00:00
David Gutierrez
3595b025bc Merge "Automatic timezone support on non-telephony devices" 2022-12-21 16:40:19 +00:00
David Gutierrez
9ebb2fce7a Automatic timezone support on non-telephony devices
Adding to the Settings UI in order to simplify timezone on non-telephony devices.

Test: on-device testing, additional unit tests
Change-Id: I58ece9542a7b80823092bd082d4bd8c224b29634
Bug: 253015306
2022-12-21 16:39:32 +00:00
danielwbhuang
85e0deb14d Implement modifier keys settings UI.
Add four modifier keys and one reset button.

Bug: 244535460
Test: local test
Change-Id: I45822b0d8391022c17439dc25ab86fe022e9f43f
2022-12-21 22:45:06 +08:00
Peter Liang
494f76d115 Fix when adjusting the display size, the font size flashes.
Action:
By super to access the parent function to save the highlighted state of the preference.

Bug: 250800752
Test: manual test
Change-Id: Idca9a4f31910638c19f26ff01136530d17677055
2022-12-21 21:21:13 +08:00
sandeepjs
beab3c0d43 [Android U][eSIM] Modify esim and sim card strings as part of esim primary
As part of esim primary, esim and sim card related strings are changed for AndroidSettings project with reference from https://docs.google.com/spreadsheets/d/1RPVnNvmcjd-NSvPGg1jOi0mdC-sbCHvt9HVU4glV8fs/edit#gid=1716745126

Test: build
Bug: 257380320
Change-Id: If2183945054255d52e89a61a04db25edd725a73d
2022-12-21 12:01:01 +00:00
Vania Januar
b7855ee1b4 Merge "Stylus updater in ConnectedDevicesGroupController." 2022-12-21 11:38:53 +00:00
Tetiana Meronyk
e5acef9034 Add UI for multiple admins on Headless
In a series of CLs under topic add_ui_for_hsum_admins UI and functionality for allowing multiple admins on HSUM build is added. In User settings and User switcher when creating a new user there is a new dialog prompting to choose admin status of the user to be created. In User details view there is a toggle that is visible to admin users that allows to modify admin status of existing users. This toggle is only applicable to full users that are not supervised, guests or a main device user.

Bug: 252790451
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserDetailsSettingsTest"
Change-Id: I447dc168be30aa614aeb3f8b71ad14a7223fd7c1
2022-12-21 11:02:39 +00:00
Bonian Chen
ecbb3a2933 Merge "[Settings] Code Refactor for performance" 2022-12-21 09:43:12 +00:00
Vania Januar
dc2980d220 Stylus updater in ConnectedDevicesGroupController.
This updater is responsible for listening to USI stylus
battery usage, and bluetooth stylus connection, to determine
whether to show the USI stylus preference on the Connected devices
page.

Adds an entrypoint to the StylusUsiDetailsFragment that shows
details for USI styluses.

Bug: 250909304
Test: StylusDeviceUpdaterTest
Change-Id: I6ae6b6ef880b3b3cd7430d4d35d471b14283369f
2022-12-21 09:20:07 +00:00
Darrell Shi
ca155fefa7 Merge changes from topic "hub-mode-settings" into tm-qpr-dev am: e722587923 am: 2287f6e2e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20736115

Change-Id: Ibf2d91b9655ae968442033234384a340ed3a8f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-21 09:04:54 +00:00
Darrell Shi
77026a999c Change screensaver ctrlr to base pref ctrlr. am: 542644e83f am: 955a2f2ac3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20736682

Change-Id: I8e81f6d60d52ee6c78c0037bea9f736fb12a4c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-21 09:04:49 +00:00
Darrell Shi
2287f6e2e9 Merge changes from topic "hub-mode-settings" into tm-qpr-dev am: e722587923
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20736115

Change-Id: I17bc2f1b210dd0262299cfe10c6c12f2c94cca4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-21 08:23:55 +00:00
Darrell Shi
955a2f2ac3 Change screensaver ctrlr to base pref ctrlr. am: 542644e83f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20736682

Change-Id: Ic6f282087660ede4a0b1fd38378c0c5adc58bc3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-21 08:23:48 +00:00
Darrell Shi
e722587923 Merge changes from topic "hub-mode-settings" into tm-qpr-dev
* changes:
  Add top-level Communal settings.
  Change screensaver ctrlr to base pref ctrlr.
2022-12-21 08:03:49 +00:00
Reema Bajwa
dbd9904c0a Calling isServiceEnabled with the context in credential manager settings
Test: Built and deployed locally

Change-Id: I22d3fe863fa31c2601cedbde10907c79469a75f4
2022-12-21 07:01:59 +00:00
Chaohui Wang
35e0ff2fb7 Merge "Add AppNotificationPreference to App Info Settings" 2022-12-21 04:51:04 +00:00
Chaohui Wang
dcd965b816 Add AppNotificationPreference to App Info Settings
This is only for the App Info Settings page, which is planed to be
migrated to SPA in Android U.

Currently protected by flag settings_enable_spa, default false.

This will not impacted the AppNotificationSettings, which has no plan
to be migrated.

Bug: 236346018
Test: Unit test
Test: Manual with Settings App
Change-Id: I4ae669ce36eb6ab73f1adf99585f424e03bf90fb
2022-12-21 04:50:12 +00:00
George Chan
4f894679aa Merge "Added Background install control UI code." 2022-12-21 04:33:25 +00:00
Darrell Shi
65836b1e3d Add top-level Communal settings.
This change adds a new top-level setting, of which the availability is
controlled by a build time config value. It also registers the new
communal category so that prebuilt packages can inject preferences into
it.

Bug: 261641080
Test: verified on device that communal settings show up on top level
Test: atest ScreenSaverPreferenceControllerTest
Change-Id: Idf79ae5b89ecc3498373de56a677b4876fb121c3
2022-12-21 04:10:56 +00:00
Daniel Huang
e0fa3d3381 Merge "Implement trackpad settings UI" 2022-12-21 03:46:40 +00:00
Kuan Wang
2c7f06e9b3 Use taskRootPackageName instead of packageName to load uid when usage
resource is USAGE_SOURCE_TASK_ROOT_ACTIVITY and taskRootPackageName is
not empty.

This logic is consistent with digital wellbeing: assign the screen-on
time onto task root activity when usage resource is
USAGE_SOURCE_TASK_ROOT_ACTIVITY.

Bug: 260964679
Test: make RunSettingsRoboTests + manual
Change-Id: I4c7ed342d8c00951879f5826bf79575f330ce86e
2022-12-21 02:39:23 +00:00
Kuan Wang
a1a7cba6a6 Move the getBatteryLevelData function from DataProcessor to
DataProcessManager and start the async task in DataProcessManager when
there is no battery level data.

Test: make RunSettingsRoboTests + manually
Bug: 260964903
Change-Id: Ie36ab6d121a5596a3abc16e7f570dd0d9b32e11c
2022-12-21 02:39:11 +00:00
PETER LIANG
0b2a23dedc Merge "Fix the display/Font preview window appears blank while transitioning between sizes." 2022-12-21 02:33:32 +00:00
Bonian Chen
af8f04c3d1 [Settings] Code Refactor for performance
Reduce number of SubscriptionManager API queries.

Bug: 260540995
Test: local and auto
Change-Id: Ib05660d9ade7f352a7cc82d4065974aec396714a
2022-12-21 01:45:40 +00:00
Vaibhav Devmurari
aa3ec01f9f Change keyboard layout parameters to include Layout type.
Test: atest KeyboardLayoutPickerControllerTest
Bug: 259530132
Change-Id: I112d2c25ca5eeacee445e247bf40a57d358e7f42
2022-12-21 00:32:21 +00:00
George Chan
d18b422c51 Added Background install control UI code.
Change-Id: I1b629fdc04d1df1b08998c9aaae3df3446fab3fe
Bug: 238451991
Test: Manually with settings, atest
2022-12-20 22:38:01 +00:00
Anna Bauza
d0c68b3807 Merge "add settings log to remove and switch user" 2022-12-20 22:28:50 +00:00
Reema Bajwa
5ba7d67b42 Revert "Revert "Add Credential Manager settings""
This reverts commit 7a231eaba0.

Reason for revert: Adding in fix for issue that caused initial revert

Change-Id: I395c13fb46fc570a6b8a663d4b4e5537866325ce
2022-12-20 22:14:05 +00:00
Daniel Norman
b842f4c5fc Merge "Update OWNERS for A11y Settings to include myself & remove others." am: 5394ffdd9d am: 38b5b5d994 am: c01da5ab7e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362352

Change-Id: Ib738b22e84a79fa24e155e03ca4d5d2480936f05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 20:15:50 +00:00