Bill Yi
e0c74c9f4c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035804
Change-Id: Ia18bb4a94e58e722ee81f58210eef4c306a72bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-27 17:55:41 +00:00
Bill Yi
d267bd8655
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035804
Change-Id: Icfb4d78c4245679bc0c62b696e23263a9183d353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-27 17:55:34 +00:00
Bill Yi
ff2b23ea95
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035804
Change-Id: Iffe1907092d830d4395f8292069529c448ec88ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-27 17:55:30 +00:00
Bill Yi
0928d5bbaf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035381
Change-Id: Ibd385a535680b4674adc83a4650cc86f8be59192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-27 17:55:18 +00:00
Bill Yi
efa32dc352
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035381
Change-Id: I0c2c7fa020fb3bb13fd41213e92fcb8b4d8683b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-27 17:55:15 +00:00
Bill Yi
dbe25724d6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-09-27 17:11:14 +00:00
ot904699
aa76620073
Fix USB OTG hot plug out nndexOutOfBoundsException
...
Open Settings, then open Storage , plug in USB OTG with Disk, select Disk, open Files, play a video, press the back key, hot plug out USB OTG, the IndexOutOfBoundsException will happen
The root cause is when received the onVolumeStateChanged in StorageEventListener in StorageDashboardFragment, the volumeInfo
status is VolumeInfo.STATE_UNMOUNTED or VolumeInfo.STATE_EJECTING, mSelectedStorageEntry set to changedStorageEntry, cause the fail.
This is a fix for CL 225095144 bug.
Bug: 247737688
Test: Manual
Change-Id: I9535c49d65c42a8dfa8ccf4e271ae973d944d4b9
2022-09-26 08:15:48 +00:00
TreeHugger Robot
6b68056ab6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83ffbfacbc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035807
Change-Id: Ia8d350fd3268d547a91f443b245742a77b3aa594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 05:43:09 +00:00
Bill Yi
c802b51978
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c4e5bdc5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035807
Change-Id: Id3fae5f4eb9984d9fe3aadee1ce847067d59753d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 05:43:03 +00:00
Bill Yi
44c4eadbd3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8be26784c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035382
Change-Id: I1a66f517313d9543447a17e62d063c0c9b233238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 05:42:39 +00:00
TreeHugger Robot
83ffbfacbc
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-09-26 05:13:10 +00:00
Bill Yi
9e24f47b92
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e
-s ours am: 1b68f107cf
-s ours am: 9c58f1e6d5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: Id3d18979de5a6edcafa9c9873842f192e5bc2fc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 04:02:43 +00:00
Bill Yi
cf6bdfbf1c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94
-s ours am: fa5c30b611
-s ours am: fc1eb27c1c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: I64e785ee741a47e1852645b5013c9cf5f9fc9977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 04:02:28 +00:00
Bill Yi
3f81e0c4f4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294
-s ours am: 44f10293dd
-s ours am: 687ba7a903
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: Ic3b007c53d6692c289c3cc4205b709d8fe64a6fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 04:02:08 +00:00
Bill Yi
99dffa3013
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886
-s ours am: b9925d6346
-s ours am: 7687eee85f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: I3133d34aed69f46827676b1ebd82930caa98b8d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 04:01:46 +00:00
Bill Yi
9c58f1e6d5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e
-s ours am: 1b68f107cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: I220d0e40fe818db047ad044eaebf353b4c3a9453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:41:25 +00:00
Bill Yi
fc1eb27c1c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94
-s ours am: fa5c30b611
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: Ia71f310fee9bcaacc1a85cbdfa67d4a7410753b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:41:10 +00:00
Bill Yi
687ba7a903
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294
-s ours am: 44f10293dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: Ic109f908fef58e17b1d2bcd2538f33140bcd5330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:40:50 +00:00
Bill Yi
7687eee85f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886
-s ours am: b9925d6346
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: Ie1172379e741d3e5062ea530ad2ef3af7cd44ef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:40:25 +00:00
Bill Yi
1b68f107cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: I39d93229b5aa9287c75457e4ff245d24a028b157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:24:36 +00:00
Bill Yi
fa5c30b611
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: I84b37db6b17af0d646b7855a3e2243ef4b917dab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:24:19 +00:00
Bill Yi
44f10293dd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: Id841745bd202fd7524b6707bd44260d4160cc22c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:23:59 +00:00
Bill Yi
b9925d6346
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: I41d225d2cf538ae26bdfc4a8a0aa65fddc36c8aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:23:36 +00:00
Bill Yi
5419d3f04e
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-09-26 03:07:25 +00:00
Bill Yi
2a57051294
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-09-26 03:07:25 +00:00
Treehugger Robot
984e74a32e
Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
am: 61d8dee2a0
am: 41e0e6fea7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259
Change-Id: I03ee47dea1bfc1ac0f5d6f49e738346571f304e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-24 09:57:27 +00:00
Treehugger Robot
41e0e6fea7
Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
am: 61d8dee2a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259
Change-Id: Iaeef4967d528aca3e4d66f98952635cb97ed9350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-24 09:27:24 +00:00
Treehugger Robot
61d8dee2a0
Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259
Change-Id: Ib4c2a39144bfe7870f39e5797cf42c75b9a49572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-24 08:54:52 +00:00
Treehugger Robot
4d5951c6ef
Merge "Settings: Protect sensitive data on the about phone"
2022-09-24 08:23:53 +00:00
Bill Yi
a068e61a94
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0ad02e480a4a792ddeaa12e07a12f968659d3faa
2022-09-23 11:04:43 -07:00
Bill Yi
53322b1886
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4a5a43e5ad52047121da5fc18e8cdfb7a84e1556
2022-09-23 11:01:33 -07:00
Bill Yi
c8be26784c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3903a5eb2bf9afbef9e01a6c8a2dd2ace0c5c371
2022-09-23 01:09:13 -07:00
Bill Yi
4aae182edf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6820f433e9bc4442d0dce43f543563b3797ccfd4
2022-09-23 01:03:30 -07:00
Bill Yi
e0c4e5bdc5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia10e24de0e735de77ae7be26c0febfccf589825c
2022-09-23 01:00:36 -07:00
Tom Hsu
1a4f16cd70
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90
am: 7e610abd3c
am: 7c813dced4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Iaccb8b8c54a5f84ed3ca6fec869ba0153f4eb623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 07:59:37 +00:00
Bill Yi
c46e0e3d6e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If66addd4f08126800df1980cf1adba4cd71788e1
2022-09-23 00:58:17 -07:00
Tom Hsu
7c813dced4
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90
am: 7e610abd3c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Iacf9e213bb1f40859320957d7846803f4aeaa30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 07:32:19 +00:00
Tom Hsu
7e610abd3c
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Icd4cb165939b49e24ebbc83059c55914610e7eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 07:01:01 +00:00
Tom Hsu
8a9dc9ca90
Merge "[Settings] Update UI when bluetooth connection is down."
2022-09-23 06:39:35 +00:00
Gil Cukierman
ccfd44162f
Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a
am: 24ac97a0bf
am: 1f750fcba6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737
Change-Id: I43a581174938d47bb6b5aea5eb552057a5ce9b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 16:12:54 +00:00
Gil Cukierman
1f750fcba6
Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a
am: 24ac97a0bf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737
Change-Id: I50305e27b205160d85825143f614cd52b1bab2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 15:23:54 +00:00
Gil Cukierman
24ac97a0bf
Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737
Change-Id: Ib46bd4f287a80582afb67f7ef052a3ff25862b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 14:30:53 +00:00
Gil Cukierman
594002e21a
Merge "Use AAPT2 For SettingsUnitTests"
2022-09-22 13:40:19 +00:00
tom hsu
3d138b372b
[Settings] Update UI when bluetooth connection is down.
...
- When Airplane mode on, all connection shall be disconnected. In
current design, when bluebooth disconnected, network page in Settings
does not udpate the UI.
Bug: b/246925011
Test: Maunal
Change-Id: I1bf56e96737157d8e76057028b22e94e0e8d76e4
2022-09-22 19:34:35 +08:00
TreeHugger Robot
8849c71d38
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6
-s ours am: 323d7fa302
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Ic0ff3c28c3c810ee4a2b026ddaaea3c582303591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:27:13 +00:00
Bill Yi
dd99336380
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b
-s ours am: 5d5b545e3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Id2519e8ee136982781b6900db4e51750a0867364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:26:56 +00:00
Bill Yi
5d07821c08
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3
-s ours am: f15ab25c5b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: I141e9f19a823a7dc5acb56aea963f613e571f39f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:26:44 +00:00
TreeHugger Robot
79dbc576ec
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6
-s ours am: ac3b26c186
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I7658bd07de80149507d170281bad250b7654539c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:47:13 +00:00
Bill Yi
3e363c0549
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b
-s ours am: f6a5f7a782
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I2ef6f1ef7674f64d7f239f7424f68423f846ff38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:46:57 +00:00
Bill Yi
c2faa5ccc6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3
-s ours am: 9cc6bc637f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: I6b2953e71ef984f008f2fc2762d5fe3804f6b702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:46:41 +00:00