Commit Graph

105986 Commits

Author SHA1 Message Date
Bill Yi
c5aff8f391 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: aae3370ac8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432

Change-Id: I2cd5e38945402505392ee45aad6190a5ae66ff1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 18:40:48 +00:00
TreeHugger Robot
086f4d675b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: 8a300a43df -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433

Change-Id: I33b20cdd9764615440073e42f50ac18155eae96f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 18:08:39 +00:00
Bill Yi
b70a1941ed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 617be8295c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433

Change-Id: I6948c1dbb6a617b68d55d549e941e75730bce911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 18:08:22 +00:00
Bill Yi
64ff179b42 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: d1f25e5217 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432

Change-Id: I707251703c788ba3f36c2c27f71e2b443ba83a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 18:08:09 +00:00
TreeHugger Robot
de8d037d68 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433

Change-Id: I5c981979f4d7f49db140616f729a0d1443d3245c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 18:04:59 +00:00
Bill Yi
7cb9020b74 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433

Change-Id: Ic525c959ffa6c69cf17f9d1aa98c3a4ded0dc46e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 18:04:44 +00:00
TreeHugger Robot
037a382168 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours am: 188a2c66c1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496

Change-Id: I416452c5dab106b52086fcf710d08f068a46d237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 18:04:42 +00:00
Bill Yi
aae3370ac8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432

Change-Id: I44bd41d12f2966c1ef8674d3e25484d989b1b314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 18:04:31 +00:00
Bill Yi
3df6f3fe63 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours am: cdd61bac15 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496

Change-Id: I62fefb7372de3f454ec6adc30e240928cad2f618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 18:04:24 +00:00
Bill Yi
c25ff8ff49 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours am: 3050a6cb87 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984

Change-Id: I521db24cb73bcc39f3b058b45a3fc97397cb514a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 18:04:07 +00:00
TreeHugger Robot
0adac53973 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 377685d4a6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294505

Change-Id: I0b9ea4b0881d39ea38a1165d500fcf886dec8388
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 18:03:06 +00:00
Bill Yi
392e976d77 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30c5704504 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294505

Change-Id: I971b4060cd41bf69ce821df160ac5d3434bae041
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 18:02:51 +00:00
Bill Yi
4011a37faa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff486543a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294494

Change-Id: I0a66d2a0bea5d89a31780156c2e9d31356617008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 18:02:36 +00:00
TreeHugger Robot
8a300a43df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433

Change-Id: I5ae6a65703afa8f788a107214bb4b64804095e3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:56:24 +00:00
Bill Yi
617be8295c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433

Change-Id: I217b6bffc9e0de61bf00f8291a95d8a2d525243a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:56:08 +00:00
Bill Yi
d1f25e5217 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432

Change-Id: I0f33b849986bb6501baa00d4fee74de7617f9e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:55:55 +00:00
TreeHugger Robot
ec4f2a953b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours am: 3ff66be05a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496

Change-Id: I4ba7ef3a40991518ba3261282664a9dfdda9e523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:54:57 +00:00
Bill Yi
6f2aa0d0f7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours am: 84ce084f90 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496

Change-Id: I67f6ad3b81dc663a6ab41c510eb0558f9fdc3840
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:54:40 +00:00
Bill Yi
ea80c38015 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours am: bc5abed2bd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984

Change-Id: I748899370ed54bc7947644656b8fece6e81dda2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:54:23 +00:00
TreeHugger Robot
f20ec29820 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433

Change-Id: I7f6106fcdf78ce8f3a335c75a27bf8e794326ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:37:18 +00:00
Bill Yi
6aa3b0a3a9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433

Change-Id: I989899b2f11e906218ee445f603d46973e88af05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:37:05 +00:00
Bill Yi
cb2cb2e72a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432

Change-Id: I39cd22fa5a5ece6def936a0501f4226b5925a414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:36:46 +00:00
TreeHugger Robot
8359385233 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-07-15 17:29:43 +00:00
TreeHugger Robot
188a2c66c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496

Change-Id: I07ea1b35c425ddda94d74d61f69d50eac84517b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:29:37 +00:00
Bill Yi
cdd61bac15 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496

Change-Id: I43aaa9d814fe81b7bdbcd363f66b214dc7f8949b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:29:19 +00:00
Bill Yi
3050a6cb87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984

Change-Id: I0697c0805e26144de9fe00eaaf8fee2ad864f7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:29:02 +00:00
TreeHugger Robot
3ff66be05a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496

Change-Id: Ia7d530db0b0b29d1f927da0ef723360a69a14b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:25:19 +00:00
Bill Yi
84ce084f90 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496

Change-Id: Ib17ef4b92b91a29d269755ff32c20197c18cfb18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:25:03 +00:00
Bill Yi
bc5abed2bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984

Change-Id: Ibdf0138afbf959edefbf88629e3d5f79ac2097c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:24:44 +00:00
TreeHugger Robot
377685d4a6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-15 17:19:07 +00:00
TreeHugger Robot
7d8655936b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-07-15 16:56:40 +00:00
Bill Yi
30c5704504 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic8eeb16a4833dccdf9924faefd2b2b341ec2d1da
2022-07-14 13:47:48 -07:00
Bill Yi
fef55df6ec Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8d79670567a1f2b81f59e9a447c27fcde72a0c4e
2022-07-14 13:38:25 -07:00
Bill Yi
2ff486543a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I089f4ebab3776b2e32596948e43eb1564f38273d
2022-07-14 13:28:43 -07:00
Bill Yi
60b5937fb7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5e84134712147a92c064b7e0e85b58c201bb046e
2022-07-14 13:24:54 -07:00
Treehugger Robot
52afebe91e Merge "Fix ExtraText lint errors" am: 000bc450b0 am: 91420db7c7 am: 2058af23ac
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272

Change-Id: Id7da7c8d7565087f996577689c7515b3094dcf2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 12:23:06 +00:00
Treehugger Robot
2058af23ac Merge "Fix ExtraText lint errors" am: 000bc450b0 am: 91420db7c7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272

Change-Id: I0caf8634598434942ce4e3ecd2bbd3c32adf1fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 11:58:53 +00:00
Treehugger Robot
91420db7c7 Merge "Fix ExtraText lint errors" am: 000bc450b0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272

Change-Id: Ia0f5c48b9581ab8722c06e226acd59e9ac18cde3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 11:32:07 +00:00
Treehugger Robot
000bc450b0 Merge "Fix ExtraText lint errors" 2022-07-14 11:14:59 +00:00
Bill Yi
415f1b8706 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icdb743843e5eeee000e53ea68ae48f5cbff3da14
2022-07-14 01:20:34 -07:00
Bill Yi
3f841a2af4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibfecfad7ee6ee8cc86fefe7107d8e78bbbf40372
2022-07-14 01:17:02 -07:00
TreeHugger Robot
c2908edff1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0e046fc4ae -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19241408

Change-Id: I43af99d9dbdedea318fd7d53bf341629efb56624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 05:19:43 +00:00
Bill Yi
fd7fcb1094 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19241408

Change-Id: I67076fc837020ff031bb770a9174889dc3e28284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 05:19:17 +00:00
TreeHugger Robot
0e046fc4ae Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-12 04:54:58 +00:00
Amy Hsu
ef540c685d Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855

Change-Id: I7f6bf6ad05de82ad77ced5bd776c3602f4057290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 04:15:31 +00:00
Amy Hsu
1f7fab03c8 Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev 2022-07-12 03:54:27 +00:00
Bill Yi
3d4eb4f4b9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I043b44e648cce2709d66ea0b0cdc4c367de844d6
2022-07-11 11:59:15 -07:00
ot_hemant.yadav
9a72877c7c Crash happens if back button is pressed during "Format as Portable"
SD card format as internal, during migrate process press back key or  During "Format as Portable", 
press back key crash happened.

Fix:
Hide the bottom navigation from that particular activity so that user can not accidentally 
press back key.
/packages/apps/Settings/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
/packages/apps/Settings/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java

Bug: 238596768
Test:
1. Insert sdcard or generate virtual disk using command : adb shell "sm set-virtual-disk true"
2. Go to Settings -> Storage -> SD Card -> Format as Internal -> move later
3. After step 1, back to storage
4. Again enter in Storage -> SD Card -> to do migrate data
5. during migrate process press back key
6. Storage -> SD Card -> Format as Portable
7. During "Format as Portable", press back key

Change-Id: I1f393ffb872bb90d7dfeb4e1c86648b3413645a1
2022-07-11 17:21:04 +00:00
Bill Yi
46b5269704 [automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 2fcb15c9c1 -s ours am: 43bed90ebd -s ours am: 40bd36207e -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147156

Change-Id: I021fd2f8d5b94fd97e3eb44b49ba80db2688bd3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 21:34:37 +00:00
Bill Yi
cc6cd60c19 [automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am: c73b07dc76 -s ours am: 588a5a1577 -s ours am: 5b0b300d4d -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147156

Change-Id: I27f6876d85ea0a65ad898391cc22dbfbd1d6cc09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 21:34:24 +00:00