Bill Yi
f9ffefd7d6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 171e66e000 -s ours am: 4caa1ee4c3 -s ours am: 155b5266fc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801124
Change-Id: Ie0a3acb47faeb2cc0b7029d37d43839046648ec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:48:38 +00:00
Bill Yi
d0e1438572
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c416adc1df -s ours am: d4ba4def6a -s ours am: 0ebc9d790d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801124
Change-Id: Id286a20a0b0cde92120577a575c306cc018618b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:48:34 +00:00
Bill Yi
58119147f3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 499308fa2c -s ours am: dcd5353e67 -s ours am: a70fa93e6b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801123
Change-Id: Ieecc5e87d441256e3af44bbb202a9d116acda300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:48:27 +00:00
Bill Yi
cb6e618de8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a05355cc0a -s ours am: 22ac363063 -s ours am: 340b85bb5b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801123
Change-Id: I78a336675daab779f66653a3ec350073a2d6065a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:48:17 +00:00
Treehugger Robot
304324ddd0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 0cb641a695 -s ours am: 46bd7feab6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I95c2b229ea2e32882a999b6e9e16b5d68f3bece8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:46:12 +00:00
Treehugger Robot
c4241ce611
Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am: 953f6167e9 am: 0b8d81c18c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I2b3ca860ca03f35c5ef2e3c1bbd3b77cbfb04724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:45:53 +00:00
Piotr Wilczyński
1ab96c0b22
Merge "Revert "Back up the smooth display setting"" into udc-d1-dev am: 0066bdea3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848698
Change-Id: I26bb2b04a543a22c619387ec41ae26e37f63aa8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:08:45 +00:00
Bill Yi
155b5266fc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 171e66e000 -s ours am: 4caa1ee4c3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801124
Change-Id: If51f800f04ad40049ee3508ff02d9ded8cf7f7b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:37 +00:00
Bill Yi
0ebc9d790d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c416adc1df -s ours am: d4ba4def6a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801124
Change-Id: Ie6058d58565c8b9f65cc7cb5a61b1367141dd17b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:30 +00:00
Bill Yi
a70fa93e6b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 499308fa2c -s ours am: dcd5353e67 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801123
Change-Id: Ib6beab44e6862b85e5a5ebb28f9573b894a69dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:19 +00:00
Bill Yi
340b85bb5b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a05355cc0a -s ours am: 22ac363063 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801123
Change-Id: Idb3db0d1797033ce2854741532be1f0eb32823fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:06:56 +00:00
Piotr Wilczyński
0066bdea3e
Merge "Revert "Back up the smooth display setting"" into udc-d1-dev
2023-04-27 16:06:37 +00:00
Treehugger Robot
46bd7feab6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 0cb641a695 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I1943d52ba4d0aa955897e823a3860ef619d98915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:05:02 +00:00
Treehugger Robot
0b8d81c18c
Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am: 953f6167e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I6372af8e100d0ab6d7709cc180c13efce4ff40fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:04:44 +00:00
TreeHugger Robot
fc81c4f554
Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6 am: ffb6adb9e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739
Change-Id: I8805a3a28cc710330861e409e3fc3e1435444973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 12:17:13 +00:00
Treehugger Robot
d5c1e54e8f
Merge "[Regional Preferences]] Update the string of header" into udc-dev am: d12716bb12 am: 118a51ad6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905740
Change-Id: I7a2dd3b4ccb13921913df8b9c9e153d80ddd5091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 12:13:43 +00:00
Menghan Li
c55f3c57cb
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev am: 0e32500259 am: cd4c0f15a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891105
Change-Id: Ied8c33725f5295b6786413591687eb6966cf2ff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 12:11:01 +00:00
TreeHugger Robot
2f2163ee02
Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6 am: 143f6aeb43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739
Change-Id: I06930be8adbd6b67b20b2ddc83db0abdf1d73ed1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:48:23 +00:00
Treehugger Robot
f7210aa079
Merge "[Regional Preferences]] Update the string of header" into udc-dev am: d12716bb12 am: 9e1c1ecca5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905740
Change-Id: If5c83bd412be1309c427efcd6e16034fcc71a007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:48:13 +00:00
Menghan Li
54492ea2fc
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev am: 0e32500259 am: e9427458a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891105
Change-Id: I37d13a846f66ff642eaf72808bbb27824087eb5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:47:07 +00:00
TreeHugger Robot
88ef9a6791
Merge "Update battery saver footer string" into udc-dev am: f566e6de2f am: 795f3d2d09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901659
Change-Id: If02a094c1f38fca2e8b5a9c9a5ee36e1fce7c57f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:45:44 +00:00
TreeHugger Robot
143f6aeb43
Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739
Change-Id: I193bbf41ec079e0266357de47661e083594d3fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:29:05 +00:00
TreeHugger Robot
ffb6adb9e6
Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739
Change-Id: Ia3b6ce10e3db8a9a04c43251e96468fbb6dbde05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:28:41 +00:00
Treehugger Robot
118a51ad6d
Merge "[Regional Preferences]] Update the string of header" into udc-dev am: d12716bb12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905740
Change-Id: I6a566a5438d02e0600465072e971b2c0ea4a28ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:27:47 +00:00
Menghan Li
cd4c0f15a8
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev am: 0e32500259
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891105
Change-Id: I85ac1c91d02661c77259fdb54d1e8c23a79971dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:24:35 +00:00
TreeHugger Robot
d3897afda6
Merge "Change drop down strings to "View by ..."" into udc-dev
2023-04-27 11:12:45 +00:00
Treehugger Robot
9e1c1ecca5
Merge "[Regional Preferences]] Update the string of header" into udc-dev am: d12716bb12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905740
Change-Id: Icf963af6f2d5a931b678226970cde5701edb19fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:10:16 +00:00
Menghan Li
e9427458a9
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev am: 0e32500259
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891105
Change-Id: Iaf75b768f12728be4d6d249dd9f26ed0efeaa21c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:10:01 +00:00
TreeHugger Robot
795f3d2d09
Merge "Update battery saver footer string" into udc-dev am: f566e6de2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901659
Change-Id: I61fa48523f8462a156b13d63d14035edd1dc4c5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:08:50 +00:00
Treehugger Robot
d12716bb12
Merge "[Regional Preferences]] Update the string of header" into udc-dev
2023-04-27 11:02:53 +00:00
Menghan Li
0e32500259
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev
2023-04-27 10:57:17 +00:00
TreeHugger Robot
4903c6f42f
Merge "Update battery saver footer string" into udc-dev am: f566e6de2f am: d56c097761
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901659
Change-Id: I2b444c88f6f92e7b6bc93704729d8ab38801fd72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 10:48:18 +00:00
Zoey Chen
680f91b58d
Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a am: 05d70bb710
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101
Change-Id: I73963128d9cf4324bebf1d8386080a14191f476c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 10:48:05 +00:00
Zoey Chen
334438399d
Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a am: b306c4dd5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101
Change-Id: I89e4b3df4320d26801a35d67e0e3229cb851053a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 10:43:49 +00:00
TreeHugger Robot
d56c097761
Merge "Update battery saver footer string" into udc-dev am: f566e6de2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901659
Change-Id: I4ecd02f3c208395b88ab55d0adb58de1381d7f0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 10:42:42 +00:00
TreeHugger Robot
f566e6de2f
Merge "Update battery saver footer string" into udc-dev
2023-04-27 10:29:25 +00:00
Zoey Chen
05d70bb710
Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101
Change-Id: I1a2de67059623153f925386f410075aedae934bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 10:21:01 +00:00
Zoey Chen
b306c4dd5b
Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101
Change-Id: Id9c1c34ea8496bb36512740efa81903af455154f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 10:06:36 +00:00
Automerger Merge Worker
9199f72284
Merge "Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8 am: f8278dcd99" into udc-d1-dev-plus-aosp
2023-04-27 09:48:32 +00:00
Edgar Wang
3996c46ec2
Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8 am: f8278dcd99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569798
Change-Id: Ibdbc9cf2a3fce33f8dbe73a4cca1b7afb1eafac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 09:46:50 +00:00
Edgar Wang
4a874fb50f
Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8 am: 3b9432dad2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569798
Change-Id: I47ca8520fd1da0142f733a1de62e0ecbfd773750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 09:44:55 +00:00
Zoey Chen
c9994c0a54
[Regional Preferences]] Update the string of header
...
Bug: 279549042
Test: local test
Change-Id: I4983618c91f0e5ea83c4095491be7bb4433f6d2b
2023-04-27 09:44:17 +00:00
Zoey Chen
bee241bd5a
Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev
2023-04-27 09:35:24 +00:00
Zaiyue Xue
8888e5eea7
Change drop down strings to "View by ..."
...
https://screenshot.googleplex.com/8J4KQW9FKB9yjsL.png
Bug: 279654750
Fix: 279654750
Test: manual
Change-Id: Ia66db0910b318b1e819960d08294a4303497b3e7
2023-04-27 17:33:04 +08:00
Edgar Wang
3b9432dad2
Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569798
Change-Id: I507600bb21802f7160df47bc4abaf6de2fcb01d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 09:11:28 +00:00
Edgar Wang
f8278dcd99
Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569798
Change-Id: I71f04286cb8a0659e9d938f22f2b3707cc9d9ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 09:10:35 +00:00
menghanli
fa5f8d3b0a
Fix "Open <a11y service> " starts from end for RTL language
...
Root cause: TextView space uses "wrap_content" to not match the parent width
Solution: Use "match_parent" instead
Bug: 279646115
Test: anual test for RTL and LTR language
Change-Id: If4091958e5ab4323c881732a7b38814dc93db4a1
2023-04-27 17:09:31 +08:00
Edgar Wang
e0049f0ae8
Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev
2023-04-27 08:27:42 +00:00
Wesley Wang
1aaad53e09
Update battery saver footer string
...
Bug: 279825606
Test: make SettingsRoboTests
Change-Id: I8fb05d9db8037ab6b3c8be57b2891c8f022f1440
2023-04-27 13:36:45 +08:00
Zoey Chen
fa5ea719de
Fix AppEntry.extraInfo ClassCastException
...
AppEntry's extraInfo is an Object class, force cast it to Boolean may
cause ClassCastException.
Bug: 279639370
Bug: 279333773
Test: local test
Change-Id: Ie135d9a49fdac6623f6b29a13ddf83896a911712
Merged-In: Iccbe9b669011c5061f1c8b3998632f05fbd8a02f
2023-04-27 03:48:38 +00:00