PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
135,047 Commits 1 Branch 0 Tags
3f2ed1ac74472289ebf339f2d95105b2730fc35c
Commit Graph

135047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Allen Su
08032ea3c5 Merge "Add LocaleNotificaiton feature flag" into main 2023-08-29 10:21:46 +00:00
Treehugger Robot
6367a80f6b Merge "Crash occurs when entering a Bluetooth broadcast password" into main am: 5bc143402c am: 6d9e295c3a am: 4f9381ef09 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2667275

Change-Id: I15337de0b157ee85c14cf6267e1f14971bd083a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 09:47:05 +00:00
Treehugger Robot
4f9381ef09 Merge "Crash occurs when entering a Bluetooth broadcast password" into main am: 5bc143402c am: 6d9e295c3a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2667275

Change-Id: I2c8595f65e4e3e4c80c4bef1cbc8dad47f6122c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 08:59:21 +00:00
Treehugger Robot
6d9e295c3a Merge "Crash occurs when entering a Bluetooth broadcast password" into main am: 5bc143402c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2667275

Change-Id: I5a2b645fce8800da77ff886f8bc69a20efb34d88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 08:10:45 +00:00
Allen Su
bce9d2a4fb Add LocaleNotificaiton feature flag 
Bug: 248514263
Test: adb shell device_config put settings_globalintl com.android.settings.flags.locale_notification_enabled true
Change-Id: Ibfc9b7fb8c39962af1b062feb98d073207887fb9
 2023-08-29 07:58:02 +00:00
Yiyi Shen
de231200d7 Add FeatureProvider for FastPair Settings integration. 
Bug: 296507968
Test: FakeFeatureFactory
Change-Id: Ie2e238cb61ca56a1d19e1a13b0234e28e28a785e
 2023-08-29 15:50:48 +08:00
Treehugger Robot
5bc143402c Merge "Crash occurs when entering a Bluetooth broadcast password" into main 2023-08-29 07:32:28 +00:00
Treehugger Robot
10d3e1e065 Merge "Enable i18n for battery tips card and fix b/297036263." into udc-qpr-dev-plus-aosp 2023-08-29 06:26:39 +00:00
Chaohui Wang
88343a3d7c Remove getMobileTemplate_mergedImsisFromGroupNull_returnRequestedSub 
Because,
 - telephonyManager.mergedImsisFromGroup is @NonNull
 - telephonyManager.mergedImsisFromGroup is fixed, will not return null
 - This test no longer feasible, since return null will crash now

Bug: 297923588
Test: atest SettingsSpaUnitTests
Change-Id: Ic09cd9b5a36a4743a65e05105ce2e814c020491f
 2023-08-29 13:02:53 +08:00
SongFerng Wang
69ea8a2adc Merge "Fix ClassCastException at NetworkSelectSettings" into udc-qpr-dev am: 32c75f49a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24548405

Change-Id: I039187faf0a705b68509a241781f59f1e4c8c4b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 04:59:49 +00:00
Weng Su
36ae9189b2 Show Hotspot informations in Network details settings 
- Show Hotspot device type in hearder icon

- Show Hotspot device details informations.
  - Internet source (network type)
  - Battery

Bug: 297346368
Test: manual test
atest -c WifiNetworkDetailsFragmentTest \
         WifiDetailPreferenceController2Test
atest -c SharedConnectivityRepositoryTest \
         WifiNetworkDetailsViewModelTest

Merged-In: I4bd090e00681911c8fac469289fd818237b8c518
Change-Id: I4bd090e00681911c8fac469289fd818237b8c518
 2023-08-29 03:56:11 +00:00
Weng Su
d32f590f07 Merge "Show Hotspot informations in Network details settings" into main 2023-08-29 03:55:12 +00:00
SongFerng Wang
32c75f49a7 Merge "Fix ClassCastException at NetworkSelectSettings" into udc-qpr-dev 2023-08-29 03:53:48 +00:00
Zaiyue Xue
ab00ac091d Enable i18n for battery tips card and fix b/297036263. 
Bug: 291689623
Bug: 297036263
Fix: 297036263
Test: manual
Change-Id: I41aff99c73ace995ef9dfa8f1dc28024cd12d236
Merged-In: I41aff99c73ace995ef9dfa8f1dc28024cd12d236
(cherry picked from commit d3156cc001)
 2023-08-29 03:38:35 +00:00
Treehugger Robot
7bdddc9c34 Merge "Fix theme differences between left/right pane problem" into main 2023-08-29 02:10:50 +00:00
Xin Li
edbeaac792 [automerger skipped] Merge Android U (ab/10368041) am: 6b3d512b63 -s ours am: f2df053926 -s ours am: 1e710d6df4 -s ours 
am skip reason: Merged-In I17a6c8a571b4a0b7d943dfd710cde0f18d03da39 with SHA-1 1485ceaf97 is already in history

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

Change-Id: I95e2c69a1b8855133d7712998eddd844c4ae7aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 01:11:06 +00:00
Treehugger Robot
696c8ff64a Merge "Skip test broken by @NonNull annotation fix" into main 2023-08-29 00:43:23 +00:00
Xin Li
1e710d6df4 [automerger skipped] Merge Android U (ab/10368041) am: 6b3d512b63 -s ours am: f2df053926 -s ours 
am skip reason: Merged-In I17a6c8a571b4a0b7d943dfd710cde0f18d03da39 with SHA-1 1485ceaf97 is already in history

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

Change-Id: I341f650a35f69bc5e76638f7dff4a8bc461d66de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 00:35:22 +00:00
Sumit Bhagwani
f6472fdfca Add android:maxSdkVersion="34" to all the <uses-permission> blocks for "com.google.android.googleapps.permission.GOOGLE_AUTH*" permissions 
These permissions used to guard code in Android Authenticator which doesn't exist now. There is no GSF code in V+.

Bug:280072910
Change-Id: Ib2fceca51c324f107be6b9e2f9e6001431cc3f08
 2023-08-29 00:27:35 +00:00
Xin Li
f2df053926 [automerger skipped] Merge Android U (ab/10368041) am: 6b3d512b63 -s ours 
am skip reason: Merged-In I17a6c8a571b4a0b7d943dfd710cde0f18d03da39 with SHA-1 1485ceaf97 is already in history

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

Change-Id: I94d5dbd6699e067769156d162fd8bd725fa67cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 23:59:23 +00:00
Colin Cross
4700dd261f Skip test broken by @NonNull annotation fix 
b/294110802 fixed the @NonNull annotation so that it was visible to
kotlin when applied to methods outside the current build module.  This
caused kotlin to insert more null checks, which broke a test that was
mocking a method annoated with @NonNull and forcing it to return null.
Add @Ignore to the test for now.

Bug: 294110802
Bug: 297923588
Test: atest SettingsSpaUnitTests
Change-Id: I86a677c5ac01bcfaeebe8c339791cca5b2b97fc7
 2023-08-28 15:36:09 -07:00
Roshan Pius
f9aa0769d6 [automerger skipped] Merge "Implement DISALLOW_NFC AE user restriction" into main am: a3f6a70e9b am: e86e47178e -s ours am: 8e02a78797 -s ours am: d46ca2b59a -s ours am: cab76b2b15 -s ours 
am skip reason: Merged-In I8ef4b7a3630535bde9eedb4da78ae3fee8e13234 with SHA-1 f72a53a595 is already in history

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

Change-Id: I4aca732f9308161acd7a90e33739ffb471eea7c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 20:08:04 +00:00
Bill Yi
81dab2522d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3ec1e1f122 -s ours am: 7254a9d7cb -s ours am: bae3928e90 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I89cee737ec422fbd4db72381e3e23fc7291cd454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 20:07:01 +00:00
Weng Su
25e20caf00 Show Hotspot informations in Network details settings 
- Show Hotspot device type in hearder icon

- Show Hotspot device details informations.
  - Internet source (network type)
  - Battery

Bug: 297346368
Test: manual test
atest -c WifiNetworkDetailsFragmentTest \
         WifiDetailPreferenceController2Test
atest -c SharedConnectivityRepositoryTest \
         WifiNetworkDetailsViewModelTest

Change-Id: I4bd090e00681911c8fac469289fd818237b8c518
 2023-08-29 04:06:55 +08:00
Bill Yi
32f0a72f46 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c30a22f6f3 -s ours am: 6d580ef24a -s ours am: e302a88a9b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I611a5c9f067d33c79c1bde31fc522fe7a7e72104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 20:06:37 +00:00
Bill Yi
e0047b28f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f3fa8b1d38 -s ours am: 5adc7a2d96 -s ours am: c381393d0d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icce9ad21ccff446bafcb08d5582149b2b00d6391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 20:06:13 +00:00
Bill Yi
31d8e8320e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6aee0c18c -s ours am: b5515b130c -s ours am: a91a059024 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iedf37c177ba98ef2a00fb87b130e33fab57251d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 20:05:53 +00:00
Bill Yi
830380bb49 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3ec1e1f122 -s ours am: 920d199532 -s ours am: fd2c004cd7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea50ef644dfd3f672e4528d14f1139d999d10999
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 20:03:07 +00:00
Bill Yi
614d29141c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c30a22f6f3 -s ours am: 4c05f68c83 -s ours am: 9d7e1bbd18 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icddb596d870ede9e4096d68e01596f5f6bfd5c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 20:02:48 +00:00
Bill Yi
df13cc443f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f3fa8b1d38 -s ours am: 01c84039d2 -s ours am: 37dfc701c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If91986deac09a0d35f3eea300bdf6b8cdbc57f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 20:02:21 +00:00
Bill Yi
e31ece88ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6aee0c18c -s ours am: ed31ffe0de -s ours am: f52a13f3bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0a821c3e46f58b769ef811994e06fe0f62d5da6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 20:01:57 +00:00
Bill Yi
c908c6477a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 77dc4de4b1 -s ours am: f2e8fd2543 -s ours am: c72c9fe3eb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6df2b7eee86613dba06c7bbb2a20cffca1826586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:33:24 +00:00
Bill Yi
b6bb19d216 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b2ef719b18 -s ours am: f9b7cb0384 -s ours am: 228eb7920b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I30082437440edd9dbf834a4d4375069f98bd2ff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:33:08 +00:00
Bill Yi
a7e26d52f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 77dc4de4b1 -s ours am: 92c2a5540e -s ours am: 6f8e20edce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e75a831b48e0a81397145f4894123e47758dae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:25:34 +00:00
Bill Yi
5b374480b0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b2ef719b18 -s ours am: 46f23fb653 -s ours am: ea8ffab3b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id79478a3adf31768455f0f70e52ee802a2d9e41e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:25:18 +00:00
Zaiyue Xue
3f62006f60 [automerger skipped] Enable i18n for battery tips card and fix b/297036263. am: d3156cc001 -s ours am: 361c198a3e -s ours 
am skip reason: Merged-In I925e4d887c3435239aed0aa0fde7cda2c3a95b3c with SHA-1 9f57691d89 is already in history

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

Change-Id: I78b9b16f6b6026166554e00e6de9bdaf889e576b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:20:05 +00:00
SongFerng Wang
9ca09c3494 Merge "Fix the NullPointerException" into udc-qpr-dev am: acd7bbefd1 am: 6058a62ad7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24523908

Change-Id: Ia3126898342da4f39f9431a423f25a6270ae3107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:19:55 +00:00
SongFerng Wang
55f1696426 Merge "Add the config_show_sim_info to control the DataUsageSummary SHORTCUT" into udc-qpr-dev am: 6bd2ecf6fb am: 57d30006d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24499553

Change-Id: I1b3b18fc4557822ce56d5115196c1229513b9cbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:19:32 +00:00
SongFerng Wang
61bd2d48c7 Merge "Reflash the Network selection value when onResume" into udc-qpr-dev am: c5944f5cbd am: b1ceb4cc82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24444208

Change-Id: Ieb88bcd6ceb55950048e565a192d8c8f920710a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:19:16 +00:00
Treehugger Robot
e4eb86e356 [automerger skipped] Merge "Impl dismiss action in battery tips cards." into udc-qpr-dev am: 4b4328cb9c am: cffee3ecd3 -s ours 
am skip reason: skipped by user guanxin

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

Change-Id: I002416c6e440e32f573b007f7ca57dc5321cf09d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:18:57 +00:00
Julia Reynolds
67c2cf714b Fix failing test 
Test: make -j RunSettingsRoboTests ROBOTEST_FILTER=NotificationAssistantPreferenceControllerTest
Fixes: 296531083
Change-Id: If949a76662aab6aa63e6ca793d9349254ce688e9
 2023-08-28 18:19:21 +00:00
Treehugger Robot
b529aadf38 Merge "[Terms of Address] Create a feature flag for it" into main 2023-08-28 12:54:30 +00:00
Sunny Shao
9669cf5db9 Fix theme differences between left/right pane problem 
- Add a callback class to monitor the split behavior of the activity
  embedding and update UI if necessary.

Fixes: 279516059
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage.SettingsHomepageActivity
Change-Id: I32e86265638684ddde067539a0f493be4c04afae
 2023-08-28 20:43:46 +08:00
Yiyi Shen
a039e10168 Merge "Rename aconfig declarations to a common name." into main 2023-08-28 12:16:16 +00:00
Zoey Chen
9dc4943e09 [Terms of Address] Create a feature flag for it 
Bug: 297798866
Test: adb shell device_config put settings_localepicker com.android.settings.flags.terms_of_address_enabled true
Change-Id: I1d954edfe99bb56fdd69a53ffafe5c8ed2b05da2
 2023-08-28 11:52:22 +00:00
SongFerngWang
7f62ae77dc Fix ClassCastException at NetworkSelectSettings 
Bug: 296172317
Test: atest NetworkSelectSettingsTest
Change-Id: I811ef95f679bb1b0235a335320654c2acd68110c
 2023-08-28 19:17:10 +08:00
Chaohui Wang
6ef678f19d Add some null annotation for data usage code 
Also do some clean up.

Bug: 296357959
Test: manual - on DataUsageList page
Change-Id: Id7548e1d58d946810c844b9559bb00d65306f441
 2023-08-28 17:47:06 +08:00
Yiyi Shen
27d709ac79 Rename aconfig declarations to a common name. 
Bug: 296507968
Test: Manual
Change-Id: I5e5ecb64d593939addcf356cb619c0944326af24
 2023-08-28 17:40:15 +08:00
Chaohui Wang
6c2d713226 Fix NullPointerException of DataUsageList 
Fix: 296357959
Test: manual - on DataUsageList page
Change-Id: I303aa8ae1ba5db8f23dbc3b68b9ff4e05a0936a0
 2023-08-28 17:29:26 +08:00
Yiyi Shen
a7aeb86ec8 Merge "Add flag for Subsequent pair Settings integration" into main 2023-08-28 08:03:52 +00:00