Bill Yi
c5dc2de7c5
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0
am: 5a7f4fcb00
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: Ib60d65d3794dcd1f814bc8cc0c96bf83c47729df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:40:19 +00:00
Bill Yi
20efc0cc64
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b67694c1cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745186
Change-Id: I9ba51c4cd89e5182cdc096a4b18179e5a641405e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:40:13 +00:00
Bill Yi
4b073cf421
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f5b29384
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745186
Change-Id: I0ddd79cb6636eba32d51861c90fd5f5bfcf1bacf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:40:08 +00:00
TreeHugger Robot
fe3d04de86
Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev am: 55e91da24e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: I9cecbd87511cb97a05fff121fac736e26f140ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:39:59 +00:00
Bill Yi
7044a2ee63
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0
am: 5a7f4fcb00
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: Ib0ae216d77188d560933313a35a1b02196a22737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:39:58 +00:00
TreeHugger Robot
0312b67407
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e3b581c350
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: I26e318e71a59517302ae0db449f649f586766093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:39:34 +00:00
Lucas Silva
b31dbbb1cf
Merge "Add hyphenation to customize button text." into tm-dev
2022-04-14 17:39:13 +00:00
Victor Truong
05e824e9e0
Set Active dream to not be clickable when active.
...
Setting Active dream to not be clickable to stop Talkback from prompting
user to "Double tap to activate".
Bug: 228573813
Test: Manually tested on device.
Change-Id: I5f646bcf82d8c4172127f0739b6c0d7af890dabb
2022-04-14 17:38:26 +00:00
Bill Yi
8d00d149a6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-14 17:17:57 +00:00
Bill Yi
b67694c1cb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-04-14 17:17:45 +00:00
Bill Yi
b0765d9675
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-14 17:17:29 +00:00
Bill Yi
89a0c5fb00
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-04-14 17:16:07 +00:00
Bill Yi
08549ed959
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-04-14 17:14:41 +00:00
TreeHugger Robot
940c2d25fb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-04-14 17:12:57 +00:00
TreeHugger Robot
b299745a6c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-04-14 17:12:54 +00:00
TreeHugger Robot
2212edb907
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-14 17:10:29 +00:00
TreeHugger Robot
2880f9c765
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-14 17:08:33 +00:00
TreeHugger Robot
55e91da24e
Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0
Import translations. DO NOT MERGE ANYWHERE
2022-04-14 17:08:18 +00:00
TreeHugger Robot
e3b581c350
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-04-14 17:08:18 +00:00
TreeHugger Robot
2dd28aa043
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a
am: de1481d68a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745804
Change-Id: I5f6e6b48b9fd8c7ae26a0d43e49b6931c78633a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:55:52 +00:00
Quang Luong
0f1e422f99
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4
am: 0bbdf3a983
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256
Change-Id: Ie30e4eccddb2ccd0c1cb22f4c235c83aa894980b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:53:45 +00:00
TreeHugger Robot
26587e0f89
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a
am: d23bd16dd7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745804
Change-Id: Ia3119c4708340ab500b012d012c658c020fa9d8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:52:33 +00:00
Quang Luong
132e8286cb
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4
am: 6f7a9b88ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256
Change-Id: I842c62d47fff47de41dcc40a18eca8f777ecc1db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:51:21 +00:00
TreeHugger Robot
de1481d68a
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745804
Change-Id: I675e9e5e1100c91eb01639a020be65f0bdd47e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:34:59 +00:00
Quang Luong
0bbdf3a983
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256
Change-Id: I6839b69c92f10905e1386c0a4555a4c980eccebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:34:52 +00:00
TreeHugger Robot
d23bd16dd7
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745804
Change-Id: I1ff64d526b48eb492a3a5a2a8a5a700f8b32192f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:33:58 +00:00
Quang Luong
6f7a9b88ba
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256
Change-Id: I1193e74c90338de9a110f73dae40aaf07df556c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:33:51 +00:00
TreeHugger Robot
37c2ac2c6a
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev
2022-04-14 16:28:11 +00:00
Quang Luong
93ae7acbf4
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev
2022-04-14 16:14:21 +00:00
Tsung-Mao Fang
b36c654c2f
Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5
am: de992a99f8
am: cf162bc514
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17644388
Change-Id: I88c4804df49ac0a22b9e7e65af758ef7aa3a2df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 15:27:07 +00:00
Tsung-Mao Fang
cf162bc514
Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5
am: de992a99f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17644388
Change-Id: I5bb37aab6ba314bca3db22a574dbe38d671e4d3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 15:26:00 +00:00
Tsung-Mao Fang
61eb591020
Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5
am: 6c02827b8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17644388
Change-Id: I5c04d7f3c942107fb958480f67344cc9daa006ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 15:25:27 +00:00
Bill Yi
3ea4a22742
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6883e565c5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17746568
Change-Id: I243792eb64338ec4fea0c78ffbcb50c53bac1855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 15:19:24 +00:00
Bill Yi
6484c18b7e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07026fd881
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17746568
Change-Id: Ifab90bf447a5d9410a7aafd863e8ebe2e0e1d0be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 15:19:19 +00:00
Bill Yi
261e0d6841
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5f31fac340
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745999
Change-Id: I39553608723c4914f6835cbfdbc4febe749870a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 15:18:58 +00:00
Bill Yi
907985d3b2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13668c29ae
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745999
Change-Id: Ie1a2c7ae9315214b56454c709aaeee58a7bb907b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 15:18:56 +00:00
YK Hung
d6c946ae2c
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9
am: fe2e6b19d8
am: b4dc55d47b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17751849
Change-Id: I0c477a9836e6ade84940e16037a2057d77528a92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 15:17:17 +00:00
Bill Yi
6883e565c5
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-04-14 15:13:58 +00:00
Bill Yi
5f31fac340
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-04-14 15:08:42 +00:00
Bill Yi
c32da5ff90
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-04-14 15:07:16 +00:00
Tsung-Mao Fang
de992a99f8
Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17644388
Change-Id: I89af98755aef258bfa9234bcdd490ca9a43c9e94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 15:05:45 +00:00
Tsung-Mao Fang
6c02827b8b
Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17644388
Change-Id: I364f2fe39496649d00752c01e7e88f8754c0e4c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 15:04:40 +00:00
Bill Yi
9c55b7ac47
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-04-14 15:03:32 +00:00
YK Hung
b4dc55d47b
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9
am: fe2e6b19d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17751849
Change-Id: Ic537bb4a1e610e2d8fa02b303f9f8056e013627b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 14:55:05 +00:00
YK Hung
5c13bfb2cb
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9
am: 2fbedfdb5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17751849
Change-Id: Ia0cb4f1dbaf177eec41fc81956c2cd0921b1caca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 14:54:18 +00:00
Lucas Silva
1ccbf8b7d5
Add hyphenation to customize button text.
...
In some languages, customize may be a long word which doesn't fit in a
single line and should be hyphenated.
Bug: 228329886
Test: locally on device
Change-Id: Ibf647fc4c18b3eb927f2b6f6ca018f2b38e6f7b1
2022-04-14 14:48:14 +00:00
Tsung-Mao Fang
7877c073e5
Merge "Use androidx.window from prebuilt." into tm-dev
2022-04-14 14:40:21 +00:00
YK Hung
fe2e6b19d8
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17751849
Change-Id: If8eba2fe329e9b4d078d2b9d25bc345480d9a64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 14:33:31 +00:00
YK Hung
2fbedfdb5d
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17751849
Change-Id: I77a0e7e80ddd64f6cf3ece887585daf279eb396c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 14:32:22 +00:00
YK Hung
3a08246bd9
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev
2022-04-14 14:12:33 +00:00