PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,390 Commits 1 Branch 0 Tags
8e11085436eb0c68c9f287c822f79b1cb50ad2fd
Commit Graph

114390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zaiyue Xue
8e11085436 Fix b/242989581: The two battery charts have the same label 
Bug: 242989581
Fix: 242989581
Test: manual
Change-Id: I8fc6c13351b46f4e29daf2f28201d99d8087092f
 2022-08-19 14:33:03 +08:00
Treehugger Robot
48b4af999a Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b am: cdacabf984 am: 49a0bbc650 am: ac7a368afd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: I0ebc25250b00a36bef5a72dd87192013b08e098f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 20:53:49 +00:00
Treehugger Robot
ac7a368afd Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b am: cdacabf984 am: 49a0bbc650 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: I9c4c43088154202d5818b29d010f053a7630ec90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 20:29:36 +00:00
TreeHugger Robot
aa21979d79 Merge "Fix b/242009481: Refine the battery usage chart timestamp label rule" 2022-08-17 20:27:55 +00:00
Treehugger Robot
49a0bbc650 Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b am: cdacabf984 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: I1ce70edf6d735df8340f4ec483dbe3fc4df7b897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 20:11:01 +00:00
Tsung-Mao Fang
9c826fe1f7 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours am: 662e5722b3 -s ours am: a2172abb33 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: Ia941a9dec4fab948352e4642fd8a7e44c6ebe4f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:48:15 +00:00
Tsung-Mao Fang
4346c1edeb [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours am: a27edf0a5a -s ours am: d71843cb7a -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: Ia555ddb9ba1a75356012de36d4caddc83ca83122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:48:06 +00:00
Tsung-Mao Fang
68e5a2fc39 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 am: 56c191d288 -s ours am: fed58ddcd0 -s ours am: 2ecdc63708 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: I05d9101fbd11f27a04a8dfaa54bad9f1fbce39d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:45:42 +00:00
Treehugger Robot
cdacabf984 Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: Iac4c2bea65889fbb3847794fc7a8b1d23ff2f9b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:44:42 +00:00
Tsung-Mao Fang
a2172abb33 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours am: 662e5722b3 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: I3def89776e44038f96c7ba7e9bcabaa81a2cd31d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:26:25 +00:00
Tsung-Mao Fang
d71843cb7a [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours am: a27edf0a5a -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: Iab55b2c0976dae5e333ffdcebeddcc65ac536696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:26:03 +00:00
Treehugger Robot
a89e7aea3b Merge "Fix array-related errorprone warnings" am: a93e78f781 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: I644d5974c31a216b360a2dc1d1b1c156f6288f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:25:27 +00:00
Tsung-Mao Fang
2ecdc63708 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 am: 56c191d288 -s ours am: fed58ddcd0 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: Iec82fac54be6f461bc8754b46a08636814a8e899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:24:59 +00:00
TreeHugger Robot
2bc09010d8 Merge "Fix b/242809981 Charge battery to 100% when battery usage page opened, the chart will refresh, but the app list isn't refreshed in that case." 2022-08-17 19:01:27 +00:00
Tsung-Mao Fang
662e5722b3 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: I9075895f07ea2a3bf74ab70aab62439ab19244ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:49:20 +00:00
Tsung-Mao Fang
a27edf0a5a [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: I0c6902c38a253d0c1a17211355b75419abcc6199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:47:42 +00:00
TreeHugger Robot
8da2082885 [automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 am: 7f32697692 -s ours am: e671474e54 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: Iad8f7328b28626ce01095e4fe6a4f0ce8274a265
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:42:36 +00:00
TreeHugger Robot
c09a147e2c [automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 -s ours am: 84935ceab8 -s ours am: a1e365891f -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: I7d0fbdf32c82bdb5981b811c1a8ba4e438fcb918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:42:27 +00:00
Tsung-Mao Fang
a1a3fdc095 [automerger skipped] Wi-Fi panel doesn't need to check permission am: d2c372450c -s ours am: fa5900b6ba -s ours am: 39f5e29a4e -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: Idde9870d03c465557a36b851d73857e2d1c7d57b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:42:25 +00:00
Tsung-Mao Fang
fed58ddcd0 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 am: 56c191d288 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: Ic55a9d1f05cb6c0fb2a84626d596983ef3f0ba34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:40:29 +00:00
Tsung-Mao Fang
5a1743ecba [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 am: 36d1a62382 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: Ica25f8d7c3fd0c7c11ec91dde7c47ee80d021dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:39:53 +00:00
Treehugger Robot
a93e78f781 Merge "Fix array-related errorprone warnings" 2022-08-17 18:37:46 +00:00
TreeHugger Robot
e671474e54 [automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 am: 7f32697692 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: Ib1cde7a72e43ef82db43b15e2d029857b4f0e18c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:12:29 +00:00
TreeHugger Robot
a1e365891f [automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 -s ours am: 84935ceab8 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: I9dc41d0c0081fc1a6f5fc7f9e8681bb8ce2dc555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:12:04 +00:00
Tsung-Mao Fang
39f5e29a4e [automerger skipped] Wi-Fi panel doesn't need to check permission am: d2c372450c -s ours am: fa5900b6ba -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: I201879780c8ae74b917f0d0b9f6d1f8efca3dc0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:12:01 +00:00
Tsung-Mao Fang
4e53971f19 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: I22b02fef7d8f63615f203fa3634d47b2d369cc96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:11:47 +00:00
Tsung-Mao Fang
36d1a62382 Wi-Fi panel doesn't need to check permission am: 5e785a2d99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561

Change-Id: I24f7695ab202389ab092bb242e395e2a89f59532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:03:50 +00:00
Tsung-Mao Fang
56c191d288 Wi-Fi panel doesn't need to check permission am: 5e785a2d99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561

Change-Id: I78c410c92c0d7f8d828fab92db97303814a09ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:03:31 +00:00
TreeHugger Robot
7f32697692 Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19590400

Change-Id: I65697bb252fe44e18cbca6ca1a7b74e8d66f18ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:47:32 +00:00
TreeHugger Robot
84935ceab8 [automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: Ie074b5d8865a251480f7e8d116542296e5253be4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:47:13 +00:00
Tsung-Mao Fang
fa5900b6ba [automerger skipped] Wi-Fi panel doesn't need to check permission am: d2c372450c -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: I2fe3c73254c35c778191cf8899fccf48dcab7a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:47:08 +00:00
TreeHugger Robot
75ee88eaa0 Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev 2022-08-17 17:16:52 +00:00
Robert Luo
2dcc5e154b [automerger skipped] Merge "Allow advanced VPN to manage connection status via its UI" into tm-qpr-dev am: 63aca8e131 am: c6d8ef82c4 -s ours 
am skip reason: Merged-In Ia6f1d84bba38bab7f13f46dc8a4fdb4eb0505f8f with SHA-1 061a87fe1f is already in history

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

Change-Id: I8b3040f4bc83b7055431c07d1305f1a9519c9cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:38:43 +00:00
Jason Hsu
6a0fd169fe Merge "Add pair button in bluetooth details page for hearing aid device" into tm-qpr-dev am: f21593c870 am: cd76ba8821 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19569012

Change-Id: Ic1bc7a3ef9f13437592088642411cb031b87004e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:06:51 +00:00
TreeHugger Robot
86f436dd0d Merge "Consider usage map valid even if [all][all] is null." 2022-08-17 14:43:48 +00:00
Zaiyue Xue
e716055e45 Fix b/242809981 Charge battery to 100% when battery usage page opened, the chart will refresh, but the app list isn't refreshed in that case. 
Bug: 242809981
Fix: 242809981
Test: manual
Change-Id: I303bbc2679f70ef16636c28f6364381f49457387
 2022-08-17 12:59:50 +00:00
Kuan Wang
508d938bc8 Consider usage map valid even if [all][all] is null. 
Bug: 242835128
Fix: 242835128
Test: manual
Change-Id: Icd8e157f08d741604b5769464d74660651eb69df
 2022-08-17 19:18:16 +08:00
Zaiyue Xue
b4fe32640f Fix b/242009481: Refine the battery usage chart timestamp label rule 
Draw the first and the last labels. Then recursively draws axis labels between the start index and the end index. If the inner number can be exactly divided into 2 parts, check and draw the middle index label and then recursively draw the 2 parts. Otherwise, divide into 3 parts. Check and draw the middle two labels and then recursively draw the 3 parts. If there are any overlaps, skip drawing and go back to the uplevel of the recursion.

screenshots: https://drive.google.com/drive/folders/11AJ4Fz6xS76LGlbAy9WfvjZpffgFkMji?resourcekey=0-HBWCQa1oQW4e0UfvLzEXGQ&usp=sharing

Bug: 242009481
Fix: 242009481
Test: manual
Change-Id: Iaa9019feba7693638d5ae64bbbee7298eb74f749
 2022-08-17 08:50:54 +00:00
Xin Li
5171a38fe2 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c27f705eb7 -s ours am: 070c045837 -s ours am: 60b4260064 -s ours am: 0257fe3a5a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I549b161efceba48b521b2c5553b255991563e420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 08:42:43 +00:00
Xin Li
21d59ea11c [automerger skipped] DO NOT MERGE - Merge Android 13 am: 48b65ca561 -s ours am: 98c2ff5b3b -s ours am: 98393cab55 -s ours am: 57ee5a5d99 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc5d4d15c02bb4e025815b00e0e84314421ae7d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 08:42:41 +00:00
Chloris Kuo
10655035f1 Merge "Fix settings crash when enhanced notification shown in search results" into tm-qpr-dev am: 4d4bf61c4c am: 41e650c223 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19641993

Change-Id: I4bab6a8367b3edd7f6e5a7cb94a4652f76832708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 08:40:50 +00:00
Julia Reynolds
d1344b38dc Merge "Update Bridged app link when NLS access changes" into tm-qpr-dev am: dbaa419226 am: 80e1ca7c54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19624197

Change-Id: I80cbd2726cf3609a1f266e46b728b1d632ea8abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 08:35:03 +00:00
TreeHugger Robot
be40159399 [automerger skipped] Merge "RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature" into tm-qpr-dev am: ea3f9f337e am: 43415ece54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2edef61193152600907617b029777585aa05cd47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 08:33:16 +00:00
Hugh Chen
0856c6d470 [automerger skipped] RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature am: 1311019b9a am: 2358afae79 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ef0e99276fe5fb7532858280af724656eb7311d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 08:33:15 +00:00
Treehugger Robot
4746c34212 [automerger skipped] Merge "Remove luyota from OWNERS." am: dcd3081158 am: d3a358910b am: c50439e229 am: b7d0aaca3c am: cf01938b05 -s ours 
am skip reason: Merged-In I6a8139e569a31ea3983df0db970a36b841e646d4 with SHA-1 b4e07cdff4 is already in history

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

Change-Id: Id67f162b68d65e65ac2a21010a157cff83fdcbbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 08:20:52 +00:00
Menghan Li
84374522ea Merge "[Captioning preferences] Fix wrong color if default color selected" 2022-08-17 08:20:48 +00:00
Angela Wang
82140a2b73 Merge "Fix wrong visibility of link button in a11y tutorial dialog" 2022-08-17 07:38:46 +00:00
Weng Su
47b5595159 [automerger skipped] [RESTRICT AUTOMERGE] Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID am: 911573f2e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ac1ffcc0af1e11d61361295231c0231d027ac63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 07:35:26 +00:00
TreeHugger Robot
bff59850d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ec740c30d5 -s ours am: f38346a569 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3900b3c1f912ad9f6ad8c053dc673303d5356cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 05:06:55 +00:00
Bill Yi
b48490b282 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2337f90b7e -s ours am: 94e8fafbf2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e33c72c5bb67a4fff0cec744280fa6464e6c2f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 05:06:36 +00:00