PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,373 Commits 1 Branch 0 Tags
405ea373f2f7eed28bbb32ed34a40aced93265d0
Commit Graph

83373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
405ea373f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0f95249651 -s ours am: 946f0b1fe4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If559154688352987e5a3f4ce7eed7ad5f6787c30
 2021-06-07 05:26:35 +00:00
TreeHugger Robot
842e51ff14 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 17c5234bca -s ours am: e7c366b593 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8589decd859e618620ff9ed99f44d8c88862f430
 2021-06-07 05:20:31 +00:00
TreeHugger Robot
a97910af8b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0f95249651 -s ours am: 85bf9b8597 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I32cb90242b438a3e96ee2694545c5005b6204bde
 2021-06-07 05:20:15 +00:00
TreeHugger Robot
946f0b1fe4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0f95249651 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ea51a631ebd43488e5a6a74feb0ce072b07fd40
 2021-06-07 05:05:05 +00:00
TreeHugger Robot
e7c366b593 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 17c5234bca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e76deded056a234b0ed6a75095f3d6476a86fea
 2021-06-07 05:03:45 +00:00
TreeHugger Robot
85bf9b8597 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0f95249651 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idcf1e4a63837ae0f5e07032ab9583aa42af35d1d
 2021-06-07 05:03:25 +00:00
TreeHugger Robot
c2542041cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f10272ddc4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I17d327a784a36861879a262a9620e1b14b9d1d18
 2021-06-07 04:56:16 +00:00
TreeHugger Robot
17c5234bca Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-07 04:46:26 +00:00
TreeHugger Robot
0f95249651 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-07 04:42:56 +00:00
TreeHugger Robot
f10272ddc4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-07 04:35:59 +00:00
Bill Yi
ad2c686b48 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0ce668c4a4c8f7f14cd0173645350fd3318163c9
 2021-06-07 03:47:17 +00:00
Bill Yi
efffd6f45b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I18003e4dadc5ac398986ed0fe72cb5824c4e2097
 2021-06-07 03:40:02 +00:00
Bill Yi
a4bf78bdd9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ife555b09b530f7960547bdf0e715819f42fd2e3f
 2021-06-07 03:38:35 +00:00
Les Lee
65d2157b6f Merge "Usage Settings: Fix NPE when subscriberId is Null." into sc-dev am: 787685b2cc am: dedd647b97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847052

Change-Id: Ie7c5d9fed74f993b6a11865c21a798abe9be85f4
 2021-06-07 03:17:17 +00:00
TreeHugger Robot
21fcecc514 Merge "Add key for StorageDashboardFragment" into sc-dev am: b734aa3f7f am: 297c48d04d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841816

Change-Id: I869f54528b81aad89de54ff0c01f19d5551b2865
 2021-06-07 03:17:11 +00:00
Les Lee
ef9b85ed44 Merge "Usage Settings: Fix NPE when subscriberId is Null." into sc-dev am: 787685b2cc am: d0745b39b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847052

Change-Id: I2472991fd8fe4bb7082c6451a6df165fce8487ca
 2021-06-07 03:08:37 +00:00
TreeHugger Robot
a75a39701c Merge "Add key for StorageDashboardFragment" into sc-dev am: b734aa3f7f am: cb0a247abf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841816

Change-Id: I7659f0f415ffb054a340bb6d3b642f1294003f80
 2021-06-07 03:08:33 +00:00
Les Lee
dedd647b97 Merge "Usage Settings: Fix NPE when subscriberId is Null." into sc-dev am: 787685b2cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847052

Change-Id: I425454a57490bdb44ebbd01dbf35cc48fba94762
 2021-06-07 02:55:56 +00:00
TreeHugger Robot
297c48d04d Merge "Add key for StorageDashboardFragment" into sc-dev am: b734aa3f7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841816

Change-Id: I2705f11283e98901896144c7fcd4710700f1bfe2
 2021-06-07 02:55:20 +00:00
Les Lee
d0745b39b6 Merge "Usage Settings: Fix NPE when subscriberId is Null." into sc-dev am: 787685b2cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847052

Change-Id: Ibb93d30549d00dc7cd85f2d17332d27dcab5657a
 2021-06-07 02:51:30 +00:00
TreeHugger Robot
cb0a247abf Merge "Add key for StorageDashboardFragment" into sc-dev am: b734aa3f7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841816

Change-Id: Ife95f2185be80d42d377aebcfd2cfce0be97005a
 2021-06-07 02:51:11 +00:00
Les Lee
787685b2cc Merge "Usage Settings: Fix NPE when subscriberId is Null." into sc-dev 2021-06-07 02:41:28 +00:00
TreeHugger Robot
b734aa3f7f Merge "Add key for StorageDashboardFragment" into sc-dev 2021-06-07 02:37:51 +00:00
Les Lee
204f0215da Usage Settings: Fix NPE when subscriberId is Null. 
For mobile, a old API: buildTemplateMobileAll doesn't includes the
merged wifi network, call the new API: buildTemplateCarrierMetered
to replace the old one.

But new API: buildTemplateCarrierMetered requires non-null subscriberId.
Call old API: buildTemplateMobileAll when subscriberId is NULL since
the matched result is always empty when subscriberId is NULL. No any different
between buildTemplateCarrierMetered and buildTemplateMobileAll.

Bug: 190233044
Bug: 190135429
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageLibTest

Change-Id: Ic6dada8260029e47e044d016ebc701c25dbf9b2a
 2021-06-05 03:14:18 +00:00
Kevin Han
cbbb4dbe41 Merge "Move unused apps count calculation to bg thread" into sc-dev am: 603cd6c44c am: cbc3c1780d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795269

Change-Id: Ia6de696e2f8fd6b2ffa98caae3ae7fbb803d126e
 2021-06-04 23:59:13 +00:00
Kevin Chyn
ee1cb6a1cb Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4 am: 0a8fcd8fe9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764

Change-Id: I8fe00b5cb6d9678b1dd203e528e5099cff95029d
 2021-06-04 23:58:57 +00:00
Kevin Han
8e813a0fbc Merge "Move unused apps count calculation to bg thread" into sc-dev am: 603cd6c44c am: 71c447494a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795269

Change-Id: Ibd52a52cb703a02dc5b10dd4b98fccf1a559f418
 2021-06-04 23:58:29 +00:00
Kevin Chyn
c9ef612518 Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4 am: e926e6757f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764

Change-Id: Ifa515fe41d6c0ea2d94a9d4567b7da80a9625cb2
 2021-06-04 23:58:19 +00:00
Kevin Han
71c447494a Merge "Move unused apps count calculation to bg thread" into sc-dev am: 603cd6c44c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795269

Change-Id: I690efa597ac55bb601d7bf2608ee3e8b56d6e045
 2021-06-04 23:44:09 +00:00
Kevin Chyn
e926e6757f Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764

Change-Id: I301973cb4053811181a9c7564e739317fa8c45b8
 2021-06-04 23:44:01 +00:00
Kevin Han
cbc3c1780d Merge "Move unused apps count calculation to bg thread" into sc-dev am: 603cd6c44c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795269

Change-Id: I0aacb5fd54793c53b7f5ca15cbfb16128a7d6e80
 2021-06-04 23:41:35 +00:00
Kevin Chyn
0a8fcd8fe9 Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764

Change-Id: Id795687f5bc58a57a75f8222030f220a46f1988b
 2021-06-04 23:41:23 +00:00
Kevin Han
603cd6c44c Merge "Move unused apps count calculation to bg thread" into sc-dev 2021-06-04 23:35:55 +00:00
Kevin Chyn
4a0a03f0e4 Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev 
* changes:
  Update fingerprint/face enrollment to lock icon
  Update fingerprint intro drawable
  Remove SUW-specific fingerprint enroll description
 2021-06-04 23:26:19 +00:00
Chloris Kuo
ae5c01e692 Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9 am: d07a484c46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751

Change-Id: I3b8531d65d5d9202a9a730b6f1840fad2ac22a5b
 2021-06-04 20:57:15 +00:00
Chloris Kuo
e83a9465b2 Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9 am: 7327a3426d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751

Change-Id: I4146ddd2a733f32aae801bcc2a2475054204276e
 2021-06-04 20:55:40 +00:00
Chloris Kuo
7327a3426d Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751

Change-Id: I7369b7103d64a354574ae87dbc2eecb01788029a
 2021-06-04 20:41:33 +00:00
Chloris Kuo
d07a484c46 Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751

Change-Id: I02e0e2ff3b9d6012a3ada8b215f79eec4e844c3b
 2021-06-04 20:39:39 +00:00
Chloris Kuo
f9bde76ab9 Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev 2021-06-04 20:27:46 +00:00
Kevin Chyn
ade59af392 Update fingerprint/face enrollment to lock icon 
Bug: 187460696
Test: manual
Change-Id: I490ad4246e54ed4ae2e8539e8e9eabba1ccecff6
 2021-06-04 12:49:31 -07:00
Kevin Chyn
3e27fd8752 Update fingerprint intro drawable 
Bug: 187460696
Test: manual

Change-Id: I92ae38b8851be1e1ad91c9723264249424b9078d
 2021-06-04 12:49:23 -07:00
Kevin Chyn
47257c05c8 Remove SUW-specific fingerprint enroll description 
Bug: b/187460696
Test: adb shell am start -n com.google.android.setupwizard/.SetupWizardTestActivity
Change-Id: I5db49dd27439445aae9819dbdd0728ac5c02f0cd
 2021-06-04 12:47:35 -07:00
TreeHugger Robot
253bfebc64 Merge "Fix LifecycleObserver implementation in SmartAutoRotateBatterySaverController" into sc-dev am: 8d9d889a8e am: f436f855c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14628750

Change-Id: I6274c1ec86544066ee275d5eebe858cfa319786c
 2021-06-04 18:59:23 +00:00
TreeHugger Robot
686b2037fb Merge "Fix LifecycleObserver implementation in SmartAutoRotateBatterySaverController" into sc-dev am: 8d9d889a8e am: e84551c9d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14628750

Change-Id: Ic5e77061d77032e44361d6ee10cca6e56dd387d2
 2021-06-04 18:57:39 +00:00
TreeHugger Robot
e84551c9d4 Merge "Fix LifecycleObserver implementation in SmartAutoRotateBatterySaverController" into sc-dev am: 8d9d889a8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14628750

Change-Id: I7abd4ab0af12f4cbb7a7ff30995a2ccea968fefe
 2021-06-04 18:43:58 +00:00
TreeHugger Robot
f436f855c0 Merge "Fix LifecycleObserver implementation in SmartAutoRotateBatterySaverController" into sc-dev am: 8d9d889a8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14628750

Change-Id: If23049d5758d7e2c87ead1c903d1fef36a577b5c
 2021-06-04 18:42:16 +00:00
Chloris Kuo
5028e6e6a6 Fix NotificationAssistantPreferenceController constructor 
Fix flaky test due to the constructor must either only take Context, or
(Context, String).

Bug: 187998873
Test: CodeInspectionTest, NotificationAssistantPreferenceControllerTest
Change-Id: Ie383ea6773afda05adfb7aa9d7de9e27676f6b29
 2021-06-04 11:39:36 -07:00
TreeHugger Robot
8d9d889a8e Merge "Fix LifecycleObserver implementation in SmartAutoRotateBatterySaverController" into sc-dev 2021-06-04 18:31:03 +00:00
TreeHugger Robot
938b5681b4 Merge "Storage Settings hides categories when loading" into sc-dev am: 03d4644673 am: 017de20112 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772155

Change-Id: I5add7a18c69de64fb587987d2d17502b8727f575
 2021-06-04 11:44:23 +00:00
TreeHugger Robot
e6c6db1f61 Merge "Storage Settings hides categories when loading" into sc-dev am: 03d4644673 am: 1a181a3239 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772155

Change-Id: Iaeae2fa4a87f76f86ca061306ac96915c5fdf9fd
 2021-06-04 11:43:28 +00:00