PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,337 Commits 1 Branch 0 Tags
2decf2ae45a18f67ddb1e23fc7d9d82b6c445c99
Commit Graph

110337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
2decf2ae45 Revert "[Settings] configuration for hidding SIM lock UI" am: ead8a35720 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310156

Change-Id: I91a72f38cc22583202c9c707463735d3f436aac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 14:08:29 +00:00
Bonian Chen
a4c9dbd3db [automerger skipped] Revert "[Settings] configuration for hidding SIM notification UI" am: 26aa2414a0 -s ours 
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I31ef77d9a714c6ff87b3bd07b91e11cd050e6270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 14:08:25 +00:00
Bonian Chen
ead8a35720 Revert "[Settings] configuration for hidding SIM lock UI" 
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: I870c0b53112db56b7bc80bfd585f6f7b3cf82737
Change-Id: Ie157c9d85b5cea9ded8c4b7928a10e7ae401ab09
 2022-11-22 11:58:48 +00:00
Bonian Chen
26aa2414a0 Revert "[Settings] configuration for hidding SIM notification UI" 
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: I07d9ddeb96ca590decf28126ce97fba4c1783304
Merged-In: I7a912a3393694155d29614d325796e08598985bf
Merged-In: I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f
Change-Id: Ib366c3fca7433e58d1925f27af11a794afb3ca00
 2022-11-22 11:57:34 +00:00
Bonian Chen
0a4295d688 Revert "[Settings] configuration for hidding SIM related UI" 
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: I03d17beac0fb85a3d17acd7d0d581feb35e9582b
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Merged-In: I45b7898da440c36045aec64a0a86fb804116cd9d
Merged-In: Ie00bdce2fad429f2ed343e1d7aea4967bcaddf5a
Change-Id: Idb765be594a55e9f26bf378656d6b18c8f3e37c0
 2022-11-22 11:52:05 +00:00
Bonian Chen
0a733a9ed9 Merge "[Settings] configuration for hidding SIM settings UI" am: 769d773997 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299468

Change-Id: I4950a96f8637c06eadcf9f1248dc56b129dfca36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:19:15 +00:00
Bonian Chen
68a039754a Merge "[Settings] configuration for hidding SIM remove UI" am: 889c81f77a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299467

Change-Id: I1b3e4fc3208e4476e81030319cec4b5705190c52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:19:14 +00:00
Bonian Chen
e1d5ccf789 [automerger skipped] Merge "[Settings] configuration for hidding SIM notification UI" am: 56ff3fd99a -s ours 
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

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

Change-Id: I4fe15b89021796089a625b3474dec0de68302e8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:19:12 +00:00
Bonian Chen
933dbbd5a4 [automerger skipped] [Settings] configuration for hidding SIM notification UI am: 5c595b3789 -s ours 
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

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

Change-Id: Ib9c1e811a17bc7923467b6f0c846aac7c6e804fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:19:11 +00:00
Bonian Chen
f901e617c1 Merge "[Settings] configuration for hidding SIM provider UI" am: f7ec7e66c4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299465

Change-Id: Ibd2bc810f356beb375870fecafd73116ed0b5593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:19:09 +00:00
Bonian Chen
5104a1bee0 [automerger skipped] Merge "[Settings] configuration for hidding SIM related UI" am: d40fd7c597 -s ours 
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423 is already in history

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

Change-Id: Id886c8f56c33571dcfca29741d50e248babe8218
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:19:08 +00:00
Bonian Chen
5b9e71b0c5 [automerger skipped] [Settings] configuration for hidding SIM related UI am: 7dc161dcc8 -s ours 
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423 is already in history

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

Change-Id: I39b6582327344a55219b960285add58422f69ca3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:19:06 +00:00
Bonian Chen
2a98e2a4fe Merge "[Settings] configuration for hidding SIM lock UI" am: 1ab73b934b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299463

Change-Id: If39c1f00449571d803eeeff89bb69ff2a789382c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:18:59 +00:00
Bonian Chen
769d773997 Merge "[Settings] configuration for hidding SIM settings UI" 2022-11-22 08:51:53 +00:00
Bonian Chen
889c81f77a Merge "[Settings] configuration for hidding SIM remove UI" 2022-11-22 08:51:53 +00:00
Bonian Chen
56ff3fd99a Merge "[Settings] configuration for hidding SIM notification UI" 2022-11-22 08:51:53 +00:00
Bonian Chen
f7ec7e66c4 Merge "[Settings] configuration for hidding SIM provider UI" 2022-11-22 08:51:53 +00:00
Bonian Chen
d40fd7c597 Merge "[Settings] configuration for hidding SIM related UI" 2022-11-22 08:51:53 +00:00
Bonian Chen
1ab73b934b Merge "[Settings] configuration for hidding SIM lock UI" 2022-11-22 08:51:53 +00:00
Bonian Chen
f6d9536922 Merge "[Settings] Code Refactor" am: 8ae657bd80 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308620

Change-Id: I4efad57d509e79938a5558f09b6154d898504b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-21 10:11:28 +00:00
Bonian Chen
8ae657bd80 Merge "[Settings] Code Refactor" 2022-11-21 09:32:30 +00:00
Bonian Chen
c3028291ed [Settings] Code Refactor 
Adjust code structure for maintainance.

Bug: 259611847
Test: auto test
Change-Id: I1fab8d0347f64c01ee768e4bb9ea838a9e7ad4fc
 2022-11-19 13:14:07 +00:00
Sandeep Jawalkar
38d97f7882 Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" am: 5a34a5b3de 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2301705

Change-Id: I66171e26c9b3dd44db9206dc15c286d0d404d54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-18 12:58:56 +00:00
Sandeep Jawalkar
5a34a5b3de Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" 2022-11-18 12:32:01 +00:00
Bonian Chen
c31caafb5a Merge "[Settings] Code Refactor" am: bafd49d604 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308239

Change-Id: Iad870d2df6f9ecb2ff207b8753288da6446e218a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-18 12:06:39 +00:00
Bonian Chen
bafd49d604 Merge "[Settings] Code Refactor" 2022-11-18 11:46:43 +00:00
Bonian Chen
e1f641a130 [Settings] Code Refactor 
Adjust code structure for maintainance.

Bug: 259611847
Test: auto test
Change-Id: I6710aa814441c0858c712f416ffddde44081d4d1
 2022-11-18 08:36:53 +00:00
Bonian Chen
7dc161dcc8 [Settings] configuration for hidding SIM related UI 
Add overriable configuration for hidding SIM related UI.

Bug: 240515161
Test: test cases and local testing
Merged-In: I03d17beac0fb85a3d17acd7d0d581feb35e9582b
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Merged-In: I45b7898da440c36045aec64a0a86fb804116cd9d
Merged-In: Ie00bdce2fad429f2ed343e1d7aea4967bcaddf5a
Change-Id: Id5ea14ca888f0cfc6ed5a7df3f77a8176232ef4f
 2022-11-17 09:01:09 +00:00
TreeHugger Robot
2904ea9410 Merge "[Settings] Fix merge confliction" into stage-aosp-master 2022-11-16 13:42:53 +00:00
Treehugger Robot
425521478a Merge "Make p2p start searching after turning off airplane mode." am: adb5c5025a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267183

Change-Id: Idb18ef0319f4a36e49cc01f9d9fced1918d12096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 09:08:59 +00:00
Treehugger Robot
adb5c5025a Merge "Make p2p start searching after turning off airplane mode." 2022-11-16 08:23:44 +00:00
Bonian Chen
5c595b3789 [Settings] configuration for hidding SIM notification UI 
Hide SIM notification UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: I07d9ddeb96ca590decf28126ce97fba4c1783304
Merged-In: I7a912a3393694155d29614d325796e08598985bf
Merged-In: I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f
Change-Id: I1b88f0f70f1b7487163849abfce93dbbc35c9ff9
 2022-11-16 08:09:37 +00:00
Bonian Chen
20bcb7c5fb [Settings] Fix merge confliction 
Follow code reviewer's suggestion to further split the code.

Bug: 259333639
Test: build pass
Change-Id: I40ee5f92dbb4550fec7e9bea108c30a2e5a0f770
 2022-11-16 07:57:37 +00:00
Yu
0aed038b0a Make p2p start searching after turning off airplane mode. 
In the P2P page, p2p stops searching when airplane mode is turned on, and should start searching when airplane mode is turned off.

Bug: 255249207
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest

Signed-off-by: Yu <zhangyu34@xiaomi.com>
Change-Id: I71d5eb6c3d8533417e8ae9ac09e7fac73983644e
 2022-11-16 12:19:23 +08:00
sandeepjs
e69ab6cb77 [Android U][eSIM] Modify esim and sim card strings as part of esim primary 
As part of esim primary, esim and sim card related strings are changed for AndroidSettings project with reference from https://docs.google.com/spreadsheets/d/1RPVnNvmcjd-NSvPGg1jOi0mdC-sbCHvt9HVU4glV8fs/edit#gid=1716745126

Test: build
Bug: 257380320
Change-Id: I984d56e724dbd906e48358a31c6a7cb1e5db4fdf
Merged-In: I984d56e724dbd906e48358a31c6a7cb1e5db4fdf
 2022-11-15 11:11:50 +00:00
Treehugger Robot
73c0f408a4 Merge "Update owner for Settings project" am: 20a3f8f9e8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2291755

Change-Id: I083eb43c64d81ebc75e33e0abf0fe8d063be1425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 06:22:14 +00:00
Treehugger Robot
20a3f8f9e8 Merge "Update owner for Settings project" 2022-11-15 05:43:00 +00:00
Bonian Chen
f2838421df [Settings] configuration for hidding SIM lock UI 
Hide SIM lock UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: I870c0b53112db56b7bc80bfd585f6f7b3cf82737
Change-Id: I70be07dbc1decb5cb8eff384d4cb8bea355ab99d
 2022-11-14 12:00:06 +00:00
Bonian Chen
3be07f0e15 [Settings] configuration for hidding SIM settings UI 
Hide SIM settings UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Change-Id: I3d6ecec1465189429f2a3ea026d15e23357d0832
 2022-11-14 10:24:43 +00:00
Bonian Chen
e1a0637c3a [Settings] configuration for hidding SIM remove UI 
Hide SIM remove UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: Iea40b89733cc75a41f960fecb2ac24177a4cbd3d
Change-Id: I8f0c1d53c4fe6e30280f2b7ae8f694cd27056e36
 2022-11-14 10:19:27 +00:00
Bonian Chen
0e03586dda [Settings] configuration for hidding SIM provider UI 
Hide SIM provider UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b
Change-Id: Ibe22c3ba377a15f770622d235ebddc63b4bf3ed6
 2022-11-14 10:06:48 +00:00
Treehugger Robot
0ecb9e76fe Merge "Fix potential crash in AppAllServicesPreferenceController" am: ccfa7fa918 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2296917

Change-Id: I7477f18dc0e0a0aea9adf8e996171210dc194ed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 11:48:15 +00:00
Treehugger Robot
ccfa7fa918 Merge "Fix potential crash in AppAllServicesPreferenceController" 2022-11-11 11:10:12 +00:00
Shen Lin
e8a0ba688b Fix potential crash in AppAllServicesPreferenceController 
This CL contains two fixes:

- Fix potentialcrash when calling getAvailabilityStatus, we should use
  the latest packageName to decide.

- Add test class

Bug: 258270151
Test: atest
Change-Id: I3e6aa7e0773a73d2e3dfa996e42087f3ec80627b
 2022-11-10 10:18:14 +08:00
Tsung-Mao Fang
41ced13ca4 Update owner for Settings project 
Test: N/A
Change-Id: I34245a8cb17f5d2dff635d6c8a7c089330f1a8a5
 2022-11-09 10:24:52 +00:00
Treehugger Robot
170a632a66 Merge "Align main thread checking by calling ThreadUtils" am: 48c386e54c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2276131

Change-Id: Iaa6e62832270441010d07fcc23f01149229f6e7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-09 05:39:03 +00:00
Treehugger Robot
48c386e54c Merge "Align main thread checking by calling ThreadUtils" 2022-11-09 05:13:53 +00:00
Shen Lin
ce0e8b9a4b Align main thread checking by calling ThreadUtils 
Since ThreadUtils encapsules method to ensure main thread, it is
suggested to call this method rather than maintaining our copy.

Bug: 258270052
Test: atest and manual.
Change-Id: I4c5fcdd6e5bcc7d1d08f526eedb3aa123926d8a1
 2022-11-09 11:43:03 +08:00
Gil Cukierman
27217b87a9 Merge "Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController" am: 08d03390ae 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229917

Change-Id: I17e4dc0b5dfdfd55a866b641af560b4dccba1296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 14:21:52 +00:00
Gil Cukierman
08d03390ae Merge "Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController" 2022-11-01 13:51:58 +00:00