Bill Yi
a2197093e1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7879f2d529
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22128599
Change-Id: Ic7482ee953f37d330ce2a2d6bf24d58ca0bcab0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-18 02:00:46 +00:00
Bill Yi
ca40598f6f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62b0143cf5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22128599
Change-Id: If4d1c5c60dc0b73e58d243ccc113acb6fd7d1636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-18 02:00:29 +00:00
Bill Yi
cb5f2a5316
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-03-18 01:18:29 +00:00
Bill Yi
3bcb58f7cd
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-03-18 01:18:29 +00:00
Bill Yi
7879f2d529
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-03-18 01:18:29 +00:00
TreeHugger Robot
6626647a22
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3dc2599568
-s ours am: 0230bb216a
-s ours am: 71e0457e8d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: I613e240da9e0ea7e67abe81f75b5508b0c23e360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-18 00:25:17 +00:00
TreeHugger Robot
0812eb44b4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3dc2599568
-s ours am: 0230bb216a
-s ours am: 36ed451b84
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: I320c7adda3891f7446425a97b8e051fbb06da986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-18 00:04:08 +00:00
TreeHugger Robot
71e0457e8d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3dc2599568
-s ours am: 0230bb216a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: Ib00769119b011b725eeefbe09b412df7272aaeba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:46:55 +00:00
TreeHugger Robot
5f71828a8b
Merge changes from topic "tc_change_23031706_16" into udc-dev am: 7d2143f9ed
am: 82e7956228
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: I9c0cdbc10f1d3b7fc1261b57906092e6d45afdaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:45:21 +00:00
Bill Yi
328324d92a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7c58d10ebb
am: 816a0bbd13
-s ours am: e4cbdfe5d4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: Idf24e341780478b53cc9f7a35ec8225e2602b8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:45:19 +00:00
TreeHugger Robot
4775c4d2e4
Merge changes from topic "tc_change_23031706_17" into udc-dev am: 96d5e1edf6
am: 74d84f1576
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132058
Change-Id: Ia53fb8d71821853f9023ec5f63090ff7a4e93f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:44:52 +00:00
Bill Yi
29d1aebe67
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 59769526e0
am: 14e9cdb4fd
-s ours am: 6725be4303
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132058
Change-Id: Ie81ddc3f7651a8d02996e2c374e32af423e1eb91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:44:48 +00:00
TreeHugger Robot
36ed451b84
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3dc2599568
-s ours am: 0230bb216a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: I3f0299a878407139aa3f237c143d6e0bf56df5bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:34:02 +00:00
TreeHugger Robot
4391293af3
Merge changes from topic "tc_change_23031706_16" into udc-dev am: 7d2143f9ed
am: e384716d01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: I32cb93e955b6f122bc6ab5c1044bb3a96df59a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:32:40 +00:00
Bill Yi
ff2d0f6de9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7c58d10ebb
am: 816a0bbd13
-s ours am: cb8d478c8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: I26ea72fd50b4da0efa88d143643d353d5f9986fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:32:37 +00:00
TreeHugger Robot
d9a965ea98
Merge changes from topic "tc_change_23031706_17" into udc-dev am: 96d5e1edf6
am: 75118dc01e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132058
Change-Id: Ia7f16929d47b022bd33cfa06b5f63fb670444737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:32:01 +00:00
Bill Yi
b63a222a91
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 59769526e0
am: 14e9cdb4fd
-s ours am: 471a7e486f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132058
Change-Id: Id95c9cf3e2d896944841e6bf675627800392758f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:31:59 +00:00
TreeHugger Robot
82e7956228
Merge changes from topic "tc_change_23031706_16" into udc-dev am: 7d2143f9ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: Ibf67e708f7af6b6f030724752e919e3055e9485c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:31:53 +00:00
Bill Yi
e4cbdfe5d4
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7c58d10ebb
am: 816a0bbd13
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: Iad55015b6971cbe394dd7d8651a4cef74d57dacf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:31:51 +00:00
TreeHugger Robot
74d84f1576
Merge changes from topic "tc_change_23031706_17" into udc-dev am: 96d5e1edf6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132058
Change-Id: I167aa48440729ea63cb81cfc864447621ead0434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:30:08 +00:00
Bill Yi
6725be4303
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 59769526e0
am: 14e9cdb4fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132058
Change-Id: I62ad965d80766bb9562109fc6133547425aafcb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:29:37 +00:00
TreeHugger Robot
0230bb216a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3dc2599568
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: Ie06f53690b26101fe0963a8aee57d94907d9e1eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:24:57 +00:00
TreeHugger Robot
e384716d01
Merge changes from topic "tc_change_23031706_16" into udc-dev am: 7d2143f9ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: I409ed99c7cb3f4e15355fe46d57e647013ac600b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:15:53 +00:00
Bill Yi
cb8d478c8a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7c58d10ebb
am: 816a0bbd13
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: I07847adec48311d31838af98789508fc35c05c26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:15:48 +00:00
TreeHugger Robot
75118dc01e
Merge changes from topic "tc_change_23031706_17" into udc-dev am: 96d5e1edf6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132058
Change-Id: I151448763d9e0707b51aeb77ece6a6e072089cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:13:03 +00:00
Bill Yi
471a7e486f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 59769526e0
am: 14e9cdb4fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132058
Change-Id: I4a1e65bca77d0f8e165ddf185b29a527727ebcd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:13:00 +00:00
TreeHugger Robot
3dc2599568
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-03-17 23:03:30 +00:00
TreeHugger Robot
7d2143f9ed
Merge changes from topic "tc_change_23031706_16" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7c58d10ebb
Import translations. DO NOT MERGE ANYWHERE
2023-03-17 23:03:28 +00:00
TreeHugger Robot
96d5e1edf6
Merge changes from topic "tc_change_23031706_17" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 59769526e0
Import translations. DO NOT MERGE ANYWHERE
2023-03-17 22:56:07 +00:00
SongFerng Wang
5a089ceb8d
Merge "Update OpenNetworkSelect UI at main thread" into udc-dev am: dbfc04cb2d
am: 866a6b6428
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121989
Change-Id: Ia2ec17628aedb76d258b5b602f9febf4fe7133fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 18:27:18 +00:00
Zoey Chen
76bb350c73
[Settings] Do not set text if the fragment is not attached
...
Bug: 273415166
Test: loacl test
Change-Id: I5298727359191d8ce9c4526279faa4e8a3c1df43
2023-03-17 18:14:49 +00:00
SongFerng Wang
866a6b6428
Merge "Update OpenNetworkSelect UI at main thread" into udc-dev am: dbfc04cb2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121989
Change-Id: Id2b9d2c0f5467a653c1ace5c219369806d11db12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 18:09:18 +00:00
Automerger Merge Worker
f1912c8cfa
Merge "Merge "Update OpenNetworkSelect UI at main thread" into udc-dev am: dbfc04cb2d
am: 20d9a4e371"
2023-03-17 18:07:16 +00:00
SongFerng Wang
afdd74ef7a
Merge "Update OpenNetworkSelect UI at main thread" into udc-dev am: dbfc04cb2d
am: 20d9a4e371
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121989
Change-Id: I5f5df3c27b268892e6be2dafc2043012086329f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 18:07:12 +00:00
Darrell Shi
2784438a84
[automerger skipped] Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008
am: 2119a2dcf9
am: 5f15e00e07
am: 6352eaf0c0
-s ours
...
am skip reason: Merged-In I66a70d6b12bd3a2766e6879cb27c68a851d1dd87 with SHA-1 1b6ab7ec90
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324
Change-Id: I42f5ce40b81f2cb4dc20c57e8fd9ee5c6615f367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 18:07:05 +00:00
Darrell Shi
b8471dded5
[automerger skipped] Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008
am: 2119a2dcf9
am: 5f15e00e07
am: ce5c4d3cea
-s ours
...
am skip reason: Merged-In I66a70d6b12bd3a2766e6879cb27c68a851d1dd87 with SHA-1 edfd262be2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324
Change-Id: Ia0994c40596a03d2f93192c0579f317711550224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 18:06:37 +00:00
SongFerng Wang
20d9a4e371
Merge "Update OpenNetworkSelect UI at main thread" into udc-dev am: dbfc04cb2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121989
Change-Id: I461d82905fd12a886cb1bba9d3517a223edb0b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 17:48:30 +00:00
SongFerng Wang
dbfc04cb2d
Merge "Update OpenNetworkSelect UI at main thread" into udc-dev
2023-03-17 17:43:07 +00:00
Darrell Shi
ce5c4d3cea
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008
am: 2119a2dcf9
am: 5f15e00e07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324
Change-Id: I3daf4bcf4becdf86996fbcf0efccb58df0168997
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 17:40:57 +00:00
Becca Hughes
fb4488ea83
Add subtitle to settings (settings)
...
Allows a credential provider to show a
subtitle/summary underneath the title in
the list of providers.
Test: ondevice & atest
Bug: 253157366
Change-Id: I481da16985027a49ee464623b6db166d941cab55
(cherry picked from commit on googleplex-android-review.googlesource.com host: 6474e01372
)
Merged-In: I481da16985027a49ee464623b6db166d941cab55
2023-03-17 17:29:23 +00:00
Darrell Shi
6352eaf0c0
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008
am: 2119a2dcf9
am: 5f15e00e07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324
Change-Id: Id67b1e19ff8bbfa3bc069ad2f7fb046827e3cce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 17:27:47 +00:00
Darrell Shi
5f15e00e07
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008
am: 2119a2dcf9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324
Change-Id: I38545423c8784f826265ece8aef6a75662cb7549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 16:50:59 +00:00
Darrell Shi
2119a2dcf9
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324
Change-Id: Ib3444fa954cdc2d6a4c179994f36963673b46492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 16:13:40 +00:00
Darrell Shi
34db15a008
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev
2023-03-17 15:47:23 +00:00
Bill Yi
14e9cdb4fd
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 59769526e0
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132058
Change-Id: I74c650a1dc74ebe956bf01f55c33a99593a34057
2023-03-17 13:17:19 +00:00
Bill Yi
816a0bbd13
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7c58d10ebb
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: I11219ef573331fc96a958889a2b0d36699a7b869
2023-03-17 13:17:11 +00:00
Betty Chang
3f97cfd4af
Merge "[LE Audio] Set activity for result after scanning the QR code" into udc-dev am: bb2c12b990
am: 07392a5407
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22097102
Change-Id: Ibade94f089c88447ad8d4dab692d20a9569b146f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 12:38:16 +00:00
Betty Chang
41813a1aef
Merge "[LE Audio] Set activity for result after scanning the QR code" into udc-dev am: bb2c12b990
am: 85d94c956a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22097102
Change-Id: I1e6c50d4e9413fb220653bdbf90b202c0cfac430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 12:31:19 +00:00
Betty Chang
07392a5407
Merge "[LE Audio] Set activity for result after scanning the QR code" into udc-dev am: bb2c12b990
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22097102
Change-Id: Id7b44d3e72f1a09134dd2f36497d5bcb7189617a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 11:57:21 +00:00
Betty Chang
85d94c956a
Merge "[LE Audio] Set activity for result after scanning the QR code" into udc-dev am: bb2c12b990
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22097102
Change-Id: I60593725a54c2aaaf31bede229911aa1a9858882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 11:56:37 +00:00