Commit Graph

102535 Commits

Author SHA1 Message Date
TreeHugger Robot
e6ecfff870 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours am: 6c9433b31e -s ours am: 2a21fa1024 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id3016b501da1528f4ff2e36b6a3eeb2d051f8a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:57 +00:00
Bill Yi
c0bf62368b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours am: 1a4297414e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd4216b0320c03ed78e20caeeb9fdbee0ead6eab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:56 +00:00
Bill Yi
a01a68689f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours am: 53993399da -s ours am: 44f1eb9246 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib69e8795a0db09502a3b27f595e4c6f61fc2f450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:02 +00:00
TreeHugger Robot
2a21fa1024 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours am: 6c9433b31e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5113f388898f79c43b714ec80cd73b19e75814a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:05:01 +00:00
Bill Yi
1a4297414e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1806d21043651eccf7da31df5bc4268782bb3d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:05:00 +00:00
Bill Yi
44f1eb9246 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours am: 53993399da -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie7a15d3be281479c7e29f34a2862ca9e1c0dd15e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:04:48 +00:00
TreeHugger Robot
6c9433b31e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1109dc7c1fa291d2a19dc0b14b8facfa01a6d411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:31:33 +00:00
Bill Yi
e0da5747da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5099a137fe14d98967f9d055bfcd4c41d8d4f05a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:31:27 +00:00
Bill Yi
53993399da [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d10981a2dc1b03f85c26814667640167620a5b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:31:19 +00:00
Lucas Silva
d7e5195565 Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: I7ff9e34ba73ec61aa8cf75fbf23ad79afe3bcde8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 14:45:19 +00:00
Lucas Silva
dc44eb1feb Merge "Update dream settings logic to keep the customize button unselected." into tm-dev 2022-05-02 14:19:22 +00:00
Joshua Mccloskey
d7855afb3e [automerger skipped] Merge "Fix final UDFPS enrollment haptic." into tm-dev am: 8f463f5c88 -s ours
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history

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

Change-Id: I1c40b68911a323745512d79fcfb9a2255910b755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:30:44 +00:00
Joshua McCloskey
8495275d81 [automerger skipped] Fix final UDFPS enrollment haptic. am: b7f3001cea -s ours
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history

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

Change-Id: I673c3e1f547220846b81630906ef7ce6e0a193c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:30:43 +00:00
Bonian Chen
b32415b955 Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069

Change-Id: Ibfd126ebd63971e4e3b9f4f2429213c6039b2ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:28:38 +00:00
Bonian Chen
01e97e371e Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870

Change-Id: I064026298e1dedeb9bdd8cc170c413aa20739deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:28:30 +00:00
TreeHugger Robot
d1c67e389d Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823

Change-Id: I56cba95face2b3c989abc77ed0a520f29b6ed8b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:28:22 +00:00
Jan Tomljanovic
3c357dec8a Merge "Update the SafetyCenter icon" into tm-dev am: 297028ea69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029249

Change-Id: Ic4eb2afbbfed8bc6353f9d79dc3451c789166243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:28:15 +00:00
TreeHugger Robot
1c16e6b314 Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822

Change-Id: Id017a3a3b3a67cd98f0727cd476a86b9ce248fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:28:08 +00:00
TreeHugger Robot
7d1f75839d Merge "Remove tab symbol for app pinning strings" into tm-dev am: 5d31a69d65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030885

Change-Id: I8367ebd5ba89af527152ad41cb0446abd8d5370e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:28:01 +00:00
Chaohui Wang
19356dae5d Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070

Change-Id: I43b852b5c2ae039e20f40ee0d91ed842caf79998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:27:54 +00:00
Tom Hsu
169517aacc Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev am: 1d0f85a3d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030882

Change-Id: Ia047213d433f4829bb134f0fbbfc7e8c4c1d6f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:27:46 +00:00
Arc Wang
7a530c79ec Merge "Prevent side channel package installation enumeration" into tm-dev am: a3c7f8482a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944167

Change-Id: I822332ea3404102dc25aaeb6db9e6c329a943d47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:27:39 +00:00
Joshua Mccloskey
8f463f5c88 Merge "Fix final UDFPS enrollment haptic." into tm-dev 2022-04-29 22:59:19 +00:00
Joshua McCloskey
b7f3001cea Fix final UDFPS enrollment haptic.
Test: Verified both accessibility/non-accessibility flows
have correct haptic feedback.
Fixes: 229804277

Change-Id: I8623771016b9819d4211d07a19b50291a8b06cd9
Merged-In: I8623771016b9819d4211d07a19b50291a8b06cd9
2022-04-29 22:52:44 +00:00
Lucas Silva
e2ef52d6f1 Update dream settings logic to keep the customize button unselected.
Test: manually on device
Bug: 227717835
Fixed: 227717835
Change-Id: I4d796c3b7510baf07a670347fe4112a0b95d3036
2022-04-29 20:43:20 +00:00
Julia Reynolds
1f912cbfe3 Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961

Change-Id: I76028b997fab517cb28d5dacc821c80cf777ec84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 17:14:31 +00:00
TreeHugger Robot
6708570e2c Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824

Change-Id: Ia8cb12f3f41c3f9ba8cf5ef85d5d012a5fe7053c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 17:14:05 +00:00
Calvin Pan
38fac79ee6 Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006

Change-Id: I0314d4cf0c8d2232da05fd6b8eb9f417d718ecbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 17:13:57 +00:00
Betty Chang
ec17c47421 Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166

Change-Id: I27aae2227a69fbe547a974e2d8a1054f1d87108d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 17:12:59 +00:00
TreeHugger Robot
70e4a209c8 Merge "Remove loading spinner from Premium SMS access" into tm-dev am: 611db9e8be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903584

Change-Id: I8145b6fae18d039c59cb7ad542d8623d94b4e3c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 17:12:25 +00:00
YK Hung
fc95a8f973 Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev am: 55fcb02aca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030883

Change-Id: Ife069490f25bb4b7fbabf49992537711b21d5266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 17:12:15 +00:00
Bill Yi
f7c06375b1 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 2p: 737ee1e1a7 am: fa29c0c3bc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I11013b1af35da8dfc6794f1fd656df9ea46d2243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 17:12:04 +00:00
Bonian Chen
5ef52de6b2 Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev 2022-04-29 16:00:31 +00:00
Bonian Chen
7bdf717410 Merge "[Settings] Rename title of SIM UI when changed" into tm-dev 2022-04-29 15:59:32 +00:00
TreeHugger Robot
38989c9c6a Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev 2022-04-29 15:16:44 +00:00
Jan Tomljanovic
297028ea69 Merge "Update the SafetyCenter icon" into tm-dev 2022-04-29 13:38:38 +00:00
TreeHugger Robot
30bba3bbdb Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev 2022-04-29 09:51:21 +00:00
TreeHugger Robot
5d31a69d65 Merge "Remove tab symbol for app pinning strings" into tm-dev 2022-04-29 09:43:23 +00:00
Bonian Chen
ba943c9b94 [Settings] Rename title of SIM UI when changed
Title of subscription page should align with the SIM card.

Bug: 230308627
Test: local
Change-Id: Iab9ba25ac8c3faf7d37f97c8f3f3488cbaa2e228
2022-04-29 09:10:47 +00:00
Chaohui Wang
71e03076cd Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev 2022-04-29 08:26:24 +00:00
Tsung-Mao Fang
a95b12f921 Remove tab symbol for app pinning strings
The pinning description can't align together
in certain device.

To mitigate the alignment problem, we try to
remove the \t character now.

Test: visual
Fix: 222617691
Change-Id: I35974caf9d6fa316a6e4a0a5200ccab6a80f915b
2022-04-29 07:41:33 +00:00
Tom Hsu
1d0f85a3d6 Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev 2022-04-29 07:14:14 +00:00
Arc Wang
a3c7f8482a Merge "Prevent side channel package installation enumeration" into tm-dev 2022-04-29 07:12:06 +00:00
Bonian Chen
0f68faf996 [Settings] Avoid from crash UI when querying data usage
Screen update been requested while querying data usage and response not
yet available.
This change tried to avoid from updating the UI in this case.

Bug: 210664126
Test: local
Change-Id: Id055fbd441936a9842b4acc978a894a855165bb7
2022-04-29 14:28:19 +08:00
Julia Reynolds
312de956ec Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev 2022-04-29 05:11:26 +00:00
TreeHugger Robot
fc6cb73d29 Merge "Hide running time information for "Android System" entry" into tm-dev 2022-04-29 04:32:41 +00:00
Calvin Pan
8ad2642b5f Merge "Add unit test for AppLocalePickerActivity" into tm-dev 2022-04-29 03:56:56 +00:00
Betty Chang
7711207ba5 Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev 2022-04-29 03:33:55 +00:00
Amy Hsu
19b9978591 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev 2022-04-29 03:25:34 +00:00
ykhung
1c3cb4505c Hide running time information for "Android System" entry
Hide the running time information for "Android System" entry, since this
entry will combine multiple system components together. It will provide
incorrect running time information. The getRealUid() method maps many
UIDs to Process.SYSTEM_UID(1000), which results in combining all of
those UIDs into one "Android System" entry. This is the expected behavior.

Bug: 220717612
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I0aece0f1e86c36e55a2b5a966b4da9fdea14c748
2022-04-29 02:40:07 +00:00