PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,043 Commits 1 Branch 0 Tags
84c8069c73d8697d0ca203c7e8d1acd4fdb8976c
Commit Graph

106043 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Betty Chang
7711207ba5 Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev 2022-04-29 03:33:55 +00:00
Amy Hsu
19b9978591 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev 2022-04-29 03:25:34 +00:00
ykhung
1c3cb4505c Hide running time information for "Android System" entry 
Hide the running time information for "Android System" entry, since this
entry will combine multiple system components together. It will provide
incorrect running time information. The getRealUid() method maps many
UIDs to Process.SYSTEM_UID(1000), which results in combining all of
those UIDs into one "Android System" entry. This is the expected behavior.

Bug: 220717612
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I0aece0f1e86c36e55a2b5a966b4da9fdea14c748
 2022-04-29 02:40:07 +00:00
TreeHugger Robot
96e12783cc Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-04-29 02:36:28 +00:00
TreeHugger Robot
999a1b3b9d Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-04-29 02:36:28 +00:00
TreeHugger Robot
611db9e8be Merge "Remove loading spinner from Premium SMS access" into tm-dev 2022-04-29 02:30:14 +00:00
Weng Su
931ec6fdda Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b am: b53c4ddcec am: 0f036c9a27 am: 952ba0d0de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025

Change-Id: I2dd747f77c26d4d891934d489b9dca446c896b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:48:08 +00:00
Weng Su
9d36e760d2 Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b am: 6428d536c6 am: 977f9577a1 am: 705da26629 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025

Change-Id: I7369563a267dd663e4a2bae5c4a51339efd1956e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:46:57 +00:00
Weng Su
9236023e32 Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b am: 6428d536c6 am: 342e16a4c1 am: ad513bf05f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025

Change-Id: I6eb0d483460ece9d431d8d15caf896254a298121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:41:54 +00:00
Automerger Merge Worker
74a3ea6500 Merge "Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47 am: a01cbf2774" into tm-d1-dev-plus-aosp am: fa2ba5bc88 am: 426722502b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767

Change-Id: Ie16bb23466493bd3592d3bbbd383b6dfe4a14fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:40:03 +00:00
Stanley Wang
c41656ce63 Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47 am: 6a58c2faf1 am: 4ff1183209 am: 1ae40c50a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767

Change-Id: I48ea2558b1af95a3913ac9cd87f966469d95184b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:39:55 +00:00
Stanley Wang
f2369c17ac Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47 am: 6a58c2faf1 am: ff185afde7 am: 79513e38bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767

Change-Id: Ia7d0739e785dbaae792ace9f0b605abf6e5c524c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:39:47 +00:00
Automerger Merge Worker
acb10392a9 Merge "Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9 am: 3e1e0cd837" into tm-d1-dev-plus-aosp am: d8bcd8b4b5 am: e563a0a15a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674

Change-Id: I089be8d49dc94ab7bf6701f568c450f2b753ef88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:39:40 +00:00
TreeHugger Robot
5404869e4f Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9 am: a715a3c7b9 am: 3db1366221 am: a3ea2e28df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674

Change-Id: I0bb8226ea6e0013928eb31b1acf585e1e2c852de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:39:30 +00:00
TreeHugger Robot
da8add91e4 Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9 am: a715a3c7b9 am: 01753159e5 am: e1d863f156 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674

Change-Id: Iad1f82dbb7b5cfdc65c609440fbca069c408b5f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:39:22 +00:00
Hugh Chen
f127958f8b Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: 07089739be am: 14984ce5ca am: 035a9dd4e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: Id83a94444bc3ba342b6c9baaa56d5a16c2ffa22e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:39:14 +00:00
Hugh Chen
b82740fc8b Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: 07089739be am: 3aaf35cac1 am: a01f125313 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: I9398541e8a0afabbb470382fe5f1348ecbbb30f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:39:07 +00:00
Hugh Chen
14bcede2c6 Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: dcd868531f am: f42f401c1d am: ecb9508fef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: I45d4017390fc47c762c4f0f4946dff220de73256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:38:58 +00:00
YK Hung
55fcb02aca Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev 2022-04-29 01:14:33 +00:00
Joshua Mccloskey
29f7b04f35 Merge "Fix final UDFPS enrollment haptic." into tm-d1-dev am: dfc6bd1edb am: 3fd02b1492 am: da01a1b5c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17917343

Change-Id: I3a3b71246e647674427a4d58d37431a65b4d6be5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:51:57 +00:00
TreeHugger Robot
baaaeb3de4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 4106452f17 -s ours am: ae8bd84a09 -s ours am: 8838625058 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1aa05c86e7b3f264dde83db47932fe74f85f5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:46:21 +00:00
Bill Yi
31f47d9a65 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: ac0f2ae37e -s ours am: a0048fb9cf -s ours am: aed191087f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc238c6207fdee0dc49261c58e096d70ddb48564
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:46:07 +00:00
Joshua Mccloskey
b7af67653a Merge "Fix final UDFPS enrollment haptic." into tm-d1-dev am: dfc6bd1edb am: 5ba13f2c14 am: c128e0423c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17917343

Change-Id: Ib6dc297089e88508ed05fff60a05639783576b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:44:14 +00:00
TreeHugger Robot
8222876198 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 4106452f17 -s ours am: 4df4520afd -s ours am: efc499a2ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86c147337743ac66db9b45ba1035aa1556f3d87a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:38:15 +00:00
Bill Yi
cb997c2a6d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: ac0f2ae37e -s ours am: afc0b47d1b -s ours am: 4aa1d180cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If0ecfcbec89eeb29deaa4d3ecfcedfbacbfd609e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:37:57 +00:00
TreeHugger Robot
4b30a75450 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 9c9dea5406 -s ours am: 4eef82d108 -s ours am: e634981491 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I214d1d0f16661e2711d71af3357b88dd732be41f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:30:15 +00:00
Bill Yi
01fe7ef850 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: 88e3db5ba2 -s ours am: 4112503af4 -s ours am: d29e5cc4ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09045df530501be1fb88a88251536dc300351945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:29:34 +00:00
Automerger Merge Worker
ca597611c5 Merge changes from topic "am-828d7b02241a4b7fb76fe599192cd666" into tm-d1-dev-plus-aosp am: 7bd6130a60 am: 36900649d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038

Change-Id: I2d236bf9377bb29f96ac25250ca9d189a821db8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:26:58 +00:00
TreeHugger Robot
67c43ac3b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours am: e26c4e41ad -s ours am: 56424d355e -s ours am: c3d19b2c67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3dd4432d8dfcaacd8ccf46358ba0d586be4f863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:26:42 +00:00
Automerger Merge Worker
710c94e17a Merge changes from topic "am-505afd9430024806aa2c671aef3b93c5" into tm-qpr-dev-plus-aosp am: 192728f91e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038

Change-Id: I5f70c6d638aab1f8eea2eba02fee10cc3c59937d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:22:22 +00:00
TreeHugger Robot
78a59521cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours am: 68baeb6c08 -s ours am: 298cb3a25c -s ours am: 5671e6d081 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5b71e7e0f9804c69960ad235eb8707389eb2ff79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:22:07 +00:00
TreeHugger Robot
39f3636b95 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours am: 68baeb6c08 -s ours am: 615c81031b -s ours am: 02457d0e68 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e4852fe4c64defbfd5361a57220b651e246244a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:14:06 +00:00
Bill Yi
b3f7982a7c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f -s ours am: 7146184316 -s ours am: c2b193716b -s ours am: 9f8abb6e53 -s ours am: 025c03d6f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I925db092d058add5de31ecba3a5bd0ec9656d833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:13:50 +00:00
TreeHugger Robot
6319f3f08e Merge "Fix the description of one-handed mode doesn't change immediately in Gestures page after users turn on/off in Quick Settings" into tm-dev am: a72b9398fb am: be39eb0ad1 am: 20a6096aae am: df8346c483 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022

Change-Id: I5a9a4fedfc9f43662e70b8f6fdf0872f50c3d008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:12:34 +00:00
TreeHugger Robot
dc0839c856 Merge "Fix the description of one-handed mode doesn't change immediately in Gestures page after users turn on/off in Quick Settings" into tm-dev am: a72b9398fb am: daf63cf01e am: 0fe59d8923 am: 7b78ba43d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022

Change-Id: I9d47e519df681a0cb38ca5721f7573a29a31a228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:12:27 +00:00
TreeHugger Robot
75ace75c4c Merge "Fix the description of one-handed mode doesn't change immediately in Gestures page after users turn on/off in Quick Settings" into tm-dev am: a72b9398fb am: be39eb0ad1 am: dfd4ecad02 am: 3929ebd72d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022

Change-Id: I93abb24088d5a53a8dadad3fd2d57539d7effcb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:12:17 +00:00
Automerger Merge Worker
7d16ba0e17 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: 82c384c62d -s ours" into tm-d1-dev-plus-aosp am: a76378a81f -s ours am: 568ac16fd7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I50b66012381d285bb98753425758bb3fd32923e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:09:34 +00:00
Bill Yi
b0eae03407 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: 82c384c62d -s ours am: eb5995a968 -s ours am: ee81bf15c4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b97b5449c0d9383a3f834fbf70c890c85c24807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:09:12 +00:00
Automerger Merge Worker
a73b5018b0 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: cb6059d24d -s ours am: 1d14eb1b01 -s ours" into tm-qpr-dev-plus-aosp am: 6c462552d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42bb8d3c3529877a305a13164dc9a347de620ca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:06:05 +00:00
Bill Yi
1314169d3d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: cb6059d24d -s ours am: 1d14eb1b01 -s ours am: b236dc122f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7339c34fe8a59054221489e1ea5ce90de0c2ea86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:05:48 +00:00
Automerger Merge Worker
998cd94408 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: 82c384c62d -s ours am: e482bd0e01 -s ours am: bcb09a4db2 -s ours" 2022-04-29 00:02:41 +00:00
Abel Tesfaye
3fb18c1505 Merge "Merge auto-rotate comment/style fixes from tm-dev that couldn't be cherry picked into master" 2022-04-29 00:02:36 +00:00
Bill Yi
1dfca8360a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: 82c384c62d -s ours am: e482bd0e01 -s ours am: bcb09a4db2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83c4e913f6cc5a8e8f2ee59997acee74bc744324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:00:35 +00:00
William Leshner
2950e7c84d Merge "Disable screen saver setting for non-system users." into tm-qpr-dev am: ed5ba9a647 am: e708b185e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871948

Change-Id: Iba3719c80fccd9b8b7a6e88c7ed5dc334804f52d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 23:59:44 +00:00
Bonian Chen
17be1037ee Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a am: bad5635b38 am: 6baccf2f44 am: 2089e8add0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326

Change-Id: Ie3b914514589ab3292e2c8ef5bf92b799d848054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 23:59:35 +00:00
Bonian Chen
3ae0cbaad4 Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e am: e8619c8d08 am: 5b68b8eedd am: 6bb8c2cdd8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903597

Change-Id: I780d10c51847abbbe4d6c57cffb5595cbe03858f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 23:59:28 +00:00
Bonian Chen
df82b11ff3 Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a am: 1d1c2826c9 am: a3df120063 am: 3cf209a5ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326

Change-Id: I1339eb05f8a1f9aaeccb268e470c752096720774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 23:59:20 +00:00
Bonian Chen
47e8527f6b Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e am: 6483721f20 am: d8bd42d6f3 am: 98875e52e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903597

Change-Id: Ic721a35a4e4b67826f466f4c6cbac491c3530269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 23:59:12 +00:00
Jason Hsu
ec231955bc Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c am: c0fb12cf7c am: 691b1ef4f0 am: ef96d03e48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930

Change-Id: Ifb642bc91dc2f8ea80c2234f805f3179c109ae51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 23:59:05 +00:00
Jason Hsu
22c79c504a Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c am: 2fc065c351 am: cd187d8bed am: bd3c43b150 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930

Change-Id: I800a0a2878273f5d01f3ee4f3f710c93f419752d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 23:58:57 +00:00