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

110794 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
ebb7230ac0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c9a4f35a74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff72643cc11108efead021f3de564dc3a4121f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 20:14:30 +00:00
TreeHugger Robot
8dab2de988 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 43e8a4480b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74a45513f5c9392c3faf45e1c474e74c6b7f6767
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 20:14:14 +00:00
Bill Yi
573755927f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebc354ab68 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10c725ab05a8ae996cfc11d24b241e5dc8ae99aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 20:13:55 +00:00
TreeHugger Robot
43e8a4480b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-23 19:38:40 +00:00
Bonian Chen
724dfbda22 Merge "[Settings] Add some log" am: 190b9ae3fa am: cd59cb983e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313405

Change-Id: Ieb35b981079c558937f73ec3779018a1deaa56b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 16:27:42 +00:00
Bonian Chen
cd59cb983e Merge "[Settings] Add some log" am: 190b9ae3fa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313405

Change-Id: I79999bda10e0be0df44fc73d8023e7f35d9f2730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 15:59:17 +00:00
Bonian Chen
190b9ae3fa Merge "[Settings] Add some log" 2022-11-23 15:15:47 +00:00
Bonian Chen
c2776e0e67 [Settings] Add some log 
Add log to support debugging.

Bug: 259611847
Test: auto test
Change-Id: Ic7ea410604794e3b9caa8ab955e1406578a25425
 2022-11-23 12:36:17 +00:00
TreeHugger Robot
2d6e3bb5a7 Merge "Remove isSticky true for SplitPlaceholderRule" into tm-qpr-dev am: fa6f92aa74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20549489

Change-Id: I8cc3a1d353b86fbf84e40f1d4932955c9a72aa42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 09:58:15 +00:00
TreeHugger Robot
fa6f92aa74 Merge "Remove isSticky true for SplitPlaceholderRule" into tm-qpr-dev 2022-11-23 09:19:27 +00:00
Bonian Chen
743baac904 [automerger skipped] Merge "[Settings] Additional route for dismiss activity dialog" am: ea537afa54 -s ours am: d38d75bc0c -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/+/2311476

Change-Id: I27cc4bb4ae1175a400e7943759411793c2584b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 07:57:33 +00:00
Bonian Chen
4218f2defd [automerger skipped] [Settings] Additional route for dismiss activity dialog am: 68c294df24 -s ours am: 32884e3e97 -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/+/2311476

Change-Id: I329962649039fed9936a353b52f24eed0bd6d538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 07:57:31 +00:00
Bonian Chen
d38d75bc0c [automerger skipped] Merge "[Settings] Additional route for dismiss activity dialog" am: ea537afa54 -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/+/2311476

Change-Id: I9b43b0167ce54a8d41dc34850535708eaa60f859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 07:29:09 +00:00
Bonian Chen
32884e3e97 [automerger skipped] [Settings] Additional route for dismiss activity dialog am: 68c294df24 -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/+/2311476

Change-Id: I2286c88e39b0111bf804fb64d658ba6ea064224a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 07:29:07 +00:00
Bonian Chen
ea537afa54 Merge "[Settings] Additional route for dismiss activity dialog" 2022-11-23 07:02:20 +00:00
Arc Wang
f6d712c7b7 Remove isSticky true for SplitPlaceholderRule 
SplitPlaceholderRule#isSticky determines whether the placeholder
will show on top in a smaller window size after it first appeared
in a split with sufficient minimum width.

This change will show Settings homepage while users rotate
device to portrait mode and show Settings 1-pane UI.

Bug: 256115335
Test: manual visual
      1. Set font size and display size to large.
      2. Launch Setting app in landscape and rotate to portrait.
Change-Id: Ie955f8b8db3bbe42dba6300608774582ef150590
 2022-11-23 14:44:53 +08:00
YK Hung
7336fbfcc8 [automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 3836a8a8de -s ours am: ab48f9ba47 -s ours 
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

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

Change-Id: I0b3a6d8f77a24cc8536503e1f1bedbb35ad54130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 03:00:26 +00:00
Cole Faust
a5572aff15 [automerger skipped] Fix errorprone warnings that should be errors am: 37cfdc7536 -s ours am: a0dd446e61 -s ours 
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

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

Change-Id: Ie609432ec4075f105f4a89b0702d03d78ef9db17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 03:00:18 +00:00
YK Hung
ab48f9ba47 [automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 3836a8a8de -s ours 
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

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

Change-Id: I1c3342037844ada6a10e6b822940d0541ec4ce19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 02:32:00 +00:00
Cole Faust
a0dd446e61 [automerger skipped] Fix errorprone warnings that should be errors am: 37cfdc7536 -s ours 
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

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

Change-Id: I8b1ab784d4aca65eec06c6bf80817c9d043f0acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 02:31:59 +00:00
YK Hung
3836a8a8de Merge "Fix errorprone warnings that should be errors" 2022-11-23 02:07:10 +00:00
Bill Yi
c9a4f35a74 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9d5dceeb79a553eace466c50494f0e670bcbf28a
 2022-11-22 15:59:54 -08:00
Bill Yi
ebc354ab68 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib53e903156f20220886651eca3ee1b7958cce2cc
 2022-11-22 15:53:52 -08:00
Steve Elliott
81fc1b0b4d Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev am: fece948623 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20530303

Change-Id: I9cd33ea6d02cf1243034a399162dfffcd0fd8f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 23:05:49 +00:00
Steve Elliott
fece948623 Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev 2022-11-22 22:50:10 +00:00
Hao Dong
a538195c3c Merge "Use the internal max faces number to check enrolled." into tm-qpr-dev am: a01a1857ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20518779

Change-Id: Id63f4f017a8e2af8ceb03dfbb2f662026839b9eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 17:46:29 +00:00
Hao Dong
a01a1857ec Merge "Use the internal max faces number to check enrolled." into tm-qpr-dev 2022-11-22 17:10:49 +00:00
Bonian Chen
68c294df24 [Settings] Additional route for dismiss activity dialog 
Previous design dismiss an activity dialog through Intent would lead to a pair of creating and finishing activity. The task switch during the creating and finishing may introduce some side effect to the other apps.

This change tried to add additional route to avoid from dismiss through Intent
but sending an async close request to that specific dialog (if available).

Bug: 236956105
Test: local, auto testing
Merged-In: I7a912a3393694155d29614d325796e08598985bf
Merged-In: I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f
Change-Id: I88a6c0632c1be906b310a10c154149c319d34759
 2022-11-22 16:04:40 +00:00
Bonian Chen
8f936c0bdb Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA" am: 5125477d7b am: d33fbde071 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310159

Change-Id: Idc1ee6fcf8fc403ed9592adf34417ebe2b15b7da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 14:28:07 +00:00
Bonian Chen
4e1a1e65b9 Revert "[Settings] configuration for hidding SIM settings UI" am: 8e98f5a852 am: e4fbf9d941 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310157

Change-Id: I1bcbe2f57013ace3641937897ae2d0d8b64e2f76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 14:28:05 +00:00
Bonian Chen
52bae42964 Revert "[Settings] configuration for hidding SIM lock UI" am: ead8a35720 am: 2decf2ae45 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310156

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

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

Change-Id: I68206f2dce0bd4b5bee117ad4f056dd1d9d05e17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 14:27:56 +00:00
Bonian Chen
d33fbde071 Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA" am: 5125477d7b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310159

Change-Id: Ic919498fda4172ede68fcd431b8bdd18056fada6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 14:08:33 +00:00
Bonian Chen
e4fbf9d941 Revert "[Settings] configuration for hidding SIM settings UI" am: 8e98f5a852 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310157

Change-Id: I76eae77bcd825e7fa5fbc12b46eb72a7f9ddfd02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 14:08:31 +00:00
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
5125477d7b Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA" 
* changes:
  Revert "[Settings] configuration for hidding SIM provider UI"
  Revert "[Settings] configuration for hidding SIM remove UI"
  Revert "[Settings] configuration for hidding SIM settings UI"
  Revert "[Settings] configuration for hidding SIM lock UI"
  Revert "[Settings] configuration for hidding SIM notification UI"
  Revert "[Settings] configuration for hidding SIM related UI"
 2022-11-22 13:15:49 +00:00
Bonian Chen
a1c1bd0f81 Revert "[Settings] configuration for hidding SIM provider 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: I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b
Change-Id: If1951dde860bb49e3ea4cd5603ed92ef18bd1f0d
 2022-11-22 11:59:26 +00:00
Bonian Chen
3b7d0d2e17 Revert "[Settings] configuration for hidding SIM remove 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: Iea40b89733cc75a41f960fecb2ac24177a4cbd3d
Change-Id: I5c52b841955f5be41ce861aca740147061fc7d3f
 2022-11-22 11:59:15 +00:00
Bonian Chen
8e98f5a852 Revert "[Settings] configuration for hidding SIM settings 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: If1df99a79e51125d03f534cdfc9408b01c61024f
Change-Id: I646d664b83d3db12cca81f53f7f5cd82a38e34d0
 2022-11-22 11:59:02 +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
135392ec6d Merge "[Settings] configuration for hidding SIM settings UI" am: 769d773997 am: 0a733a9ed9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299468

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

Change-Id: Ie6a0f43399c016fadc058e2d161f1046b8721058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:43:37 +00:00
Bonian Chen
255d36821b [automerger skipped] Merge "[Settings] configuration for hidding SIM notification UI" am: 56ff3fd99a -s ours am: e1d5ccf789 -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: I1e0cc1d7f50e26d3aa72bd129dd3ca8d16466ef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:43:36 +00:00
Bonian Chen
62360d4f2e [automerger skipped] [Settings] configuration for hidding SIM notification UI am: 5c595b3789 -s ours am: 933dbbd5a4 -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: I5961afb9592438dcea63e774da9584ab46b413bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:43:35 +00:00
Bonian Chen
3150fa819d Merge "[Settings] configuration for hidding SIM provider UI" am: f7ec7e66c4 am: f901e617c1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299465

Change-Id: Ie51d253cc9be1c313fc2fd88d875305b3fd9dd86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:43:33 +00:00
Bonian Chen
6242806577 [automerger skipped] Merge "[Settings] configuration for hidding SIM related UI" am: d40fd7c597 -s ours am: 5104a1bee0 -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: I4c37d3ad1d003f47558e5bb825dbb347d02e90c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:43:32 +00:00
Bonian Chen
32b9504f73 [automerger skipped] [Settings] configuration for hidding SIM related UI am: 7dc161dcc8 -s ours am: 5b9e71b0c5 -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: Id247dbbd5b5fad1219825861d0d528d0e8dc7074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:43:31 +00:00