PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,710 Commits 1 Branch 0 Tags
36395900da80fa78cdcfef905645c455057fd764
Commit Graph

81710 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
5770b4e928 Merge "Use a new string for category headers" into sc-dev 2021-04-21 16:10:22 +00:00
Julia Reynolds
e8a33e0c83 Notif history styling updates 
Test: manual
Fixes: 185625272
Change-Id: Ie9d62573b2c6480b84ab9172beccf519e7e880dc
 2021-04-21 10:55:51 -04:00
Julia Reynolds
60ded30669 Use a new string for category headers 
The existing string refers to singular objects, but we need
to refer to several

Test: manual
Fixes: 185325146
Change-Id: Ie22fa7a8c1857558baceb05d8ca80cfd6ff61ed4
 2021-04-21 14:48:31 +00:00
YUKAI HUNG
825cee7382 Merge "Add new expandable preference component" into sc-dev am: c6c3b383da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260595

Change-Id: I5f4708a6fb429264e308667fe894c0416208c67e
 2021-04-21 14:45:24 +00:00
YUKAI HUNG
c6c3b383da Merge "Add new expandable preference component" into sc-dev 2021-04-21 14:20:26 +00:00
Peter_Liang
d2658b57d8 Fix the entire text is aligned middle of the Vision setting screen. 
Root cause:
The preferenceStyle attribute was overridden in the PreferenceTheme.SetupWizard style.

Solution:
Remove the overriden preferenceStyle.

Bug: 183086481
Test: manual test
Change-Id: I60d127baef9274170a31eaf3cfbd210312334311
 2021-04-21 22:08:45 +08:00
TreeHugger Robot
e80dd29760 Merge "Notif history Long tap functions as short tap" into sc-dev am: e1b63f00a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14254102

Change-Id: I813039bccdc1663b21a125fd333ac5c792287a9d
 2021-04-21 13:33:38 +00:00
TreeHugger Robot
1170dc1800 Merge "Fix background inconsistency of the Settings page in SUW" into sc-dev am: 7f065adfcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14255423

Change-Id: Id669662a2c093a2497653397501c375eb972b57c
 2021-04-21 13:33:29 +00:00
TreeHugger Robot
e1b63f00a2 Merge "Notif history Long tap functions as short tap" into sc-dev 2021-04-21 13:10:25 +00:00
TreeHugger Robot
7f065adfcb Merge "Fix background inconsistency of the Settings page in SUW" into sc-dev 2021-04-21 13:06:45 +00:00
Wesley.CW Wang
2cc7431fa3 Update app usage page active time format 
- Make the text of active time support different states like foreground or background usage time less than one minutes

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I20be88e5b23a679c15f97bac4b9d400557685463
 2021-04-21 20:20:05 +08:00
ykhung
b8721cf980 Add new expandable preference component 
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Id2b2a1f4fa557467efcaa013aa9e978b2c66d974
 2021-04-21 11:58:45 +00:00
menghanli
54ded4cb5e [FAB] Improve the shortcut dialog ux after change accessibility button mode 
Problem: The "Customize accessibility button" link only exists when the user selects the FAB location, which may confuse and disorient the user
Solution: It is hard to back to floating menu mode if we turns to navigation bar from "Customize accessibility button" setting.  Added the link in the "navigation bar mode" can help on this problem.

Fix: 183342563
Test: manual test
Change-Id: Ife572b0962f3a57c34af56cd930a487c9d813c0c
 2021-04-21 19:39:13 +08:00
Matt Pietal
9cfa695a4a Merge "Remove "Device Controls" from Settings" into sc-dev am: ee2086872e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215389

Change-Id: Icf782b29fb0670c2b60123e90488d023f9a1abc4
 2021-04-21 11:38:42 +00:00
Matt Pietal
ee2086872e Merge "Remove "Device Controls" from Settings" into sc-dev 2021-04-21 11:31:33 +00:00
Alex Johnston
01e46e8b44 Merge "Fix maximum time to lock" into sc-dev am: 2f9b5b6ad7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14109359

Change-Id: Id0b4872853dab8dfb7dd029d69cc9b3370b68c99
 2021-04-21 09:17:49 +00:00
TreeHugger Robot
940ddee02a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b2185f5ede -s ours am: 58ff823e7e -s ours am: d070df12f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic39de791c5b4b59704ec4ace896f07f7a2aad82d
 2021-04-21 09:17:40 +00:00
Automerger Merge Worker
48767f99ca Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34ce6187c8 -s ours am: 95ffa79af1 -s ours" into sc-dev am: 1119508d1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iabf0469a2346e97d7147b161de3d2a7a70eafe9b
 2021-04-21 09:17:33 +00:00
TreeHugger Robot
7040d9186d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: bdd118dd32 -s ours am: 9817a5b35a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5604490dba9a9da70a670f811b978d35139f8f6
 2021-04-21 09:17:29 +00:00
Alex Johnston
2f9b5b6ad7 Merge "Fix maximum time to lock" into sc-dev 2021-04-21 09:17:28 +00:00
Bill Yi
1307c50527 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7be92bf6a -s ours am: 710845107d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia398de7b53fb64c7c52155db73bc2db706dd1531
 2021-04-21 09:17:22 +00:00
Arc Wang
3628eda23b Merge "Update progress bar UI" into sc-dev am: 3486b95fd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235149

Change-Id: I9ecbb575ea1b90515d6935c56d883ba8aac95691
 2021-04-21 09:17:16 +00:00
TreeHugger Robot
d070df12f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b2185f5ede -s ours am: 58ff823e7e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf607b2bda1edbdf68e1877abe71e89ecedb5372
 2021-04-21 09:06:18 +00:00
Automerger Merge Worker
1119508d1c Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34ce6187c8 -s ours am: 95ffa79af1 -s ours" into sc-dev 2021-04-21 09:06:17 +00:00
Bill Yi
23b6d6634f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34ce6187c8 -s ours am: 95ffa79af1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia67909919f88744680bc3263b1fba2667f060e5c
 2021-04-21 09:06:14 +00:00
TreeHugger Robot
9817a5b35a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: bdd118dd32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd71ee35579a8814b519b3c7ed989e558ad273e6
 2021-04-21 09:06:11 +00:00
Bill Yi
710845107d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7be92bf6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I32fdf960f120f52fdd2b712f5ad4ce9492cbba92
 2021-04-21 09:05:23 +00:00
Arc Wang
3486b95fd7 Merge "Update progress bar UI" into sc-dev 2021-04-21 09:01:35 +00:00
Alex Johnston
85881e16bc Merge "RequestManageCredentials dark theme" into sc-dev am: 4a4e2bae61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14011458

Change-Id: Id3d02bd645f6111e7cf75f7cfaf47a3e6b28684a
 2021-04-21 08:53:57 +00:00
Alex Johnston
4a4e2bae61 Merge "RequestManageCredentials dark theme" into sc-dev 2021-04-21 08:45:06 +00:00
TreeHugger Robot
2994c48135 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 73a806fa37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09e49acd89e10b6d56d4d20a7ed63f1d4bb59af4
 2021-04-21 08:41:09 +00:00
TreeHugger Robot
e93c8524ae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6d25cfcc3b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3dbd96a9a6f84fed5ea033197ce97fbd807274bf
 2021-04-21 08:40:21 +00:00
TreeHugger Robot
30096f6235 Merge "[Provider Model] Carrie Wi-Fi offload toggle request (panel)" into sc-dev am: b8f0a8e2dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14251407

Change-Id: I7f808313788d73852f3d7af81ee4c4357587fe4f
 2021-04-21 08:40:12 +00:00
TreeHugger Robot
f83576092c Merge "[Provider Model] Carrie Wi-Fi offload toggle request" into sc-dev am: d4a4fead67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14236566

Change-Id: Id0118f30be2fcae220369a15f31a76753727696d
 2021-04-21 08:40:01 +00:00
TreeHugger Robot
58ff823e7e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b2185f5ede -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I905f157e08ee5b07b2ea5a0851212faa53b4fb3a
 2021-04-21 08:39:24 +00:00
Bill Yi
95ffa79af1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34ce6187c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I218735c7a6468d882769285c4f4fa0e7ab1d563c
 2021-04-21 08:39:21 +00:00
TreeHugger Robot
bdd118dd32 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-21 08:35:24 +00:00
TreeHugger Robot
73a806fa37 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-21 08:25:07 +00:00
TreeHugger Robot
6d25cfcc3b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-21 08:25:04 +00:00
TreeHugger Robot
b2185f5ede Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-21 08:21:52 +00:00
TreeHugger Robot
b8f0a8e2dc Merge "[Provider Model] Carrie Wi-Fi offload toggle request (panel)" into sc-dev 2021-04-21 08:19:23 +00:00
TreeHugger Robot
d4a4fead67 Merge "[Provider Model] Carrie Wi-Fi offload toggle request" into sc-dev 2021-04-21 08:19:13 +00:00
Alex Johnston
e9717d265e Fix maximum time to lock 
Changes
* Restore previous timeout behaviour. This
  behaviour was modified in Android S and
  was previously working on Android R.
* If the selected timeout is less than
  the max timeout set by the admin, select
  the largest possible timeout.
* If there are no possible timeouts for the
  user, disable the preference.

Manual testing steps
* Download CtsVerifier and CtsEmptyDeviceOwner apks
* Set device owner
* Run Policy transparency test > set max time to lock
* Set max time to lock and verify correct value is
  shown in Settings. Compare behaviour with Android R.

Bug: 184104507
Test: manual testing
      atest com.android.settings.display.ScreenTimeoutSettingsTest
Change-Id: I8d0e66ccce14cca244bcd380fd225a31df0b8999
 2021-04-21 08:09:25 +00:00
Bill Yi
1d413d8390 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic67b0bfa2e86c32e2084d36459916aae031f97ed
 2021-04-21 07:25:12 +00:00
Bill Yi
18bbddbc72 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I179f0d31dcca4db83624ecd31c0d88fc24a93559
 2021-04-21 07:17:44 +00:00
Bill Yi
258d71bdb5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I78ea5296db70d652825abe7a8838613027945e53
 2021-04-21 07:13:04 +00:00
Bill Yi
34ce6187c8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia246265007d3858abdac7c9c5d368c607afd5a15
 2021-04-21 07:09:42 +00:00
Bill Yi
ca4797df06 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia3bcf08024545d44f87ac3208f6c2d5ff7a1d8fc
 2021-04-21 07:06:47 +00:00
YUKAI HUNG
e72b6017a3 Merge "Add data validator to verify and log abnormal queried history data" into sc-dev am: 2f4ae2a0e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14251247

Change-Id: I8861428832fc78a9339bf366f119cc494828776f
 2021-04-21 07:06:09 +00:00
Bill Yi
c7be92bf6a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id494d2571fc237ef47af58f96be1ef9e9025dc5e
 2021-04-21 07:03:23 +00:00