TreeHugger Robot
7f7ffbcdac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: c006955815 -s ours am: be93a93ceb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: Ib43327f9d29650e8712370a4dd7a2ea4b4eb1a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:54:31 +00:00
Bill Yi
82e339a78a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: 58ea31040c -s ours am: 1620b3809f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I6a32e40e65125d4ecbe19ab9ffe360a6dc7b5181
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:54:20 +00:00
Bill Yi
d026e6992d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 7a3ffa65cb -s ours am: 40e838cb44 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590
Change-Id: I9c4c1d737e6d3e653c0ea517a3a155f591626750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:54:07 +00:00
TreeHugger Robot
1aef2326fa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: c006955815 -s ours am: 9d4e8e6017 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I2d31ee8ae6a3536ba4564c9052529cae7d82dd7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:50:43 +00:00
Bill Yi
3a5163c797
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: 58ea31040c -s ours am: 300674131a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I11e3525c995e2a74833546bf0161f317225e5a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:50:30 +00:00
Bill Yi
706c770114
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 7a3ffa65cb -s ours am: b79c294840 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590
Change-Id: I9cc36aba5944ec09cd373d4b7f82f848daf589e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:50:19 +00:00
Bill Yi
7d5f1dc09a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-08-26 18:49:51 +00:00
Bill Yi
edabf34003
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-08-26 18:49:51 +00:00
Bill Yi
5a6b0cdb09
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-08-26 18:49:15 +00:00
Bill Yi
31c69075a7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-08-26 18:49:15 +00:00
Oli Lan
f70e351d1a
Prevent exfiltration of system files via avatar picker.
...
This adds mitigations to prevent system files being exfiltrated
via the settings content provider when a content URI is provided
as a chosen user image.
The mitigations are:
1) Copy the image to a new URI rather than the existing takePictureUri
prior to cropping.
2) Only allow a system handler to respond to the CROP intent.
This is a fixed version of ag/17003629, to address b/239513606.
Bug: 187702830
Test: build and check functionality
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
Change-Id: I98eea867f926c508456ec9bc654e24eeeffa0e54
2022-08-26 19:46:02 +01:00
YK Hung
571b54e7fa
Merge "Support showing battery level chart first immediately after the battery level data is ready."
2022-08-26 18:39:25 +00:00
Automerger Merge Worker
34db7cdde9
Merge changes from topic "am-1f14ab54c2414b4ca60bb589f9ee6837" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4281092851829f4dd9a234e5669b82fc9ac950159aacbd2e2ae6ccb75281fbfd43e8459089e0c7606
2022-08-26 18:33:31 +00:00
TreeHugger Robot
5d6defbe4c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: 29f4dd9a23 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I927d21f0655638ca2fc42d0336e9db0283520ce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:32:23 +00:00
Bill Yi
a99db9e352
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: aacbd2e2ae -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I5f14460622da4d3cb2a836f043cd872dd234eff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:32:10 +00:00
Bill Yi
e2c968545f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 089e0c7606 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590
Change-Id: Ib4a34154bab2bac31d30af95ff10a1192137562e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:31:59 +00:00
TreeHugger Robot
be93a93ceb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: c006955815 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I340e0338e9ab57fce5a22807eeaf075a451dece2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:31:15 +00:00
Bill Yi
1620b3809f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: 58ea31040c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: Ibea23be346fedd84bde90a3a78b60eb76c6eac01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:31:02 +00:00
Bill Yi
40e838cb44
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 7a3ffa65cb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590
Change-Id: Idc32ec7001b86babab1367eb6c802a5410e97796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:30:52 +00:00
TreeHugger Robot
8876e02d32
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: 45dfad65ba -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I9951c057dd38669ccf7c098693489a125789a90e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:30:43 +00:00
Bill Yi
f1a0c037eb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: 052b8aa9a4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I65742035ea6401fbe4d8948e45abd55c3d523630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:30:30 +00:00
Bill Yi
481c88ad00
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: ccc21cf723 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590
Change-Id: I0d384603560a8369a04dab26ce994502f81a3565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:30:20 +00:00
TreeHugger Robot
9d4e8e6017
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: c006955815 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I9804d8e73a7e90c179ff73bfadb004ae90959f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:29:36 +00:00
Bill Yi
300674131a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: 58ea31040c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I5f26dd38c6860f52da1a026e23ce65fbac51842e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:29:24 +00:00
Bill Yi
b79c294840
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 7a3ffa65cb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590
Change-Id: I7b68d9c23a11cce7099036f1366940d994504adf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:29:13 +00:00
TreeHugger Robot
29f4dd9a23
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I751f3f087f95c4e51a4850958fea09fd65fb1edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:57:19 +00:00
Bill Yi
aacbd2e2ae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I6d96dcd9e2da4c62d4a81aa2379dd52b6f03605e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:57:06 +00:00
Bill Yi
089e0c7606
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590
Change-Id: I765f7749ff566563f7121463d3d3cad7790054aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:56:55 +00:00
TreeHugger Robot
c006955815
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I7b05ab7b867f2acb4b71038db45864e69ce28d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:56:53 +00:00
TreeHugger Robot
45dfad65ba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I523728e7043db8b83d5dbb590ebe70294bec3f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:56:45 +00:00
Bill Yi
58ea31040c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I6c6697a911ebd5b1cc0dea82c85e82f009919803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:56:40 +00:00
Bill Yi
052b8aa9a4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I45fc119abbbc720979a0fad0298ff4336f6391c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:56:32 +00:00
Bill Yi
7a3ffa65cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590
Change-Id: Idb18a7c53c6222bf52f71b26ab064c9f2547b9ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:56:29 +00:00
Bill Yi
ccc21cf723
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590
Change-Id: Ie854e40e379d7f325efef3f947cfa4ab81bf71f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:56:21 +00:00
TreeHugger Robot
66a56fdd37
Merge "Remove duplicate strings."
2022-08-26 17:52:54 +00:00
TreeHugger Robot
2810928518
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I75db89938d39c6c1c576a31ecbd8d5bf7868991d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:47:08 +00:00
Bill Yi
c9ac950159
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I48e41e88032dfe727058fbce95de2efaf618757a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:46:49 +00:00
Bill Yi
bfd43e8459
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590
Change-Id: Ie0bbb18017f81853c962c6cb34ee6eabaf9e619a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:46:35 +00:00
TreeHugger Robot
ecbf9be9a4
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-08-26 17:25:46 +00:00
YK Hung
c8d69051a4
Merge "For battery chart 7-bar case, remove the center two labels according to UX designer's suggestion."
2022-08-26 17:00:47 +00:00
András Kurucz
0f484dbd88
Merge "Fix RTL layout for Notifications history" into tm-qpr-dev am: 64eb84bd7b am: 3ba24a4d94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19742516
Change-Id: I3fbad5f31ecdb0259bdbcc0fcb1404c0fddc3296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 16:31:26 +00:00
YK Hung
65b0c83dad
Merge "Change the master code the same as tm-qpr-dev to avoid future merge conflicts."
2022-08-26 16:07:40 +00:00
András Kurucz
3ba24a4d94
Merge "Fix RTL layout for Notifications history" into tm-qpr-dev am: 64eb84bd7b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19742516
Change-Id: If754d4aed96372e28bae17ad04e11e2f087161a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 15:14:20 +00:00
András Kurucz
64eb84bd7b
Merge "Fix RTL layout for Notifications history" into tm-qpr-dev
2022-08-26 14:54:54 +00:00
András Kurucz
711dc8f9e2
Fix RTL layout for Notifications history
...
Using ConstraintLayout Guideline is causing an issue with RTL languages.
Test: check the Last 24hrs Notification history using forced RTL layout direction and different Display and Text sizes
Fixes: 243029840
Change-Id: Ia0807d94da4ad5aac7c8000460388ddb6ddbe987
2022-08-26 13:14:53 +00:00
Tetiana Meronyk
4b3a489ad3
Merge "Remove overflow from guest user settings"
2022-08-26 12:17:18 +00:00
Bonian Chen
06664b8c37
Merge "[Settings] Not allow APN delete when adding is not an option" into tm-qpr-dev am: d2644b4ea9 am: 90a36213bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739248
Change-Id: Ibf866ba9ee70e2ada74c283f5e079d2136a61173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 11:36:54 +00:00
Bonian Chen
90a36213bb
Merge "[Settings] Not allow APN delete when adding is not an option" into tm-qpr-dev am: d2644b4ea9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739248
Change-Id: Id550ed73ab4e6dd7c01504eaf315de23598aff01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 11:17:02 +00:00
Bonian Chen
d2644b4ea9
Merge "[Settings] Not allow APN delete when adding is not an option" into tm-qpr-dev
2022-08-26 10:52:02 +00:00
Bonian Chen
8c6c1ca236
[Settings] Not allow APN delete when adding is not an option
...
When not allowing APN to add, user may not be able to recover easily
when delete it.
Therefore, avoid from APN to be deleted when adding is not allowed.
Bug: 243664439
Bug: 200875858
Test: local, robolectric
Change-Id: I5cf984000244b4ad901c6a4977a1368279323e0a
2022-08-26 08:52:42 +00:00
