PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
141,386 Commits 1 Branch 0 Tags
25e1b4d88b6f7cc7b37d46e3b1f7054418f5ff7f
Commit Graph

141386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tetiana Meronyk
25e1b4d88b Show disabled add actions in COPE mode 
Before this change these actions were hidden.

After this change, they are displayed but disabled which makes it more intuitive.

Bug: 336762423
Test: atest UserSettingsTest && atest UserDetailsSettingsTest
Flag: android.multiuser.new_multiuser_settings_ux
Change-Id: Ie07816b7d3817d12e78e1ec2692fcddea9328933
 2024-06-24 21:28:57 +00:00
Tetiana Meronyk
0f311e1195 Add handling of admin enforced restrictions in Users Settings 
Before, when the restrictions were applied, the preferences that were restricted were hidden.

After this change, if admin applies a restriction, the preference is displayed as disabled and Policy Transparency Dialog is displayed

Bug: 338226475
Test: atest UserSettingsTest && atest UserDetailsSettingsTest
Flag: android.multiuser.new_multiuser_settings_ux
Change-Id: I1b5aeeeec7accde278ff3e46ea3d64c91d8400db
 2024-06-24 20:22:16 +00:00
Tetiana Meronyk
caef61b5eb Refactor multiuser toggle to control user switch feature 
The  name  "Allow multiple users" is too ambiguous. It sounds like by toggling it off, the feature is completely disabled. In fact, it only hides user switcher. In conjunction with hiding other users from the list, it makes it appear as all the users get deleted when the toggle is off. On the contrary, users might be running in background when the toggle is off.

After this change, the new name better represents the intention behind this toggle, as well as makes the UI more intuitive. The users are not being hidden anymore. But switching preference gets disabled.

Since the toggle can only be enabled or disabled by owner (after this refactoring), it means that Owner has full control over multiuser settings and is able to perform actions on users without having to enable the toggle.

Bug: 336762423
Test: atest UserSettingsTest && atest UserDetailsSettingsTest
Flag: android.multiuser.new_multiuser_settings_ux
Change-Id: Id9d507039b58d3df66fe78710409716fd4816890
 2024-06-24 18:58:01 +00:00
Chelsea Hao
3cac411486 Merge changes I9036e560,Ieb735d39,Ia78b1fe1,I91d9a45a into main 
* changes:
  [Audiosharing] Created test for the name and password preferences.
  [Audiosharing] Created test for the main controller.
  [Audiosharing] Listen to `onProfileConnectionStateChanged` of LE_AUDIO_BROADCAST_ASSISTANT to be more precise on device connection status upon bluetooth on/off. Also increase test coverage.
  [Audiosharing] Increase test coverage for audio stream states.
 2024-06-24 08:02:55 +00:00
chelseahao
4afef7eed1 [Audiosharing] Created test for the name and password preferences. 
Test: atest -c com.android.settings.connecteddevice.audiosharing
Flag: com.android.settingslib.flags.enable_le_audio_qr_code_private_broadcast_sharing
Bug: 345686602
Change-Id: I9036e560e29aba9555c207dce1b2018be010bca8
 2024-06-24 14:36:08 +08:00
Chaohui Wang
0bd8a5d232 Merge "Use wifiCallingReadyFlow in WifiCallingSettingsForSub" into main 2024-06-24 02:09:16 +00:00
Chaohui Wang
f1d17b00ce [automerger skipped] Use old getSelectableSubscriptionInfoList am: f1b3c2b9c9 -s ours 
am skip reason: Merged-In I06b6c61304f9e6c9515b5f989294417ac3f82a60 with SHA-1 ec8ce02ba4 is already in history

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

Change-Id: Ib44a6e7a9703ec1b05219306da424814a7796b22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 01:34:32 +00:00
Ioana Alexandru
b67c157e2f Merge "Move ZenModesBackend to SettingsLib." into main 2024-06-21 16:50:27 +00:00
Chaohui Wang
4d8c8faa9e Merge "Clean up unused fields from MobileNetworkRepository" into main 2024-06-21 13:25:46 +00:00
Ioana Alexandru
b1dad7d5b4 Move ZenModesBackend to SettingsLib. 
This will allow us to access it from SystemUI.

Bug: 346519570
Test: builds
Flag: EXEMPT trivial refactor
Change-Id: I5bc480bd4eb0cbf8a26989dd11c064e66e5ee70e
 2024-06-21 15:19:11 +02:00
Julia Reynolds
92024e1afc Merge "Migrate Settings intents" into main 2024-06-21 13:06:10 +00:00
Chaohui Wang
84c49b9fe6 Merge changes from topic "RoamingPreferenceController" into main 
* changes:
  Fix crash in RoamingPreferenceController
  New CarrierConfigRepository
 2024-06-21 08:55:56 +00:00
Chaohui Wang
562f56bb7a Use wifiCallingReadyFlow in WifiCallingSettingsForSub 
Simply and unify the logic, and fixed a crash.

Fix: 348372605
Flag: EXEMPT bug fix
Test: manual on Wi-Fi calling
Change-Id: Idc7dff934323fbebb09137bbd0585575e65a7867
 2024-06-21 16:53:38 +08:00
YK Hung
0a2d60a9c5 Merge "Update the database filename and the version number as the same time" into main 2024-06-21 08:38:19 +00:00
YK Hung
871b2b7a85 Update the database filename and the version number as the same time 
Fix: 348156270
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Flag: EXEMPT bug fix
Change-Id: I26d7e1bf0d1766374359b6c6f12e96d78726ed85
 2024-06-21 07:12:46 +00:00
chelseahao
e0abdc5c7a [Audiosharing] Created test for the main controller. 
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Flag: com.android.settingslib.flags.enable_le_audio_qr_code_private_broadcast_sharing
Bug: 345686602
Change-Id: Ieb735d392607c131c213be90cd72c4b7a9ed958d
 2024-06-21 14:34:39 +08:00
chelseahao
44a0b59ad2 [Audiosharing] Listen to onProfileConnectionStateChanged of LE_AUDIO_BROADCAST_ASSISTANT to be more precise on device connection status upon bluetooth on/off. Also increase test coverage. 
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Flag: com.android.settingslib.flags.enable_le_audio_qr_code_private_broadcast_sharing
Bug: 345686602
Change-Id: Ia78b1fe19bff3cb179794db1dc09374db13818d8
 2024-06-21 14:14:45 +08:00
Edgar Wang
a1acf685d0 Change the text of the search bar in Homepage screen 
Bug: 348069291
Change-Id: I35771e9a347715819e65e0d86f1cd38eaa5618ae
Test: visual
Flag: com.android.settings.flags.homepage_revamp
 2024-06-21 04:51:11 +00:00
Chaohui Wang
cfd401b04e Fix crash in RoamingPreferenceController 
With new MobileDataRepository.isDataRoamingEnabledFlow() to provide
the data instead of MobileNetworkRepository.

Fix: 347224962
Flag: EXEMPT bug fix
Test: manual on Mobile Settings
Test: unit test
Change-Id: I2a994cb11c93296fb46558f566d6d4467ba4c846
 2024-06-21 04:39:44 +00:00
Chaohui Wang
ef12f1ddb5 New CarrierConfigRepository 
Benefices,
- Gets the configuration values of the specified keys, for better
  performance
- Check key suffix for correctness
- Support cache
- If CarrierConfigManager throw exception, use default value

Bug: 337417520
Flag: EXEMPT refactor
Test: manual on Sim Status
Test: unit
Change-Id: I68f41ef66d495080f628794ade63cf807efba619
 2024-06-21 04:39:24 +00:00
Edgar Wang
1430348455 Merge "[Homepage revamp] Adjust the padding of Search bar in the homepage container." into main 2024-06-21 03:53:27 +00:00
Chris Antol
253f1ad392 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev am: fce0c57c01 -s ours am: 0b4c1120ef -s ours am: cd0dbf0048 -s ours am: fcc9252a67 -s ours am: e7cf908cb4 -s ours am: 1dcd330a0c -s ours am: cabba8bdb7 -s ours am: 13a3cbda4c -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

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

Change-Id: I32a357cb673b3b16976fe60ced4c1b32541ee032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:50:31 +00:00
Chris Antol
5eb8525951 [automerger skipped] Ignore fragment attr from ext authenticator resource am: abf11e7350 -s ours am: 2d4f02e360 -s ours am: c66ea394a4 -s ours am: bb9e14f93d -s ours am: 7ebdef372b -s ours am: aef507959d -s ours am: 541d30726d -s ours am: 526993a145 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

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

Change-Id: I3f66745160ec79199e0047d219ec1e643c35296f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:50:26 +00:00
Automerger Merge Worker
e2c6984b56 [automerger skipped] Merge changes from topic "am-beae6d45c4f54e539026901c293ffe26" into udc-dev am: 6faee05799 -s ours am: c44af23307 -s ours am: b1608c3288 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 8607f3a34e is already in history

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

Change-Id: I2a2725bd951bf65a987179506e82fe79d167adda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:50:08 +00:00
Chris Antol
532b71b3a6 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev am: 0c15f71ece -s ours am: b14a76b7f8 -s ours am: 43dd6d2c82 -s ours am: 332aca2baa -s ours am: ef3b4ee860 -s ours am: 5255f8f343 -s ours am: dd0f1fb5fd -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 24e2f2d2f6 is already in history

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

Change-Id: I61e9f9eb4c7dfb2ab142da8e9fcb79f292f1eb65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:50:03 +00:00
Automerger Merge Worker
5809a84780 [automerger skipped] Merge changes from topic "am-7c932fc208fa4104bc73a89be5614517" into udc-dev am: 167fa8f063 -s ours am: f0025ba095 -s ours am: 512aad713b -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 8607f3a34e is already in history

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

Change-Id: I7fed0a02c2f27dcb765a980cc92c989388f8b999
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:49:45 +00:00
Chris Antol
1c0c350edc [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev am: fce0c57c01 -s ours am: 0b4c1120ef -s ours am: cd0dbf0048 -s ours am: ef1fb71944 -s ours am: 678597cc3d -s ours am: 9b1dd5f839 -s ours am: d2d57524e7 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

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

Change-Id: If5da3f13fd9a69eb2e18343eaa180d12e57ec81c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:49:41 +00:00
Automerger Merge Worker
acadafd87b [automerger skipped] Merge changes from topic "am-bc0f5b1e049c4551981e48bace3fae31" into udc-dev am: 15b34f0425 -s ours am: ae378da8f0 -s ours am: 6d68ad5514 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 8607f3a34e is already in history

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

Change-Id: I7b5d72fa73c1be7d51933f5b3b8b10cd128f5577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:49:24 +00:00
Chris Antol
b6f811c5d8 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -s ours am: dd1692a16d -s ours am: ee9775b8f7 -s ours am: ea8267d642 -s ours am: e2219ba0a0 -s ours am: 32fc2b135e -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11 is already in history

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

Change-Id: I331c48f291b42efcaf8b0d050622e93de810740f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:49:19 +00:00
Chris Antol
dc2a86c49f [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev am: 0c15f71ece -s ours am: b14a76b7f8 -s ours am: ce34a63260 -s ours am: f7ab988622 -s ours am: 71a631458e -s ours am: 365bf0fb25 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 24e2f2d2f6 is already in history

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

Change-Id: I4b23d1c98e54a73fbe60ff79b17fa92e0c8d15e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:48:56 +00:00
Chris Antol
4ba7311af8 [automerger skipped] Ignore fragment attr from ext authenticator resource am: e2dc98c21d -s ours am: c2f70df823 -s ours am: 8b8a307671 -s ours am: 769aa43a24 -s ours am: f6d812a155 -s ours am: 7e7b8e10b7 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 24e2f2d2f6 is already in history

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

Change-Id: Ia32d47256e9ba4c08801333f373eeda3f6156174
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:48:51 +00:00
Chris Antol
f2a2145054 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3 am: 6b5d026668 am: 7a2e7aac88 am: 383cbae5a3 -s ours am: 3770cefc65 -s ours am: 648e47b1ef -s ours am: 47995251b2 -s ours am: 3c2cc2c2ae -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 f5e9b0167a is already in history

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

Change-Id: I1a0588e6a29e9a1318fcdf08e2d4fb7bc7cb6d04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:48:35 +00:00
Chris Antol
eac9496f1a [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev am: fce0c57c01 -s ours am: 0b4c1120ef -s ours am: cd0dbf0048 -s ours am: fcc9252a67 -s ours am: e7cf908cb4 -s ours am: 1dcd330a0c -s ours am: 18e3269fb3 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

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

Change-Id: I0dcff24db7c2214d2939c059caef20719081f9fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:27:10 +00:00
Chris Antol
bf23de3065 [automerger skipped] Ignore fragment attr from ext authenticator resource am: abf11e7350 -s ours am: 2d4f02e360 -s ours am: c66ea394a4 -s ours am: bb9e14f93d -s ours am: 7ebdef372b -s ours am: aef507959d -s ours am: 9c3fe2a469 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

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

Change-Id: If48f8a26afaee48d5ebca510c41f7aec2aa02b79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:27:05 +00:00
Chris Antol
13a3cbda4c [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev am: fce0c57c01 -s ours am: 0b4c1120ef -s ours am: cd0dbf0048 -s ours am: fcc9252a67 -s ours am: e7cf908cb4 -s ours am: 1dcd330a0c -s ours am: cabba8bdb7 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

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

Change-Id: Ie1c6aa26f5ff4f02c146eb200edc2ca5cd5ed0ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:26:58 +00:00
Chris Antol
526993a145 [automerger skipped] Ignore fragment attr from ext authenticator resource am: abf11e7350 -s ours am: 2d4f02e360 -s ours am: c66ea394a4 -s ours am: bb9e14f93d -s ours am: 7ebdef372b -s ours am: aef507959d -s ours am: 541d30726d -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

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

Change-Id: Icd34061f0a82b103d178e968fff149373d70a5ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:26:54 +00:00
Automerger Merge Worker
4b7a00d0b0 [automerger skipped] Merge changes from topic "am-beae6d45c4f54e539026901c293ffe26" into udc-dev am: 6faee05799 -s ours am: 9361bd6a0e -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 8607f3a34e is already in history

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

Change-Id: Iaa79fce4a82aadb2441eb9c099e70c72ef35b57f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:26:51 +00:00
Chris Antol
b1280ffac7 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev am: 0c15f71ece -s ours am: b14a76b7f8 -s ours am: 43dd6d2c82 -s ours am: 332aca2baa -s ours am: ef3b4ee860 -s ours am: 250dc8af34 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 24e2f2d2f6 is already in history

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

Change-Id: Iac5dc4a8f55682aad95d03c8dbf02e770b56cc07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:26:48 +00:00
Automerger Merge Worker
b1608c3288 [automerger skipped] Merge changes from topic "am-beae6d45c4f54e539026901c293ffe26" into udc-dev am: 6faee05799 -s ours am: c44af23307 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 8607f3a34e is already in history

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

Change-Id: If17860f4b29822f64eee8b90e1aff6835800b5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:26:42 +00:00
Chris Antol
dd0f1fb5fd [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev am: 0c15f71ece -s ours am: b14a76b7f8 -s ours am: 43dd6d2c82 -s ours am: 332aca2baa -s ours am: ef3b4ee860 -s ours am: 5255f8f343 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 24e2f2d2f6 is already in history

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

Change-Id: I9d33f01babfa89b26415ce91cac489288d10e373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:26:38 +00:00
Automerger Merge Worker
5f70b90713 [automerger skipped] Merge changes from topic "am-7c932fc208fa4104bc73a89be5614517" into udc-dev am: 167fa8f063 -s ours am: 680966d059 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 8607f3a34e is already in history

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

Change-Id: I986c3e427e7126e51cfeff46e258cfddce455fdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:26:26 +00:00
Automerger Merge Worker
512aad713b [automerger skipped] Merge changes from topic "am-7c932fc208fa4104bc73a89be5614517" into udc-dev am: 167fa8f063 -s ours am: f0025ba095 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 8607f3a34e is already in history

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

Change-Id: Ia825cf7bb5f9396317e02e448d2e836aea571e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:26:22 +00:00
Chris Antol
2b28e64113 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev am: fce0c57c01 -s ours am: 0b4c1120ef -s ours am: cd0dbf0048 -s ours am: ef1fb71944 -s ours am: 678597cc3d -s ours am: d8b48a7f32 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

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

Change-Id: Ib8a0ffb3d5580a9a9973948775b0a39b3a56b710
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:26:22 +00:00
Chris Antol
d2d57524e7 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev am: fce0c57c01 -s ours am: 0b4c1120ef -s ours am: cd0dbf0048 -s ours am: ef1fb71944 -s ours am: 678597cc3d -s ours am: 9b1dd5f839 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

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

Change-Id: Ia17aa277a3861fa307f888ba3475ec2f12d8715e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:26:19 +00:00
Automerger Merge Worker
4e97076c64 [automerger skipped] Merge changes from topic "am-bc0f5b1e049c4551981e48bace3fae31" into udc-dev am: 15b34f0425 -s ours am: 5d048acdf2 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 8607f3a34e is already in history

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

Change-Id: I18029c1eaa418970d8d51227061e5d6b29125445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:26:05 +00:00
Automerger Merge Worker
6d68ad5514 [automerger skipped] Merge changes from topic "am-bc0f5b1e049c4551981e48bace3fae31" into udc-dev am: 15b34f0425 -s ours am: ae378da8f0 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 8607f3a34e is already in history

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

Change-Id: I6d464a45b66d0e2fc69f85e7e0f2ea1cfe333afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:26:01 +00:00
Chris Antol
52af79c1ef [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -s ours am: dd1692a16d -s ours am: ee9775b8f7 -s ours am: ea8267d642 -s ours am: 6339f6d0bf -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11 is already in history

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

Change-Id: I5ecd77da840e85536ce2615905fef28a203bafb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:26:01 +00:00
Chris Antol
32fc2b135e [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -s ours am: dd1692a16d -s ours am: ee9775b8f7 -s ours am: ea8267d642 -s ours am: e2219ba0a0 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11 is already in history

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

Change-Id: Idb2003ef281eeee57bf408f2eec90f0810882467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:25:58 +00:00
Chris Antol
365bf0fb25 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev am: 0c15f71ece -s ours am: b14a76b7f8 -s ours am: ce34a63260 -s ours am: f7ab988622 -s ours am: 71a631458e -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 24e2f2d2f6 is already in history

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

Change-Id: If659c296997ce924e816d1f7cca678e1163df012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:25:40 +00:00
Chris Antol
7e7b8e10b7 [automerger skipped] Ignore fragment attr from ext authenticator resource am: e2dc98c21d -s ours am: c2f70df823 -s ours am: 8b8a307671 -s ours am: 769aa43a24 -s ours am: f6d812a155 -s ours 
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 24e2f2d2f6 is already in history

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

Change-Id: I1512f0b8b6e40e7440aba2481cc23eb86db5bbae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 03:25:37 +00:00