TreeHugger Robot
48e6cd0f21
Merge "Add padding so text doesn't go to edge" am: 0829cea2bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12159359
Change-Id: Ide012d16037e7c676cdf1ef455f92ced2a82a20c
2020-07-16 01:43:38 +00:00
TreeHugger Robot
0829cea2bb
Merge "Add padding so text doesn't go to edge"
2020-07-16 01:26:32 +00:00
Beverly
9aa0440bd9
Add padding so text doesn't go to edge
...
Test: manual
Fixes: 159638458
Change-Id: I7a90437c12bad57695d6a0d0d1d8bf514cf28c77
2020-07-15 15:54:26 -04:00
Bonian Chen
8d0a8f5e0c
Merge "[Settings] Inclusive language for Data Usage" am: 01daee8c23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147649
Change-Id: Id419c727a75b3c158b855fe3e37afd2b2ac79110
2020-07-15 16:05:15 +00:00
Bonian Chen
01daee8c23
Merge "[Settings] Inclusive language for Data Usage"
2020-07-15 15:47:56 +00:00
András Klöczl
92f181f625
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 850263d0c6 am: 46922c26f6 am: 219f3d83ee am: 99fc1ed502
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I1e0170c372f6f8927e5442728536889fd9d1fe1b
2020-07-15 15:01:51 +00:00
András Klöczl
c803e51412
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 62f8eba220 am: 5f1984a185 am: d037ba59a7 am: eb64868053
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: Ic962cdf702707370ed48706619b5a7ca64eee9ef
2020-07-15 15:01:39 +00:00
András Klöczl
67b6f25855
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 850263d0c6 am: 3bc6e61a44 am: 0e8881b6a0 am: a7a20d705d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I85367a0be4de8330f2cc965ad502410f22089a6e
2020-07-15 15:01:32 +00:00
András Klöczl
99fc1ed502
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 850263d0c6 am: 46922c26f6 am: 219f3d83ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: If93292700a9ed6ea242284708d2f2e7f37be5fe2
2020-07-15 14:49:38 +00:00
András Klöczl
eb64868053
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 62f8eba220 am: 5f1984a185 am: d037ba59a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I37d48fd3ed57acf05cd133df45ea6deb56ea9389
2020-07-15 14:49:29 +00:00
András Klöczl
a7a20d705d
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 850263d0c6 am: 3bc6e61a44 am: 0e8881b6a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: Ie4d2588387f4f8cfb75c5303ddfc72e676e5bf0d
2020-07-15 14:49:14 +00:00
András Klöczl
219f3d83ee
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 850263d0c6 am: 46922c26f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I3054c49cb04ace38b4072d3fc43cb3e635d02246
2020-07-15 14:42:31 +00:00
András Klöczl
d037ba59a7
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 62f8eba220 am: 5f1984a185
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: Icb990b7b55ecf61eda908eab2467f2b080b3e228
2020-07-15 14:34:18 +00:00
András Klöczl
0e8881b6a0
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 850263d0c6 am: 3bc6e61a44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I3a474956dd0591bc760ab9aba86fd7476f776eb8
2020-07-15 14:34:10 +00:00
András Klöczl
5f1984a185
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 62f8eba220
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I5c3c52b369634f0fd531eabc23397033c1ec2919
2020-07-15 14:19:56 +00:00
András Klöczl
46922c26f6
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 850263d0c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I20cc9c95340b76f81ab6c207ad0dcc2fcbf1d3eb
2020-07-15 14:19:44 +00:00
András Klöczl
3bc6e61a44
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 850263d0c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: Ibc484a119111a84ac0fc6d9ab2b0ab42062fe71d
2020-07-15 14:19:30 +00:00
András Klöczl
62f8eba220
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I74c9bb596375c68bf414f208d8ad4b6058cf4d37
2020-07-15 14:04:09 +00:00
András Klöczl
850263d0c6
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I149473b03717cdbb10aede744e00e34f813b44ac
2020-07-15 14:03:57 +00:00
András Klöczl
15d9351ba0
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev
2020-07-15 13:50:34 +00:00
Bonian Chen
a5f08854e3
[Settings] Inclusive language for Data Usage
...
Change wordings in data usage part into inclusive language.
Bug: 160707804
Test: make RunSettingsRoboTests
Change-Id: I713e52df8201413b884257a51bc1f71a0d43179d
2020-07-15 02:52:32 +00:00
TreeHugger Robot
721980f0e0
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 0d34f6c80b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148946
Change-Id: I5057ed485a93b06f47edc0fa00d2e050a35bd996
2020-07-14 17:25:03 +00:00
TreeHugger Robot
0d34f6c80b
Merge "Import translations. DO NOT MERGE"
2020-07-14 17:08:29 +00:00
Bill Yi
4acd7e2fc3
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: d3265e35db -s ours am: 697f0fc11d -s ours am: 151541c799 -s ours am: cc67039237 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: Ib8ee3e372d0f635b3e0b0acd557bf498678a27cb
2020-07-14 16:51:18 +00:00
Bill Yi
eb13c0f950
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: 0e7fdac130 -s ours am: 7871d50a53 -s ours am: f7b0915e1b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: I7c26b636bb4168229728df852948a8ad9603ba81
2020-07-14 16:51:10 +00:00
Bill Yi
35940af77f
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: f9cf7d32ec -s ours am: cad5554144 -s ours am: 16c7d140f8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: I3e65ad5f3ec93472b7993736609b40519e640d31
2020-07-14 16:51:04 +00:00
Automerger Merge Worker
a3ae061a57
Merge "[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 2580a067e1 -s ours" into rvc-qpr-dev-plus-aosp am: adb5b7c931 -s ours am: f782f2c357 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941
Change-Id: I8a59810e40f2bca92f4e168d3709d8cb63ed5aeb
2020-07-14 16:50:59 +00:00
Bill Yi
2231174c27
[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 182290e9b8 -s ours am: 78f997a771 -s ours am: 9d194989c3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941
Change-Id: I2cbe7933d3f55076800fe4293a615fc4e3c56ab7
2020-07-14 16:50:50 +00:00
Bill Yi
cc67039237
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: d3265e35db -s ours am: 697f0fc11d -s ours am: 151541c799 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: Ie4f7cff75bf87654b3bdb323f0c9de15143f0f1c
2020-07-14 16:33:33 +00:00
Bill Yi
f7b0915e1b
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: 0e7fdac130 -s ours am: 7871d50a53 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: I75aebcd1025af49cfd36c7d86b209f3ad8e00b81
2020-07-14 16:33:27 +00:00
Bill Yi
16c7d140f8
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: f9cf7d32ec -s ours am: cad5554144 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: Ide8c612ccfa5bc5677005563bd2221dd55b381af
2020-07-14 16:33:21 +00:00
Automerger Merge Worker
f782f2c357
Merge "[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 2580a067e1 -s ours" into rvc-qpr-dev-plus-aosp am: adb5b7c931 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941
Change-Id: I6dc136cce85c1115b2003566984f4274023d3ab2
2020-07-14 16:33:16 +00:00
Bill Yi
9d194989c3
[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 182290e9b8 -s ours am: 78f997a771 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941
Change-Id: Ie094c69976f3c5d0cf7d8da8850830558ea247ae
2020-07-14 16:33:02 +00:00
Bill Yi
151541c799
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: d3265e35db -s ours am: 697f0fc11d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: Iaedccbda4b1463dcf0a59747eb806e6b2b78f261
2020-07-14 16:19:34 +00:00
Bill Yi
7871d50a53
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: 0e7fdac130 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: I3b00968bc0b9079dbd022cc18bd877f6d7646cb8
2020-07-14 16:19:27 +00:00
Bill Yi
697f0fc11d
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: d3265e35db -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: Ib535f86258804daf779ed6267509978332564780
2020-07-14 16:19:23 +00:00
Bill Yi
cad5554144
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: f9cf7d32ec -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: Ic0caea5e5332f9bb11208e4eee81d367037dcb79
2020-07-14 16:19:13 +00:00
Automerger Merge Worker
adb5b7c931
Merge "[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 2580a067e1 -s ours" into rvc-qpr-dev-plus-aosp
2020-07-14 16:19:10 +00:00
Bill Yi
9808f1f5f7
[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 2580a067e1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941
Change-Id: I9138a2e6f5de4811b14fcfe4f94ae7c65423d68b
2020-07-14 16:19:05 +00:00
Bill Yi
78f997a771
[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 182290e9b8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941
Change-Id: Iee9dd527d25ce6f7e7887ffdae99dd2cd568c6bb
2020-07-14 16:19:01 +00:00
Bill Yi
f9cf7d32ec
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: I2e7ca6f0d84fd0f4606f76f2aace8e7968710c0b
2020-07-14 16:05:13 +00:00
Bill Yi
2580a067e1
[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941
Change-Id: Ic80d575d02bc7a2886b527c3fa4fa8886b68c21f
2020-07-14 16:05:07 +00:00
Bill Yi
0e7fdac130
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: I2689b64d28c8959cf3f61d31ebca5bdcb610a6ea
2020-07-14 16:05:02 +00:00
Bill Yi
d3265e35db
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: Id91d7e77943acb2d0b08d64615b20da8577ecf83
2020-07-14 16:04:59 +00:00
Bill Yi
182290e9b8
[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941
Change-Id: If81c15739006a0e476938a21e5739163f07ad565
2020-07-14 16:04:50 +00:00
Bill Yi
35632cb1c2
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: Id35fed36fc4331df55138a82a2f4ead80d7c5d4a
2020-07-14 16:04:49 +00:00
Andras Kloczl
57154fbac3
Fix multi user crash when Add guest was tapped multiple times
...
When "Add guest" got tapped multiple times then the first click starts
the guest creation process which blocks the UI thread for around 2-3
seconds, then triggers the open guest details intent, and the second
tap event starts another guest creation, but it fails (since there
can't be more than 1 guest on the device) and returns null, and in the
openUserDetails we get NullPointerException.
Test: manual test
Video: http://shortn/_i4Dce33yhl
Bug: 160267016
Change-Id: I9a4f0a91295e336d246abe5f5470682a14cb510f
2020-07-14 14:34:57 +01:00
Bill Yi
289d2bf059
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: If55c745f90b6527fc1e0cf1d570ee0e2463b68a6
2020-07-14 06:25:04 -07:00
Bill Yi
a58e5de4c9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I3d7b397ba8a39c5f6a7ac75e0fa505be39b48775
2020-07-14 04:13:50 -07:00
Bill Yi
2532f0b32c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I30a4580a86030d499cdaa42ee082af185543ee6d
2020-07-14 02:03:30 -07:00
