Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,554 Commits 1 Branch 0 Tags
249de94deaf6b7c7b48cf08b5969b3a80c2009b0
Commit Graph

87554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Automerger Merge Worker
1c46cd4a38 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: Iff649fed55f52ab56dcd304b6fdcdb743279930c
 2021-04-21 09:17:18 +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
769640c06c [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: Id6a725399ec50d8acf5832ab7d904bbc5ea0ae1c
 2021-04-21 09:17:15 +00:00
Bill Yi
0b6bf303b4 [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: I435c895b3c0ef5be75e64f33b8d43c32d326fda1
 2021-04-21 09:17:06 +00:00
Arc Wang
5c04e61041 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: I7e3f5582415be347cc7dae0670a2d28bccc8ebf1
 2021-04-21 09:16:54 +00:00
TreeHugger Robot
d473c68668 [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: Iff773c0fa75dc46ab4da5e88d160a7f4db50ae27
 2021-04-21 09:06:45 +00:00
Automerger Merge Worker
5d7e59f6ca 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: I8fa380ba650c00a78c51cda70147df04291d673f
 2021-04-21 09:06:41 +00:00
TreeHugger Robot
7d01bd4b93 [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: I73b68c5bfdfdcee5de93405cc58c8b54db62862e
 2021-04-21 09:06:37 +00:00
Bill Yi
a873daf629 [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: Ia717eade74fe3a54c05ad814207941569eaaeef7
 2021-04-21 09:06:33 +00:00
Arc Wang
6e3d7e7236 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: Ibf6f427ebefb98bccc8bfc22e0c3cd580c2d9465
 2021-04-21 09:06:18 +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
7f56d09993 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: I5a2335e66ae74a608b20e41729a2790f7f2444cf
 2021-04-21 08:54:50 +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
a2a6b527f9 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: I3abd517eb830a52845c8a8b90340d66808b84db1
 2021-04-21 08:53:08 +00:00
Alex Johnston
4a4e2bae61 Merge "RequestManageCredentials dark theme" into sc-dev 2021-04-21 08:45:06 +00:00
TreeHugger Robot
facbd6bb3e [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: Ib05405eef3e134c29f38c84a645c678102a2b84f
 2021-04-21 08:42:40 +00:00
TreeHugger Robot
5e50d94f41 [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: I508afe2792d12c39a8076bd56878f30410f5320d
 2021-04-21 08:42:36 +00:00
TreeHugger Robot
87c7329d25 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: I2bc8b0f17590af2cd1e945246ba4c5394374ca89
 2021-04-21 08:42:33 +00:00
TreeHugger Robot
513c0a1d1c 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: I18bc1abe24d6fb67772770bc473e796a9fed0c19
 2021-04-21 08:41:33 +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
6254afcdcb [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: Iabb16f1d2b1f500b1e9cb9ec5762dc74701e245d
 2021-04-21 08:40:03 +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
14d3bd735d [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: Ieac51b38a4b75a56db93dc53b05187eff759f156
 2021-04-21 08:39:59 +00:00
TreeHugger Robot
59620d9824 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: Icfc08e43fbea0b4b8fe483f7f19f22ea78872752
 2021-04-21 08:39:48 +00:00
TreeHugger Robot
573b99328d Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-21 08:39:44 +00:00
TreeHugger Robot
2213fafc13 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-21 08:39:25 +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
d42ace8ba2 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: I369883434d2f25d0e253fcee30c63cf2c036512d
 2021-04-21 08:39:13 +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
b4dc53eca4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9dd3eea4d1ff8b8a01faa9e0fd423d1396bdc81b
 2021-04-21 07:21:17 +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
85e0230606 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibe0aedbb3e96ae2445984c1d8a5bea20e05ef218
 2021-04-21 07:16:02 +00:00