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

135357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Yiyi Shen
14c611a37c Add flag for Subsequent pair Settings integration 
Bug: 296507968
Test: Manual
Change-Id: I87002c4e8143df1e67e3c32eff6d654575b81051
 2023-08-28 14:06:30 +08:00
Chaohui Wang
5d7228235b Fix AppInstallerInfoPreferenceTest flakiness 
Add delay after performClick().

Bug: 289155281
Test: unit test
Change-Id: Ie84a375dfcd053b3a1ea75da05b9f3ff4ee2d5ba
 2023-08-28 11:37:48 +08:00
Roshan Pius
cab76b2b15 [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 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: Ifc88d90d8a6d7c6210cd6391e9ce7fa06fc73849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 21:07:35 +00:00
Xin Li
6b3d512b63 Merge Android U (ab/10368041) 
Bug: 291102124
Merged-In: I17a6c8a571b4a0b7d943dfd710cde0f18d03da39
Change-Id: I4ed5b2e4c6c59527bb544e8b6dff2b9d4cee9025
 2023-08-25 13:50:56 -07:00
Roshan Pius
d46ca2b59a [automerger skipped] Merge "Implement DISALLOW_NFC AE user restriction" into main am: a3f6a70e9b am: e86e47178e -s ours am: 8e02a78797 -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: I099c5bbef8a2cef5723e48fe5208218f98568b5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 20:34:06 +00:00
Roshan Pius
8e02a78797 [automerger skipped] Merge "Implement DISALLOW_NFC AE user restriction" into main am: a3f6a70e9b am: e86e47178e -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: I923ab7b877922c32b5a67e6318e048899677f6a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 19:49:55 +00:00
Roshan Pius
e86e47178e Merge "Implement DISALLOW_NFC AE user restriction" into main am: a3f6a70e9b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2716375

Change-Id: I0cd0d4bea29c9e82f75b266e6a9daf0b617b3f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 19:06:15 +00:00
Bill Yi
bae3928e90 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3ec1e1f122 -s ours am: 7254a9d7cb -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: Id225872c11f803b548dee5302204deec8b4e961e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:59:21 +00:00
Bill Yi
e302a88a9b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c30a22f6f3 -s ours am: 6d580ef24a -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: Id5020bffdaba42587504d09d8167fc354f9fcb54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:59:04 +00:00
Bill Yi
c381393d0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f3fa8b1d38 -s ours am: 5adc7a2d96 -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: I18cab527f3e2bd4ff7a2b70734f32ed5e8838641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:58:37 +00:00
Bill Yi
a91a059024 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6aee0c18c -s ours am: b5515b130c -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: I11099e537443aae6f88d1d795c77dfc82a7cfb1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:58:12 +00:00
Bill Yi
7254a9d7cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3ec1e1f122 -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: Id508357e9338d133b03b8157e5305af9c4ef2141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:25:23 +00:00
Bill Yi
6d580ef24a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c30a22f6f3 -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: Idbe7c4b6206e0f49230b5f5e383d943b539946ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:25:05 +00:00
Bill Yi
5adc7a2d96 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f3fa8b1d38 -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: I732e771289ed9518f559d04d0e973e6d1f38e33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:24:37 +00:00
Bill Yi
b5515b130c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6aee0c18c -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: I79df28dda9b0cec7693a4fd5a3f7221ee627ad08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:24:14 +00:00
Bill Yi
fd2c004cd7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3ec1e1f122 -s ours am: 920d199532 -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: I1e78bb57ebb29ec407d1d62ea2c695d821b3db55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:22:30 +00:00
Bill Yi
9d7e1bbd18 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c30a22f6f3 -s ours am: 4c05f68c83 -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: I841069aff244396aa7db6f062dbc952a1799ef14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:22:05 +00:00
Bill Yi
37dfc701c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f3fa8b1d38 -s ours am: 01c84039d2 -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: I7a0740499b7115cb1562d7e33f5ab4b320d24fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:21:42 +00:00
Bill Yi
f52a13f3bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6aee0c18c -s ours am: ed31ffe0de -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: I08e2a2664a33912c2bfdeced189972f043a5ede7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:21:22 +00:00
Treehugger Robot
84c4ec936a Merge "Fixed battery tips card UI." into udc-qpr-dev am: 646c676ff6 am: 7f3062b52e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24457990

Change-Id: I3b925eba90c8413a8531f50407e03637bf756f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:18:50 +00:00
Treehugger Robot
998d8d13df [automerger skipped] Merge "Add UI metrics logging for battery tips card." into udc-qpr-dev am: 40fa6ebbd8 am: 498b6493d1 -s ours 
am skip reason: Merged-In I925e4d887c3435239aed0aa0fde7cda2c3a95b3c with SHA-1 f838f5d5fa is already in history

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

Change-Id: I9c0e07413ced39b6c95138f6731e12f7f6f2d350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:18:34 +00:00
Bill Yi
920d199532 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3ec1e1f122 -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: Ie2054ec9fb8c608f74598495124dac3794f572eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:17:58 +00:00
Bill Yi
4c05f68c83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c30a22f6f3 -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: I58559c3367e73dd91ff8a940691d132b9b82e7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:17:40 +00:00
Bill Yi
01c84039d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f3fa8b1d38 -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: Idfe45bdd26aadeb05290861b5b78e077281bfb5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:17:11 +00:00
Bill Yi
ed31ffe0de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6aee0c18c -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: I89976d26125e1a12f4c09444eff72ef524e5ec6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:16:48 +00:00
Treehugger Robot
40c8611c71 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 4b59201c53 -s ours am: cf0b06e047 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie323a7a365c659020bf48b6375d316f9cf9e4f24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:14:58 +00:00
Bill Yi
accfdc3b1b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 974293cb11 -s ours am: cd4817bdde -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I822b60a6fd6146f4a8a9752c8c6343a5695c9aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:14:47 +00:00
Treehugger Robot
2ecb75fa8c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ecddb596e1 -s ours am: a02253459b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic39b1e004b42f16c26351458fe5a93390197693a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:14:34 +00:00
Bill Yi
0b5d8565a0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44369ed065 -s ours am: 8c215bf85f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id1b3cd602f378b82e8f34c38373bd5fcbe02bbe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:14:17 +00:00
Roshan Pius
a3f6a70e9b Merge "Implement DISALLOW_NFC AE user restriction" into main 2023-08-25 18:06:28 +00:00
Bill Yi
3ec1e1f122 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-08-25 17:44:41 +00:00
Bill Yi
f3fa8b1d38 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-08-25 17:44:41 +00:00
Bill Yi
c8dc6febc6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 582bd62c87 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I868e4c26106ddccceb8a3e10e961c5e2ef2d18f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 17:24:27 +00:00
Bill Yi
94deed1ed6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fac65474fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85b76a936e538a43fc2468f04a7eea3a55e09db4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 17:24:16 +00:00
Bill Yi
e39de2cc99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b1e1cd32da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide1151d8f9a39347626b00caeca8cb7a24802b5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 17:12:56 +00:00
Bill Yi
5e86c208a8 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-08-25 16:37:00 +00:00
Bill Yi
51152c5462 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-08-25 16:37:00 +00:00
Bill Yi
c72c9fe3eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 77dc4de4b1 -s ours am: f2e8fd2543 -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: I1a9390960f6d433755916d5d48913e73ab35f24b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 15:31:48 +00:00
Bill Yi
228eb7920b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b2ef719b18 -s ours am: f9b7cb0384 -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: I27cb5add1d4c09cf89f943b9fa4d1a3d7e2e631b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 15:31:33 +00:00
Bill Yi
6f8e20edce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 77dc4de4b1 -s ours am: 92c2a5540e -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: I97fda7e8f75bd7e98104345313f2eacaea1dbe81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 14:56:54 +00:00
Bill Yi
ea8ffab3b5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b2ef719b18 -s ours am: 46f23fb653 -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: I2ca475e3f3e418a145150ce1e57b80979928349b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 14:56:39 +00:00
Bill Yi
f2e8fd2543 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 77dc4de4b1 -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: I4deb1054cc3223739cb61bb45186de8798424731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 14:42:01 +00:00