PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,969 Commits 1 Branch 0 Tags
5d7e59f6ca6774b621e7f8f1522e22aab79c2276
Commit Graph

80969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
34ce6187c8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia246265007d3858abdac7c9c5d368c607afd5a15
 2021-04-21 07:09:42 +00:00
YUKAI HUNG
095c264877 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: I85cfc37e56647cb6fc3a9d9f750ebdde5a1f35cf
 2021-04-21 07:07:55 +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
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
YUKAI HUNG
2f4ae2a0e4 Merge "Add data validator to verify and log abnormal queried history data" into sc-dev 2021-04-21 06:45:57 +00:00
Menghan Li
5385c6bc66 Merge "[Material Next] Update main feature switch for Caption preferences." into sc-dev am: d3cc241c42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14255410

Change-Id: Ic53f93e9a3493ce1ddc2bb5696fdd8a5fdeac140
 2021-04-21 06:05:26 +00:00
Menghan Li
d3cc241c42 Merge "[Material Next] Update main feature switch for Caption preferences." into sc-dev 2021-04-21 05:46:20 +00:00
menghanli
b4558c9607 [Material Next] Update main feature switch for Caption preferences. 
Fix: 185950803
Test: manual test
Change-Id: I5431461f3088652ddff7400b24b3eea25ddf5f9a
 2021-04-21 11:39:56 +08:00
Jeremy Goldman
c5c2da018f Merge "Remove the "+" button on the help menu if no secure vpns can be created" into sc-dev am: 2fcb8531ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233625

Change-Id: Iea7c7b370ff5320c518ccbaa9cc86791fc62a355
 2021-04-21 03:06:46 +00:00
Jason Hsu
d717f88825 Merge "Fix accessibility settings page did not update the preference state" into sc-dev am: e8063609eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14029862

Change-Id: If0ac91f2d568371ad6bda8806d9a2e5bbffa97bf
 2021-04-21 03:06:35 +00:00
Jeremy Goldman
2fcb8531ab Merge "Remove the "+" button on the help menu if no secure vpns can be created" into sc-dev 2021-04-21 03:01:39 +00:00
ykhung
70bef1049f Add data validator to verify and log abnormal queried history data 
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I331922cf0b0e946066a72eb0bfcf9885dde9a7ce
 2021-04-21 02:52:20 +00:00
Jason Hsu
e8063609eb Merge "Fix accessibility settings page did not update the preference state" into sc-dev 2021-04-21 02:29:23 +00:00
Mady Mellor
09cbe8fb64 Merge "Change bubble settings to use Secure rather than Global" into sc-dev am: 2affde3202 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13474542

Change-Id: I95f6cc195318351d241c41ffd8d81011199e2aa3
 2021-04-20 23:11:36 +00:00
Mady Mellor
2affde3202 Merge "Change bubble settings to use Secure rather than Global" into sc-dev 2021-04-20 23:06:40 +00:00
TreeHugger Robot
a0501be2b0 Merge "Fix search index for a financed device" into sc-dev am: db3767e7b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14163911

Change-Id: I217da001caa9f904a25d25e031ec06c5f5156e1c
 2021-04-20 21:40:18 +00:00
TreeHugger Robot
db3767e7b3 Merge "Fix search index for a financed device" into sc-dev 2021-04-20 21:06:45 +00:00
TreeHugger Robot
f3ba0c4015 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33583e7990 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifa2da56ed08daf720220b289751400f09ec8dc48
 2021-04-20 20:29:58 +00:00
TreeHugger Robot
e14a48237f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f988d7688b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1792c526458fc5ab8d0b9ef70926b4256dbcc1f3
 2021-04-20 20:25:59 +00:00
TreeHugger Robot
33583e7990 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-20 20:04:02 +00:00
TreeHugger Robot
f988d7688b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-20 19:46:16 +00:00
Salud Lemus
9068481299 Fix search index for a financed device 
Now with two preference controllers, one for enterprise device and one
for financed device, the search index issue (querying "Financed device
info" in Settings does not show a search result) is fixed. The financed
preference controller is used when the device is a financed device.
Otherwise, the enterprise preference controller is used.

Bug: 183551684
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacyPreferenceControllerTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=FinancedPrivacyPreferenceControllerTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacyPreferenceControllerHelperTest

Change-Id: I051144ec9004f86456285078ebb1c72266f80a55
 2021-04-20 12:17:39 -07:00
Bill Yi
1d6b60889e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7f73237f7a7fcef3389c3afebadcafdb0be4d60c
 2021-04-20 18:42:47 +00:00
Bill Yi
bf0d0fe30e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I02e17fc7d05452a591f4df992135821a4d8524cc
 2021-04-20 18:35:03 +00:00
ykhung
a04ecb0e91 Add footer for battery usage page am: 1415cbc49a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235152

Change-Id: I217d8ca631713c146024146025845205cf24fd23
 2021-04-20 16:53:04 +00:00
ykhung
945c3271dd Add battery usage time summary to usage list item am: 7cc616e90f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233636

Change-Id: Id407b1b81a184f6c51e099ce906f38336e01f671
 2021-04-20 16:53:03 +00:00
Alex Johnston
dce68bf7a5 RequestManageCredentials dark theme 
Manual testing steps
* Enable dark theme via Settings > display
* Install TestDPC and select 'Request to manage credentials'
* Verify dark theme is displayed (including light text)

Bug: 177901172
Test: atest com.android.settings.security.RequestManageCredentialsTest
      manual testing
Change-Id: I6db1361ffcbf1e193673eb5ca7ef3f403d5023b1
 2021-04-20 15:21:14 +00:00