PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,382 Commits 1 Branch 0 Tags
28d6d5a7c29a69b61d51e9468cb55ef679b2124c
Commit Graph

104382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
40bd36207e [automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 2fcb15c9c1 -s ours am: 43bed90ebd -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I187c11de027edbb3af45aad590f5ecbccce22d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:07:52 +00:00
Bill Yi
43bed90ebd [automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 2fcb15c9c1 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I2d2d69938247a8c9e5b6eaf778631f172d0ecc5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:34:05 +00:00
Bill Yi
2fcb15c9c1 Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" 2022-07-08 20:14:12 +00:00
SongFerngWang
9712359f25 [MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541

Change-Id: I7c0faaee0483eab1f36f6ba5646366f2ab523318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 19:07:19 +00:00
Bill Yi
c73b07dc76 Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE 
Merged-In: I5ea05490d13515baaeda9ea7b6c153c8c2d0a54e
Merged-In: I7a2a0e8da3ae59219e9984e8437ce0b1e007bce2
Change-Id: I677947b60b051c89293ca58359cb56b8cbc63ec8
 2022-07-07 15:33:30 -07:00
Xingbin Feng
3cbff800a3 Fix incorrect storage calculation when SD card is inserted 
The displayed internal storage is incorrect when an SD card
is inserted into the device.

Bug: 209962845
Test: Insert an SD card with some content. The System
storage calculation should remain unchanged.

Change-Id: I0a338bc306c0ade68747356714cd291e209a5069
 2022-07-07 14:42:57 +02:00
SongFerngWang
286dce6b6e [MEP] Hide the preferred SIM dialog when the user has replaced the SIM 
Since there is the race condition and it causes UI hides the preferred
SIM dialog. Therefore, to hide the preferred SIM dialog under the
specific condition which the user has replaced the SIM during the
SIM switching.

Bug: 238061853
Test: Manually testing. Device has the psim+esim and the esim's mobile
data on. The tester disables the esim and then UI shows the preferred
SIM dialog.

Change-Id: I01e7d60170c5053730fd3113abd914fb5c0d11c9
 2022-07-07 08:39:03 +00:00
Bill Yi
23a80ba165 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic0855ac7f08ed8b89a777d6ad44d055ea4587d1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:02:11 +00:00
Bill Yi
3296352cb0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb762e9b5d1c59fdb134231c957be4fa03b21a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:02:03 +00:00
Bill Yi
f6c853f21e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I854f5987c485074367678b4028f88d2bf483b2a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:01:56 +00:00
Bill Yi
1fd3156ec7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4e9f640550a6ba839080bf5db6a76def2ca2f7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 05:34:08 +00:00
Bill Yi
992e8328bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6664f45591969573c47e8de87c2aa1f9015ddc3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 05:34:05 +00:00
Bill Yi
50eb4245cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id50143411336cc13e6c029cb2789150b50544f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 05:33:54 +00:00
Bill Yi
44c1f479d3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-07-06 05:05:28 +00:00
TreeHugger Robot
c5c74f5a8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6de70d1e703e3632363a72885dc5ad5285318116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 02:42:35 +00:00
Bill Yi
0b94e5f66d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8af9335c44b365900d73ec367d38825e4a103aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 02:42:28 +00:00
TreeHugger Robot
e2cd20fa19 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-07-05 02:25:30 +00:00
Bill Yi
42a9f1d87e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9758a1fe9b7cf21bd95d0bb0d3d1dc63604b557b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 01:51:34 +00:00
TreeHugger Robot
3512ebb5cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6f09916f9d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I511901375a3715a64bc7fa39d172c26289e26bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 01:12:36 +00:00
Bill Yi
0890e485b7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d5864095 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I49c81a9ccbfec0f3542f6c1f72c92da212d11091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 01:12:04 +00:00
TreeHugger Robot
6f09916f9d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-07-05 00:45:36 +00:00
Bill Yi
72134f4c83 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaab33a1f7bdac3231cad97238a8e9cb23427dc58
 2022-07-04 12:12:55 -07:00
Bill Yi
cab8532874 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6a7c146633f64ddf3a5b0810491dd8753be7d18b
 2022-07-04 12:00:44 -07:00
Bill Yi
2c65a1d804 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8fb18f2250c868b4015d64f81d830d0391799479
 2022-07-04 11:50:26 -07:00
Bill Yi
b55af7d44d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I457c216efddb0aff3f15c205d2bda71edc386e1b
 2022-07-04 11:44:35 -07:00
Bill Yi
72d5864095 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5ea05490d13515baaeda9ea7b6c153c8c2d0a54e
 2022-07-03 14:12:52 -07:00
Bill Yi
1f4237da27 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic08c9ecc8d5fe64b43b00c9f87860ee2a5f5b46b
 2022-07-03 14:08:30 -07:00
TreeHugger Robot
2ec12f7701 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic84b8415af1de525b81779425e03f4873344819d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 15:58:39 +00:00
Bill Yi
281a9b7507 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97870469241d1530ef0acbf7dedaa7dc88994ab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 15:58:22 +00:00
TreeHugger Robot
ccd485016e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-07-01 15:38:52 +00:00
TreeHugger Robot
2b381151ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f2e5977255 -s ours am: f4cd4b3e68 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d073b6b6b8b8680444823f741ba1c41e5d10a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 01:19:25 +00:00
Bill Yi
a293be06b3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3775e246dc -s ours am: 917e5c6946 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I175f16ff0c8a7082ecbce314f3ab8cc4f67db90d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 01:19:16 +00:00
Bill Yi
06a535e65b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b107521284 -s ours am: 76e5357179 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: Icd1c31e6aabd54fe37a1b77672e5a1dcd283149a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 00:55:20 +00:00
Bill Yi
917e5c6946 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3775e246dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If9683f5b976bfab3918f005cc8b68fcf3ffd6049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 00:55:13 +00:00
Bill Yi
76e5357179 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b107521284 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I33287c4d5f853781a2ed551193a7698a0164dcbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 00:54:56 +00:00
TreeHugger Robot
f2e5977255 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-07-01 00:34:38 +00:00
TreeHugger Robot
ac7353415b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a7ad998247 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idab4a3a547e8b24a520d63ae53f20a1445e581a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 23:58:04 +00:00
Bill Yi
13ff0e1f4a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36728d9972 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11a38506e61e3d547860ba74da3a466d3d190a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 23:57:45 +00:00
TreeHugger Robot
a7ad998247 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-30 23:33:57 +00:00
TreeHugger Robot
763c57727e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a28bac49f9 -s ours am: de76b7c0c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia4ee7e4ef6b3a1a8abe5b1b0b91c1b9d45cb69bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 22:36:16 +00:00
Bill Yi
7ce77f731d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37a1fad359 -s ours am: e725f74df6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2d1fed1764f95efa440204ca2ba4b49d1e95d4c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 22:36:14 +00:00