PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,118 Commits 1 Branch 0 Tags
6bf5d1db1bf456dcbb87fb84b6d876e51a871ea6
Commit Graph

111118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
dd65914b73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 18675f81a0 -s ours am: 4c17586a46 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8aa471cf7f454df242286d8e4951bf1aeef3d39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:07:18 +00:00
Bill Yi
7bf3121862 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa1b476569 -s ours am: 3b0f1d48a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12ac289a86f364c0a0c81ad2a7368f27181951ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:07:09 +00:00
TreeHugger Robot
8357bf020d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3837351d59 -s ours am: f1ba850f94 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ff0f520b95598a91c593ea340fa459982142169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:06:56 +00:00
Bill Yi
5781185cfd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b6409fe37 -s ours am: 9b2202a558 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b08ec24c9cc2e96b7cf3dd218696bf0766d5dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:06:37 +00:00
TreeHugger Robot
6d4e54d3b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: cad01723c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0da07d3cf715a574292eb582d7e64babc4206057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:04:23 +00:00
Bill Yi
5999b8aadd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4889e1a48d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic99276591169529894b2562e6c5a53f64fe67de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:04:06 +00:00
TreeHugger Robot
c854e66b44 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b40d530a27 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib97e03b299b921936e53c85c7d1b4ea73e448933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:03:51 +00:00
Bill Yi
a39b3afeff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84bcd60145 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I898d56c89d898594a63dd4d3dc8cd2e824fe29df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:03:37 +00:00
TreeHugger Robot
e189d11723 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: a4eef59b36 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia7789a7547b634fb3c392b5f088d2a7dc16bee35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:02:12 +00:00
TreeHugger Robot
2487eb86dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 18675f81a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If711a5ba7c805cb898ff025288141359d44b3642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:55:14 +00:00
Bill Yi
42929a4e42 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa1b476569 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2483a5f93be4f0f55cdaeacfa635ed20a5b245a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:55:04 +00:00
TreeHugger Robot
4c17586a46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 18675f81a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I088df48f402c1217ccfc1b619d3e76038fb353a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:54:53 +00:00
TreeHugger Robot
c24151d95a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3837351d59 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82543e4ca57e2bf1d9d29f050bb884f4561b2c66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:54:49 +00:00
Bill Yi
3b0f1d48a9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa1b476569 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia586436aa44f5f458cea5fde9cc8b37e3728d551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:54:40 +00:00
Bill Yi
74ada3e8a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b6409fe37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie5e8aec31403e59ecb7ddb1be9bffca958f361d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:54:30 +00:00
TreeHugger Robot
f1ba850f94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3837351d59 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I39ff50f3c1f5b355735f5d760ba37b1a53cb1cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:54:25 +00:00
Bill Yi
9b2202a558 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b6409fe37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec8a8d2ae56e0156cb47cbbee266968739856491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:54:11 +00:00
TreeHugger Robot
18675f81a0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-06 18:47:52 +00:00
TreeHugger Robot
3837351d59 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-06 18:47:52 +00:00
TreeHugger Robot
95b4c4798d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-06-06 18:42:20 +00:00
TreeHugger Robot
059271dcc4 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-06-06 18:42:20 +00:00
TreeHugger Robot
cad01723c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-06 18:40:47 +00:00
TreeHugger Robot
b40d530a27 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-06 18:40:47 +00:00
TreeHugger Robot
a4eef59b36 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-06 18:40:23 +00:00
TreeHugger Robot
b5d5522957 Merge changes from topic "tc_change_22060420_20" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 577842dc11
  Import translations. DO NOT MERGE ANYWHERE
 2022-06-06 18:40:23 +00:00
TreeHugger Robot
23f7ff9a12 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-06 18:39:40 +00:00
TreeHugger Robot
af3abb6af7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-06 18:39:40 +00:00
Treehugger Robot
fe38e396b2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-06 18:31:02 +00:00
Treehugger Robot
c2d1ef5127 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-06 18:31:02 +00:00
Neil Fuller
579a19a793 Switch auto time setting to use APIs 
Switch auto time setting to use TimeManager APIs instead of low-level
direct settings access.

This makes the AutoTimePreferenceController approach the same as
AutoTimeZonePreferenceController. Most of the logic about what to
display and whether toggles are enabled is moved to the service.

This change has the side effect of adding support in SettingsUI for
devices with no auto time detection mechanism configured at all, i.e.
the auto time toggle will stop being shown in SettingsUI. There are no
known devices that require this currently, but it is a theoretical
possibility if config.xml is configured in particular ways.

Bug: 172891783
Test: Manual testing with different settings for "time origin
priorities" (i.e. empty, non-empty)
Test: m ROBOTEST_FILTER=com.android.settings.datetime RunSettingsRoboTests -j40

Change-Id: I4112fb51adb0d06a1dbc39a44ea109d6df899153
 2022-06-06 12:41:11 +01:00
Automerger Merge Worker
158230e28b Merge "[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: 0a5f62976c -s ours" into tm-d1-dev-plus-aosp am: 00d1058c40 -s ours am: 97612dfbc0 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 8d749c55f4 is already in history

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

Change-Id: Ide00c7f62efa9b49bfc5aa0a20197aee6b6e34a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 10:06:23 +00:00
Raphael Kim
ef19c59810 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: 0a5f62976c -s ours am: 16fe784189 -s ours am: 4128586614 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: I3461c943fe89617f76d49c32ca4bb07925e0286f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 10:06:20 +00:00
Raphael Kim
ca9395769b [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: cf9516b716 -s ours am: 6293ac5d63 -s ours am: b8e8783b2c -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: Iead4fc7074f7783b67fd43ad7d5fb8bac5b4694f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 10:04:30 +00:00
Raphael Kim
340e235078 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: 0a5f62976c -s ours am: a3b0938595 -s ours am: 24d08998f9 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: Ia9dd75ed2c535ddef764ff637c79f1e3f5b3e991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 10:03:36 +00:00
Avinash Vadlamudi
5bf8cd7a09 Rename method for better readability 
- Rename encircle to encircleUserIcon for proper readability

Bug: 231592331
Test: build, manual check
Change-Id: If9e829372834d8a5f43e4cce358e8c0975fa30eb
(cherry picked from commit 1b7e411315)
 2022-06-06 10:03:05 +00:00
SongFerngWang
64430ba2d2 Unable to enable the removable esim 
When the user enable the removable esim, the settings select wrong
slot(esim slot). The slot shold be the removable + esim slot and the
UiccCardInfo's cardId is the same as the removable esim's cardId.

Bug: 233170453
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ibd324b781c84318c994e3742bb82e1d1393b94e4
 2022-06-06 17:56:25 +08:00
Automerger Merge Worker
97612dfbc0 Merge "[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: 0a5f62976c -s ours" into tm-d1-dev-plus-aosp am: 00d1058c40 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 8d749c55f4 is already in history

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

Change-Id: I5a91af55e2468e1ce0aaa9505f46161780d2c874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:48:38 +00:00
Raphael Kim
4128586614 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: 0a5f62976c -s ours am: 16fe784189 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: I1f049f4d1a8d9060c5ab72897e47e72bddb8d474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:48:36 +00:00
Raphael Kim
b8e8783b2c [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: cf9516b716 -s ours am: 6293ac5d63 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: Ia4cbd2bffce7adc87f441a5b894d608359bef114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:47:37 +00:00
Raphael Kim
24d08998f9 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: 0a5f62976c -s ours am: a3b0938595 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: I153b6a4214d86d1fb8e6a5eeb868b282a3610cfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:47:21 +00:00
Automerger Merge Worker
00d1058c40 Merge "[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: 0a5f62976c -s ours" into tm-d1-dev-plus-aosp 2022-06-06 09:26:56 +00:00
Raphael Kim
16fe784189 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: 0a5f62976c -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: I41e2b49cb6a9eceb1267f5afd5e71bcc46e5923e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:26:45 +00:00
Raphael Kim
6293ac5d63 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: cf9516b716 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: Id0f55898976c0d58436ca865d1113f186f293d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:26:45 +00:00
Raphael Kim
a3b0938595 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: 0a5f62976c -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: I8054bc4bd97727920a4af2d2eb74ca7d4019b5af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:26:42 +00:00
Raphael Kim
c38d1a913c [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: b00af0df94 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: Ic315f3460960beeb24bfc0f4831f12ae5a390e76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:26:10 +00:00
Raphael Kim
0a5f62976c [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: I985362cf5320eff9611095da1383b605ea0b6cef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:11:20 +00:00
Raphael Kim
b00af0df94 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: I46790fa4395f15742722d93d97ff81026c895743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:10:37 +00:00
Raphael Kim
cf9516b716 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: I6b2e8e9a4182e6f0dd25e63bae907c3331bb29aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:09:40 +00:00
Raphael Kim
a2b94beca8 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: Ib29e5d311bf6f13e6ecc06d55d72a56c2d93e246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 08:53:57 +00:00
Raphael Kim
aa31e245ab [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: Icfb23e771f8b8c77ca426f5c448227b6181cf72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 08:32:35 +00:00