Jan Tomljanovic
fb6771d939
Merge "Update the SafetyCenter icon" into tm-dev am: 297028ea69
am: d1d0f0a88e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029249
Change-Id: I96a34dbbd9d4fecf21a8f53e92934fa976556fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:44:28 +00:00
TreeHugger Robot
678444ec91
Merge "Remove tab symbol for app pinning strings" into tm-dev am: 5d31a69d65
am: 46c773142b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030885
Change-Id: I234137108095ceffff08b62fefa067ee8ba93a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:44:04 +00:00
Chaohui Wang
e54e855b1b
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd
am: bda9049621
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070
Change-Id: Ib087add327143c0d12541e55ee586b01908af3a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:43:48 +00:00
Jan Tomljanovic
d1d0f0a88e
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: Ia4c82407c9e1c93bfba0ab19578c0d0a653c2a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:27:00 +00:00
TreeHugger Robot
46c773142b
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: I9d960da56143e016a7ac7ee1c6b9f8b32be9e67c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:26:43 +00:00
Chaohui Wang
bda9049621
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: I860b9d924cf2da922f3154008a194fe2ad0e3288
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:26:34 +00:00
TreeHugger Robot
1b4d1b14e9
Merge "Remove loading spinner from Premium SMS access" into tm-dev am: 611db9e8be
am: 4d5385e6e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903584
Change-Id: I269e4ed15a723fccd8dc95f184dec25c2dcb2415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:27:45 +00:00
Amy Hsu
8d3a4324e5
Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: 19b9978591
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983872
Change-Id: Ib2e443b2385b482b78cb47ea4241ee28f0e7a3e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:22:47 +00:00
TreeHugger Robot
4d5385e6e3
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: I172b47e725fd08cd8f3af954611c0599b8e3a97d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:37:29 +00:00
Jan Tomljanovic
297028ea69
Merge "Update the SafetyCenter icon" into tm-dev
2022-04-29 13:38:38 +00:00
TreeHugger Robot
5d31a69d65
Merge "Remove tab symbol for app pinning strings" into tm-dev
2022-04-29 09:43:23 +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
Amy Hsu
19b9978591
Merge "[ScreenResolutionController] UI string update" into tm-d1-dev
2022-04-29 03:25:34 +00:00
TreeHugger Robot
611db9e8be
Merge "Remove loading spinner from Premium SMS access" into tm-dev
2022-04-29 02:30:14 +00:00
Jan Tomljanovic
c15fb9ed81
Update the SafetyCenter icon
...
Test: manual
Bug: 230731934
Change-Id: I11a82348b77b5e162e9dfaf5bfa91642db709f6f
2022-04-28 17:09:05 +01:00
Chaohui Wang
ddedb31f6e
Fix flicker for Mobile data & Wi-Fi page
...
Both "Mobile data usage" & "Non-carrier data usage".
By,
1. Add header in onCreate() instead of onViewCreated()
2. Keep the space for Spinner, and preload initial cycles
3. Keep the space for 3 usage summaries
Bug: 191730864
Test: manual
Change-Id: I8c309c5f51ce6290383a2d10f75e41d0f207d61a
2022-04-28 23:00:57 +08:00
PETER LIANG
ec94752f9d
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94
am: acdb3b8a60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: Ibd5b4a67660b826c0928b37bc9e6c3cd54ca9e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 08:42:08 +00:00
PETER LIANG
17ddbadb74
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: I900480866ed1fb85fb7629223f37538c46ff11b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 07:53:30 +00:00
PETER LIANG
acdb3b8a60
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: Ic8db083e3d479c6f85615c36113fa747ce10c62d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 07:51:22 +00:00
Amy Hsu
f1dfa76dba
[ScreenResolutionController] UI string update
...
Bug: b/230626771
Test: Check the string manually
Change-Id: Ibe8cde0ef743ef398edbc438ead130215f7294d0
2022-04-28 07:40:44 +00:00
PETER LIANG
27aa5f9d94
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev
2022-04-28 06:45:11 +00:00
Kweku Adams
664e3805a7
Merge "Make final factors configurable." into tm-dev am: 3663986909
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: I9705e9019fb5a2ef096e1c7a8a8bb6a29bbba0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:36:35 +00:00
Kweku Adams
59e93d5225
Merge "Make final factors configurable." into tm-dev am: 3663986909
am: 4c5cbeb882
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: Ie840b13d8f234eb83978124781a4ff3796579da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:31:56 +00:00
Xinyi Zhou
d318a79c25
Delete Fast Pair Settings am: 3438e20da1
am: e2db47e9ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: I20ade5a70e7c36297c969cb4cc6725c74cd14882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:27:59 +00:00
Kweku Adams
4c5cbeb882
Merge "Make final factors configurable." into tm-dev am: 3663986909
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: I1b843304bb15bb3b719dbf906a4b96c29b58264c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:02:23 +00:00
Kweku Adams
3663986909
Merge "Make final factors configurable." into tm-dev
2022-04-28 02:59:29 +00:00
Xinyi Zhou
e2db47e9ab
Delete Fast Pair Settings am: 3438e20da1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: I76dc3c719352bfd0441a03adef1407b147cee9df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 02:54:55 +00:00
Xinyi Zhou
14c317a689
Delete Fast Pair Settings am: 3438e20da1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: Iefb16d41b1901b275f4a5019e78326de8d2e917d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 02:53:51 +00:00
Xinyi Zhou
3438e20da1
Delete Fast Pair Settings
...
Fast Pair will not be launched in T.
Test: -m
Fix: 228614515
Fix: 229356812
Change-Id: I173453e84f0d1b525ea4796ed875f53f30c20d96
2022-04-27 12:29:59 -07:00
Kweku Adams
d7189cc7ce
Make final factors configurable.
...
1. Add configuration support for the ongoing rewards (that are normally
less than 1 ARC).
2. Fix key/configuration of instant rewards
3. Fix UI string issue
Bug: 158300259
Bug: 189850067
Bug: 191876714
Bug: 191877052
Test: Use UI to change factors. Check Settings via adb and TARE dumpsys
Change-Id: I571e188faa6915ea74826b725c9883a825ab152a
2022-04-27 17:57:01 +00:00
Lais Andrade
ae1ae56fb2
Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb
am: e673e22181
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337
Change-Id: If3074ab20444f5b592a9e2c026147d00f51f811b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 17:35:07 +00:00
TreeHugger Robot
c1cdae7699
Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb
am: 39cbfbfed5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068
Change-Id: Idc112a03695a65fb7e3b1151e4bce3fac2ada91a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 17:34:42 +00:00
Lais Andrade
9066672c7d
Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337
Change-Id: Id95a6ec5976aa397bac923a92601ea709b8fd8bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:43:29 +00:00
TreeHugger Robot
39cbfbfed5
Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068
Change-Id: I5c8c755d17243cdd242d61c0eac062b5861b9d90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:43:08 +00:00
Lais Andrade
e673e22181
Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337
Change-Id: I7f8ddde6995c2d124c9682ce65781900ca44b58a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:42:11 +00:00
TreeHugger Robot
54467e3eb8
Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068
Change-Id: I58c7a9174a5b8892acf930554cfe8860e4194a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:41:18 +00:00
Lais Andrade
9c8d1e94fb
Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev
2022-04-27 13:54:13 +00:00
TreeHugger Robot
9fd4377ddb
Merge "Make the checkbox item large enough to click." into tm-dev
2022-04-27 13:51:14 +00:00
TreeHugger Robot
2a742b1774
Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28
am: aee4b8e3d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164
Change-Id: I6ff4801edb22824bf62b1674642695a516b0bb0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 13:42:58 +00:00
TreeHugger Robot
aee4b8e3d4
Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164
Change-Id: I736374cee128700e24000f21fc4cbe64d2cc34f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 13:20:20 +00:00
TreeHugger Robot
b0bf5dd13f
Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164
Change-Id: I1c72f82bf7ceb1a13d7a14c3a0ab5ad48beee760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 13:18:56 +00:00
TreeHugger Robot
5395a4eb28
Merge "Fix collapsing toolbar can't collapse problem" into tm-dev
2022-04-27 12:46:52 +00:00
Sunny Shao
d790fa2800
Fix collapsing toolbar can't collapse problem
...
- Use the NestedScrollView instead of ScrollView.
Fixes: 216276444
Test: manual test
Change-Id: I3872bcc2f165ba8cf55f1782aa76f59adde5d3aa
2022-04-27 15:51:45 +08:00
Peter_Liang
fcce62aa77
Logging for the feature "Text and reading options" in Android T.
...
Logging for the status of five features “Font size”, “Display size”, “Bold Text”, “High contrast text”, and “Reset” in the “Display size and text” page.
Bug: 222661478
Test: manual test
Change-Id: I33060fca860e02ddac7716275e8682e70fbaff1f
2022-04-27 15:25:30 +08:00
Angela Wang
11dc02d115
Make the checkbox item large enough to click.
...
When checkbox display contents in a single line, the clickable area is
less than 48dp and making it hard to click. Setting the minimum height to 48dp can ensure the clickable area is large enough.
Bug: 226538268
Test: manual test
Change-Id: I341455bc98415bfe9292ff5ba4cf6c2153d487d7
2022-04-27 06:30:59 +00:00
TreeHugger Robot
37c4a74b27
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-27 02:31:39 +00:00
Chaohui Wang
5094979554
Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0
am: 61a35e7b85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523
Change-Id: I868e35ed12d7143c6d8fdea63e52feb628163c90
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 07:27:31 +00:00
Chaohui Wang
6dc65f1eb4
Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523
Change-Id: Iea7bef3ceebeb17a54314389a1314a378d383d5c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 06:51:16 +00:00
Chaohui Wang
1a39660de0
Merge "Update Personal / work selection UI." into tm-dev
2022-04-26 06:34:37 +00:00