TreeHugger Robot
2b662c5a07
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-10 06:08:45 +00:00
TreeHugger Robot
71826af4fb
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-10 06:08:45 +00:00
Jason Chiu
6780e6ffdd
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: Ied9c640a9a3586efa78eb1456234cbfac44904fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 02:33:22 +00:00
Bill Yi
c1ebda67c2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3b4ba2fd47b3ab2f58a1eb962a12872f85f224f4
2022-06-09 09:49:56 -07:00
Bill Yi
5391d591c8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibb0a9c21fb33588f13b99a46a30dd191e28d587b
2022-06-09 09:45:40 -07:00
Gil Cukierman
55e8d38038
Improve documentation of Enable2gPreferenceController
...
Test: javadoc changes only
Fix: 235251754
Change-Id: Ieee483fdbeac3e581085c1a776974f82090743bc
2022-06-09 13:47:45 +00:00
Alan Huang
b9be27b006
[VolumePanel] Fix the Hearable control slice uri parameter
...
The provided uri doesn't contain the formatted string, so just append
the width at the end
Bug: 229048602
Test: make -j64 RunSettingsRoboTests
Change-Id: Idadbb4d725c8ca65bac31fbead8ac1d429ebcea9
2022-06-09 08:22:33 +00:00
Jason Chiu
7f1ff1b796
Revert "Do not show the redundant RemoveAccountFailureDialog"
...
This reverts commit e5f1d24913
.
Reason for revert: "Remove account" does nothing and shows no errors
Fix: 232819214
Change-Id: I4a4e5084cde87ea2a9e5be1ff3ca6709e11ebc3d
2022-06-09 08:14:13 +00:00
Piotr Wilczyński
395861f79d
Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014
Change-Id: Ib7e8232d1f4dafa6418363e629ba228d1eb217e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 07:58:03 +00:00
Piotr Wilczyński
7d634de3ea
Merge "Notify about brightness change when screen turns on" into tm-dev
2022-06-09 07:39:07 +00:00
TreeHugger Robot
7d9636054e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801444
Change-Id: Ibd871494793e87931504a1700523d7daf82e7919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 03:03:00 +00:00
Bill Yi
1ad8ccd199
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d98e536863
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801444
Change-Id: I696be58f56a6ca022b40c07b2e03653aefa04404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 03:02:51 +00:00
TreeHugger Robot
72a681dbe4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801440
Change-Id: Ifbbc6bf130ea62a0f5f82acc275b2c0af17fe8c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 03:02:39 +00:00
Bill Yi
a658060c06
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801440
Change-Id: Ia96ac0fb6ca1bdda13d1bae629d7e1a9a6a63f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 03:02:35 +00:00
TreeHugger Robot
f700b7398c
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-09 02:39:03 +00:00
TreeHugger Robot
8be819762f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-09 02:39:03 +00:00
SongFerng Wang
40379dd9d4
Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967
Change-Id: I6120361d42db676e02991dafd707dfa1b4188777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:05:41 +00:00
SongFerngWang
b6bd4143cd
[Setting crash] The dialog is null am: 8514ff65eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471
Change-Id: Ie9e4e661bb66dcb898b2f98435989ab838d37713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:05:21 +00:00
SongFerng Wang
be1b37ae2b
Merge "Unable to enable the removable esim" into tm-dev
2022-06-09 01:30:44 +00:00
Bill Yi
d98e536863
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I650e4197e0aff594a172c01f04cffd4092b7467d
2022-06-08 14:12:47 -07:00
Bill Yi
fe71b2e76c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4111bd9a5feee6d6a8b5db7861d622ea893515e2
2022-06-08 14:08:50 -07:00
Joshua McCloskey
77452db3f9
Updated FP enroll confirmation string
...
Test: Verified correct string shows after FP enrollment.
Fixes: 234183906
Change-Id: I57e7ce836d4dc5ad2caf198aa59738f64dc4c049
2022-06-08 20:59:36 +00:00
SongFerngWang
8514ff65eb
[Setting crash] The dialog is null
...
Add the null protection.
Bug: 235267673
Test: build pass
Change-Id: Ib9308d152ddc233354d89166b8d79fcec81d8c19
2022-06-08 08:32:05 +00:00
Bill Yi
131903dd2e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: Icd6cc592217548df11b658f141d8dee124e99b43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 02:46:47 +00:00
Bill Yi
e6b9e1fdf5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3cdc674297a6f760c146bfd95190496a88309055
2022-06-07 07:29:07 -07:00
Edgar Wang
025baa318b
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I831063be158b5097e3cc82e8d5db767676096811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:40:14 +00:00
Edgar Wang
1f6334825f
Merge "Recalculate view's height when tab is selected" into tm-dev
2022-06-07 04:17:39 +00:00
TreeHugger Robot
4322a2ffea
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a
-s ours am: 3de5617a68
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745296
Change-Id: Ib1e2168fa829912acd8a56b6d4912f9424c35faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 23:19:46 +00:00
Bill Yi
6de51e9b95
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92
-s ours am: 2036b1873c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745296
Change-Id: Ie8a14a4ce53b637baee387d5af0844df01937828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 23:19:42 +00:00
TreeHugger Robot
d3bd17b345
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18
-s ours am: 722272143c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745293
Change-Id: Ic77b5f19c3711be07cc88a803e318fba40b29fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 23:19:34 +00:00
Bill Yi
702b4bdc85
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb
-s ours am: 26d22ef04d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745293
Change-Id: Ic65ceb2f7a4f50d7584be3d596d64b620af20d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 23:19:29 +00:00
TreeHugger Robot
3de5617a68
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745296
Change-Id: I7a89dc3c0ffad10dec24003198409aad5b174182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 22:53:21 +00:00
Bill Yi
2036b1873c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745296
Change-Id: I57a2a0dcb836119e48d63874ec6ed77715cab344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 22:53:17 +00:00
TreeHugger Robot
722272143c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745293
Change-Id: Ic3a2da03399dc35e01360df7c323cb3b5b68808c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 22:53:10 +00:00
Bill Yi
26d22ef04d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745293
Change-Id: I1286629b18bae7a7a76bd4c96fc3b3d33cf559db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 22:53:00 +00:00
TreeHugger Robot
725c53880a
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-06 22:36:20 +00:00
TreeHugger Robot
e852811d18
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-06 22:36:20 +00:00
TreeHugger Robot
1a351b24fc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6769eee779
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745573
Change-Id: Ibdf35d15941087d02320ceffaa3a74f4c542cc18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 21:14:05 +00:00
Bill Yi
9481e02299
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3dc439a10
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745573
Change-Id: Id0a385e531b4a2a27fde25dcf4b9c1d02220e389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 21:13:51 +00:00
TreeHugger Robot
6769eee779
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-06 21:03:12 +00:00
Treehugger Robot
a3d3cc0471
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe38e396b2
-s ours am: 110c20fff0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115721
Change-Id: I992ddb7979fc0d49731a673ba7baf85e2b547db9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 21:02:45 +00:00
Bill Yi
3451a4ac62
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 908d98e833
-s ours am: 30d09d7e03
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115721
Change-Id: Ie0888f421abf49fe4e182551c7e7a448a6e9adb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 21:02:34 +00:00
Treehugger Robot
c7c64676f7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c2d1ef5127
-s ours am: 75cadf738b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115720
Change-Id: I3bd2b32ed9e822b026165ab01c0d10e7285e88dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 21:02:16 +00:00
Bill Yi
66779a5357
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36ddfc8853
-s ours am: 910530931f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115720
Change-Id: I4b14a472c83060809f8e28f705467145b2893437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 21:01:57 +00:00
TreeHugger Robot
c64edf7b3d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 95b4c4798d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18752418
Change-Id: I3441f146bc9070e8ab71cfb205edaa8363c9c903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 19:44:49 +00:00
Bill Yi
070b5431bb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88b4a11c90
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18752418
Change-Id: I5f0eb3e6195e1f40169fa3f1d36c1fc6963867bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 19:44:31 +00:00
TreeHugger Robot
789c7d4d0d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 059271dcc4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18752417
Change-Id: I9d87a4e080463d2d70798e1a67c0d023bd9b31e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 19:44:23 +00:00
Bill Yi
cf50c84e8d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71660567f7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18752417
Change-Id: I92013752f94269892d8c0bd1c38746c1f6a8a3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 19:44:05 +00:00
Treehugger Robot
110c20fff0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe38e396b2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115721
Change-Id: I219fdf84a32d625cc1db2a8cad3f0e2fad99a630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 19:20:01 +00:00
Bill Yi
30d09d7e03
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 908d98e833
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115721
Change-Id: Id6cb0c78ac4a1fff67ad24036e65b670f5a8429c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 19:19:37 +00:00