TreeHugger Robot
c330b2c4f4
Merge "Collapse app bar while doing search in app page" into sc-dev
2021-06-18 04:11:27 +00:00
Menghan Li
7159bd4330
Merge "Add strings for use accessibility gesture" into sc-dev
2021-06-18 04:07:12 +00:00
Arc Wang
248970aad7
Fix negative size when size is greater than 2,147,483,647
...
Java integer max is 2,147,483,647, it's about 2GB.
Use getLong to get size from provider instead of getInt.
Bug: 190721008
Test: manual visual
Copy video files more than 2,147,483,647 bytes
and observe Videos size information.
Change-Id: Ic804db43554fdd580627faebecfe30d9ad2a9120
2021-06-18 11:30:18 +08:00
Bill Yi
48bc88cdf0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7987e83cb8ec682adf8e7ef9d8a616e35be530fe
2021-06-17 20:16:52 -07:00
menghanli
d013763aac
Add strings for use accessibility gesture
...
Bug: 190563948
Test: Manual test
Change-Id: Idbd796d3102d404341a0b75b406151e4f0bd57fd
2021-06-18 10:48:47 +08:00
TreeHugger Robot
a7b2ed8119
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a7703602b0
-s ours am: 37b855f44a
-s ours am: 14b6ec062d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15019387
Change-Id: I1313302c718f7e93032feb7291c71349e80f5e04
2021-06-18 01:57:29 +00:00
TreeHugger Robot
0118d0dbe6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a23758349e
-s ours am: 8210206504
-s ours am: db0301401a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15020170
Change-Id: I0ab6b90ca74a2fd026e5a749c4c8468b295174cd
2021-06-18 01:57:17 +00:00
TreeHugger Robot
642eb0f870
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a7703602b0
-s ours am: 69d0cef2ab
-s ours am: ae96d77bde
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15019387
Change-Id: I1122add6f519cd9a6e4b121bff886dbe270f5ed5
2021-06-18 01:57:01 +00:00
TreeHugger Robot
8497d25969
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a23758349e
-s ours am: 8180908fe4
-s ours am: c7e159134e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15020170
Change-Id: Ice8840e4e232fcd04e66103aca05c5182ca58518
2021-06-18 01:56:13 +00:00
TreeHugger Robot
14b6ec062d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a7703602b0
-s ours am: 37b855f44a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15019387
Change-Id: I048db91b450a46f856b40177b998ba64eee99e0e
2021-06-18 01:35:45 +00:00
TreeHugger Robot
db0301401a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a23758349e
-s ours am: 8210206504
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15020170
Change-Id: Ieab624bef71be48b50d2ab898894f8cc47351380
2021-06-18 01:35:22 +00:00
TreeHugger Robot
78e1b9e4bc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 0e809b8b40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15019018
Change-Id: Ibb71558f2a23c166260b46b7bcf437684b8bf93e
2021-06-18 01:35:22 +00:00
TreeHugger Robot
5c62a8ec02
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 77e40459d7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15018403
Change-Id: I104ba89f6aa28d637a015908792593ed68018d27
2021-06-18 01:35:16 +00:00
TreeHugger Robot
ae96d77bde
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a7703602b0
-s ours am: 69d0cef2ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15019387
Change-Id: I0ce0bb227a13ebd53991eb393023a1eef7fd48e1
2021-06-18 01:35:11 +00:00
TreeHugger Robot
288166cc79
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a7703602b0
-s ours am: c690bdb912
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15019387
Change-Id: I9e2e1951b87ec327b3c8a89351f955cee755e1ac
2021-06-18 01:35:09 +00:00
TreeHugger Robot
c7e159134e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a23758349e
-s ours am: 8180908fe4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15020170
Change-Id: I8c10831ee52d4e970b3d7513c12318d5236d946b
2021-06-18 01:34:58 +00:00
TreeHugger Robot
cc1ee5c3e5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a23758349e
-s ours am: 3820dcdd6e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15020170
Change-Id: I9d5e5422d165b47385d9eadeb74ce93115ae4522
2021-06-18 01:34:36 +00:00
TreeHugger Robot
0e809b8b40
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-06-18 01:25:06 +00:00
TreeHugger Robot
14ac44ac8f
[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master am: d9e78dc848
-s ours am: 3319bbdd3d
-s ours am: 7fad2b79b2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14974612
Change-Id: I2fffc2357000b3501a1f5b85c6e72f56d03d6921
2021-06-18 01:22:57 +00:00
TreeHugger Robot
69d0cef2ab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a7703602b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15019387
Change-Id: I5c531a2ebbd17246d09489c7e3e89d4cabe4b837
2021-06-18 01:19:55 +00:00
TreeHugger Robot
77e40459d7
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-06-18 01:19:50 +00:00
TreeHugger Robot
8180908fe4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a23758349e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15020170
Change-Id: I73f0d13a61be33c110d1b757c8e5f1ea5952d31d
2021-06-18 01:19:40 +00:00
TreeHugger Robot
37b855f44a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a7703602b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15019387
Change-Id: Ieb4d0ed887b92329d03b7b2651f1936f22a69a26
2021-06-18 01:19:24 +00:00
TreeHugger Robot
c690bdb912
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a7703602b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15019387
Change-Id: Id3f637814c44c98d682b4364831d5e6c01d6b665
2021-06-18 01:19:07 +00:00
TreeHugger Robot
8210206504
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a23758349e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15020170
Change-Id: I08bcfc57ea0a12a9b1f93cfd3ebdc450108cfcfb
2021-06-18 01:18:56 +00:00
TreeHugger Robot
3820dcdd6e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a23758349e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15020170
Change-Id: I1df194c74c60db01f65beecf9964395152f91fe9
2021-06-18 01:18:49 +00:00
TreeHugger Robot
a7703602b0
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-18 01:07:32 +00:00
TreeHugger Robot
a23758349e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-18 01:06:12 +00:00
TreeHugger Robot
7fad2b79b2
[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master am: d9e78dc848
-s ours am: 3319bbdd3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14974612
Change-Id: I2651afe3d3db826c1b46982ff017f32db2087d68
2021-06-18 00:57:11 +00:00
TreeHugger Robot
3319bbdd3d
[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master am: d9e78dc848
-s ours
...
am skip reason: Merged-In I1cc3796f31e7db3d8f062436ebc618d93db19822 with SHA-1 38d3b0fa18
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14974612
Change-Id: Ida0de335047c2cebe9f86810c9fdd529738fdc41
2021-06-18 00:51:54 +00:00
TreeHugger Robot
d9e78dc848
Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master
2021-06-18 00:31:00 +00:00
Bill Yi
08386bd061
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1f25f1144169f8b43cd6154d9e63a56f1a00823e
2021-06-17 23:57:02 +00:00
Bill Yi
1809285e19
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieae8de32be4db5d051cab939e23327b3f533cb8f
2021-06-17 23:53:26 +00:00
Peter Wang
95028d129c
Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533
am: 70fec74fe6
am: 1286161dff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801
Change-Id: Ie12781cb0468fa709dc32f098c5ae952bd828797
2021-06-17 23:04:04 +00:00
Peter Wang
101a4162bb
Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533
am: 4a17c2ce85
am: c0b5a210ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801
Change-Id: I562a3a0c7ddbb25c2ed45f82a642122cdd43c4a3
2021-06-17 23:03:33 +00:00
Peter Wang
1286161dff
Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533
am: 70fec74fe6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801
Change-Id: I8009fa916422e825b0e96b11ba5edb5ea7894e57
2021-06-17 22:47:46 +00:00
Peter Wang
c0b5a210ab
Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533
am: 4a17c2ce85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801
Change-Id: Ic5bc3e0e75a09683a9506a349d8a23299bfc150a
2021-06-17 22:47:27 +00:00
Peter Wang
b9bb8254e7
Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533
am: 307c47eb16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801
Change-Id: If43af6f6d3005214a800daa2b446c4900a35b089
2021-06-17 22:46:58 +00:00
Peter Wang
4a17c2ce85
Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801
Change-Id: Iafb5583a51966b5620cdf383885765cdeb0d8284
2021-06-17 22:28:10 +00:00
Peter Wang
307c47eb16
Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801
Change-Id: Iff4a24436e5ffa001f0ece1b85e90be55eb6ceab
2021-06-17 22:27:19 +00:00
Peter Wang
70fec74fe6
Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942801
Change-Id: Id08d349c376211cb3530009945c58cdcd31b0f46
2021-06-17 22:27:19 +00:00
Peter Wang
2c5788b533
Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev
2021-06-17 22:14:50 +00:00
Bill Yi
d2b3465c91
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie592748281a9b71c92a89a4051249a1e1960d21f
2021-06-17 15:07:01 -07:00
Bill Yi
5cc770aba5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I63596bc5b219e1992b38afcb6ebdfdf5e28d3ae0
2021-06-17 15:03:16 -07:00
Xin Li
7d73dec24c
DO NOT MERGE - Merge ab/7272582
...
Bug: 190855093
Merged-In: I1cc3796f31e7db3d8f062436ebc618d93db19822
Change-Id: I2b6c7d579bfa1ce3d3fb4432d92906dc739dde1b
2021-06-17 21:56:04 +00:00
Joe Bolinger
4af5a3644d
Update strings for parental consent flow in setup wizard.
...
Bug: 188847063
Test: manual
Change-Id: I044be874818f6563a47c3f7c8c5011b3cab31ae9
2021-06-17 14:53:56 -07:00
Julia Reynolds
fbf3681c65
Merge "Validate config activities with their rule owners" into sc-dev am: fb359d18ff
am: bfe49de437
am: 5594957e87
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15002760
Change-Id: Ice7720316da1aaed61a51472aa3b2b6d4eb02f8c
2021-06-17 20:23:29 +00:00
Julia Reynolds
ccb1817b8d
Merge "Validate config activities with their rule owners" into sc-dev am: fb359d18ff
am: a0a0e5b03e
am: 44ea03fa73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15002760
Change-Id: I14a1ef9c3f669ddab4dc3e3ed59d9b1348131edb
2021-06-17 20:20:39 +00:00
Julia Reynolds
5594957e87
Merge "Validate config activities with their rule owners" into sc-dev am: fb359d18ff
am: bfe49de437
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15002760
Change-Id: I8f7ee2568f5e29ef061581df85b61f2aae16aaf2
2021-06-17 20:03:11 +00:00
Julia Reynolds
13dce6aec6
Merge "Validate config activities with their rule owners" into sc-dev am: fb359d18ff
am: 495245e692
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15002760
Change-Id: Idb7d142f1e8ac66421c18b910bbe5e8df2ad8ec9
2021-06-17 20:01:40 +00:00