PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,291 Commits 1 Branch 0 Tags
2cdc7409b51b97e22c211202b912005926e3aaf6
Commit Graph

117291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
c89a3c4c6a Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity" am: d791f7b967 am: 24e8db3335 am: 5e52bc9c74 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255618

Change-Id: I6925c8b37ce09c36f054aa574154581097ca974c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 05:40:46 +00:00
Treehugger Robot
5e52bc9c74 Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity" am: d791f7b967 am: 24e8db3335 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255618

Change-Id: I506f283c0dccadcc940245195d5112ca7ec4c154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 05:09:53 +00:00
Treehugger Robot
24e8db3335 Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity" am: d791f7b967 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255618

Change-Id: I34ec41a3b0cd28029595e70164501dd1350e96b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 04:42:26 +00:00
Treehugger Robot
d791f7b967 Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity" 2022-10-18 04:09:49 +00:00
Kuan Wang
d16201a375 Merge "Copy BatterySettingsContentProvider from SettingsIntelligence to Settings and rename it to BatteryUsageContentProvider." 2022-10-18 02:26:48 +00:00
Kuan Wang
0a0ba915ca Copy BatterySettingsContentProvider from SettingsIntelligence to Settings and rename it to BatteryUsageContentProvider. 
Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: Ib6c2240cd065f6e29393e13b7231bba7afd2d850
 2022-10-18 02:26:23 +00:00
Kuan Wang
f41ae57f17 Copy Battery Usage Database from SettingsIntelligence to Settings. 
Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: Ibdd2ace10d9e0893b3d96b345d563307b1890df6
 2022-10-18 02:26:18 +00:00
Shen Lin
a911e61ce7 Fix crash when input illegal proxy port number 
Bug: 253951250
Test: manual and atest
Change-Id: I80d2f0e3ce2df86a081b29d8633e06cfc648baeb
 2022-10-18 09:18:57 +08:00
Bill Yi
234689945d Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-10-17 23:33:02 +00:00
Julia Reynolds
9ef3cf2572 Add link to more app settings 
Test: MoreSettingsPreferenceControllerTest
Test: test app that can handle the settings intent
Bug: 236932102
Change-Id: Iae778c93057e47aa0f664d3faab21640b2cd5193
 2022-10-17 13:59:31 -04:00
TreeHugger Robot
c5bd4228c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2fa81e2257 -s ours am: 88706bbf97 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I848c62ee0ff1a18dc0a1f1b88bfbfd006fbd317f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 17:42:53 +00:00
Bill Yi
94645cc6a4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10685ce812 -s ours am: a3e06bcc92 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I112df70369157b1cb5fce2be29668fc15b71767d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 17:42:46 +00:00
TreeHugger Robot
367bf4c948 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5aa59588f2 -s ours am: 49322b60f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9cc4721af71aea213a090fe4e115dc59e1be3101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 17:42:30 +00:00
Bill Yi
c80cac6011 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8b6197643d -s ours am: 40aa9f76b2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I88312c9a2bcee505fc988854a24ab33a99659d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 17:42:12 +00:00
TreeHugger Robot
88706bbf97 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2fa81e2257 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff9e0babe8321174232ab58bf04271d4694edad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 17:39:14 +00:00
Bill Yi
a3e06bcc92 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10685ce812 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3b9a8ad96a76b8f49f308087532b8511cb153e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 17:38:52 +00:00
TreeHugger Robot
49322b60f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5aa59588f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6049cffd60de136acddb4a8b3331968794605d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 17:38:36 +00:00
Bill Yi
40aa9f76b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8b6197643d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ba7fba17edc02926600f15d63a1ea2680aa1e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 17:38:16 +00:00
TreeHugger Robot
0f3b9178f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: f59720e026 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc6f3a7d8a35a2d1c059b186ba460e16fe226382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 17:10:02 +00:00
Bill Yi
5dc8286068 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 46d8824ca9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8b1b8b7f787bae2de9370e5039778b2903051fc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 17:09:55 +00:00
TreeHugger Robot
f6908a2221 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-10-17 16:50:32 +00:00
TreeHugger Robot
2fa81e2257 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-10-17 16:49:37 +00:00
TreeHugger Robot
5aa59588f2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-10-17 16:49:37 +00:00
TreeHugger Robot
f59720e026 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-10-17 16:38:05 +00:00
TreeHugger Robot
6966e0c225 Merge changes from topic "tc_change_22101519_25" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: de36845714
  Import translations. DO NOT MERGE ANYWHERE
 2022-10-17 16:38:04 +00:00
Julia Tuttle
6f25e6afca Merge "Default to hiding silent notifications on lockscreen in Settings" into tm-qpr-dev am: 5d780a42eb am: 8416222c25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193426

Change-Id: If8d5df779d82d0064a5cdec5d59c119fb8b404a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 16:13:04 +00:00
Julia Tuttle
8416222c25 Merge "Default to hiding silent notifications on lockscreen in Settings" into tm-qpr-dev am: 5d780a42eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193426

Change-Id: I6b4ac70d7ca1d7c4fd76b42c6d26f7361ff3420d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 16:07:43 +00:00
Julia Tuttle
5d780a42eb Merge "Default to hiding silent notifications on lockscreen in Settings" into tm-qpr-dev 2022-10-17 14:56:20 +00:00
Simon Wingrove
4884157649 Don't trampoline twice when opening security or privacy 
Settings already trampolines to a two-pane version of deeplink
activities, doing another trampoline will wind up creating a second task
covering up the first, with the wrong layout.

Bug: 253554698
Test: manually
Change-Id: Ib7ba5c95cac2f644ade37a41f321d11c8f1d1b89
 2022-10-17 14:55:51 +01:00
Chaohui Wang
bfb81e249e Merge "Fix broken app info Robolectric tests" 2022-10-17 09:32:55 +00:00
Wei Wang
b4146ffb1f Merge "Reenable tests" 2022-10-17 08:52:42 +00:00
TreeHugger Robot
2d95f7cb18 Merge "Fix broken battery usage Robolectric tests" 2022-10-17 08:18:59 +00:00
Chaohui Wang
b25950d2cc Fix broken app info Robolectric tests 
Fix: 253396248
Test: m RunSettingsRoboTests
Change-Id: I5ccc900824880c5d585b2838bbe3948232617288
 2022-10-17 15:46:03 +08:00
Zaiyue Xue
1c457ce101 Fix broken battery usage Robolectric tests 
Bug: 253385659
Fix: 253385659
Test: presubmit
Change-Id: I4f09f9e5af57a62249970cc2170b60dab267488e
 2022-10-17 15:14:29 +08:00
Wei Wang
52ab48caa0 Reenable tests 
The test testLoadSlice_cachedEntryRemovedOnUnpinned was ignored in
ag/20185792 but fixed in ag/20172765

Test: manual run passed m RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.slices.*"
Change-Id: I0bd0e7f7ed780ab24500c3fb102fd216486c34d9
Bug: 253386051
 2022-10-17 05:54:27 +00:00
Zekan Qian
5d68c3f7b0 Merge "Use new API of SpaEnvironmentFactory." 2022-10-17 05:13:19 +00:00
Zoey Chen
f8eb29606b Merge "[Settings] Change the way in MobileNetworkSummaryController for getting the subscription info from room db" 2022-10-17 03:12:08 +00:00
Zekan Qian
f1311f800e Use new API of SpaEnvironmentFactory. 
Test: manual - build Settings
Change-Id: I1cd5d7297687b6373a0044f8a100dd968b91e657
 2022-10-17 02:49:11 +00:00
Shen Lin
72e5a7ea21 Fix crash when showing error dialog in NetworkRequestDialogActivity 
Fix: 253913148
Test: manual
Change-Id: I23593da1ef6d72806f22d3501b06a8e7abadb100
 2022-10-17 09:30:16 +08:00
Chaohui Wang
507e5f8c90 Fix some errors for Settings project 
Attrs could not have same name, so create a common parent for the
messageText. And BiometricEnrollCheckbox is not in use.

Replace some com.android.settingslib.R with com.android.settings.R,
because these are files in settings instead of settingslib.

Bug: 253772249
Test: TAP
Change-Id: Ifa796e923bf26facf4935be4968637affdb4b48b
 2022-10-16 14:14:02 +08:00
Bill Yi
f3af6d0fac [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: de36845714 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ib389f8ba4a69c562f0b5dee99f749e913dea96c1
 2022-10-16 02:58:00 +00:00
Bill Yi
10685ce812 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I52af69635563e5f832ff9b2db1988ab1a0b8947a
 2022-10-15 15:51:11 -07:00
Bill Yi
79c253e260 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id7d06d3b00b512acc3083791bb5e2386bc50d932
 2022-10-15 15:48:10 -07:00
Bill Yi
8b6197643d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9e456fa02748875d1d19cb5e74440837eb5c6ba0
 2022-10-15 15:45:37 -07:00
Bill Yi
e4026445ed Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0049720788b756d0c4ae917806b14df933b8a34a
 2022-10-15 15:44:31 -07:00
Bill Yi
46d8824ca9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I933ba841c96f32bb402f5bfe167bf80caf4444e9
 2022-10-15 15:42:38 -07:00
Bill Yi
de36845714 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0e826273bdc55424787e63cb755130073006e3d6
 2022-10-15 15:39:55 -07:00
Betty Chang
15066fe36e Merge "[LE Audio] Add LE Audio Devices in Sound Settings" into tm-qpr-dev am: b2269caa45 am: 90a1263b87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20176143

Change-Id: I535cbd8acbf40182f2f43df27b56462cc24674bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-15 05:37:12 +00:00
Julia Tuttle
e9108aecd8 Default to hiding silent notifications on lockscreen in Settings 
Also, fix an errorprone issue.

Bug: 252815574
Test: atest ShowOnLockscreenNotificationPreferenceControllerTest
Change-Id: I46e6d0f15c69abe60ef8505d300e5205b3c71e53
 2022-10-15 01:24:19 -04:00
Betty Chang
90a1263b87 Merge "[LE Audio] Add LE Audio Devices in Sound Settings" into tm-qpr-dev am: b2269caa45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20176143

Change-Id: I207add249654cc4963ee065b0b161e94c24e9b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-15 05:03:37 +00:00