Bill Yi
d0d652158b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5d257a72d
-s ours am: bd905bff88
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469653
Change-Id: I6b6d39e28aff567c7ba94c9fb212d099c562a7a3
2021-05-07 23:44:20 +00:00
Bill Yi
bd905bff88
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5d257a72d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469653
Change-Id: If064a2ddcfb826ccfacfe5b9ec2b96ad89d04384
2021-05-07 23:27:34 +00:00
TreeHugger Robot
e5827e7c40
Merge "Prevent multi-sensor enrollment from doing nothing." into sc-dev am: 0842cc9adc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14463204
Change-Id: Iddf2c24901c74a70303f7cddaf0aaed79da9f475
2021-05-07 20:41:26 +00:00
TreeHugger Robot
0842cc9adc
Merge "Prevent multi-sensor enrollment from doing nothing." into sc-dev
2021-05-07 20:25:35 +00:00
ykhung
0123899fca
Fix corner case IndexOutOfBound exception for null content am: bf5dd80d4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456006
Change-Id: I056a35b964e3a3bef3f461248029a6b848532689
2021-05-07 17:50:11 +00:00
ykhung
bf5dd80d4f
Fix corner case IndexOutOfBound exception for null content
...
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: Icf35b4084bcea62c2879a100d1b35b5448d8276d
2021-05-08 01:15:21 +08:00
Bill Yi
b5d257a72d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib60837c4552e1516120c5c6f988fc4b103788f4a
2021-05-07 16:50:54 +00:00
Alex Stetson
0252189a12
Merge "Use shared model for non-system overlay toggle" into sc-dev am: 413893244d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441754
Change-Id: I0540859757c43040b7ebb4c410c0156dc097706d
2021-05-07 14:13:49 +00:00
Alex Stetson
413893244d
Merge "Use shared model for non-system overlay toggle" into sc-dev
2021-05-07 14:08:52 +00:00
TreeHugger Robot
3808ff395d
Merge "Refine the interpolation rule and clip the usage time data" into sc-dev am: 180051cf05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455999
Change-Id: Iec0daef58ede84bb9cd740a5e0e1ea4bb241d93b
2021-05-07 09:50:32 +00:00
TreeHugger Robot
180051cf05
Merge "Refine the interpolation rule and clip the usage time data" into sc-dev
2021-05-07 09:35:35 +00:00
TreeHugger Robot
5e8d1554c3
Merge "Turn on the transition flag" into sc-dev am: ac1b7661ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456000
Change-Id: Iff249e22920e5e04e90920ea876b52265a6c403a
2021-05-07 09:14:12 +00:00
Yanting Yang
0f7c4495ca
Merge "Add summary back to the homepage" into sc-dev am: c37abc9edb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442216
Change-Id: Id45e5ee08848f83fab55acb2c56fecbc5bd491df
2021-05-07 09:14:06 +00:00
TreeHugger Robot
ac1b7661ad
Merge "Turn on the transition flag" into sc-dev
2021-05-07 09:01:00 +00:00
Yanting Yang
c37abc9edb
Merge "Add summary back to the homepage" into sc-dev
2021-05-07 09:00:32 +00:00
ykhung
4280a7f897
Refine the interpolation rule and clip the usage time data
...
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I6c115beed34abd393e5c615cc59d3c4c323dfa0b
2021-05-07 16:36:56 +08:00
Syaoran Kuo
283b879e3f
Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410
Change-Id: I98344c6432cbd8a2b4be4693a8296dfb031b073d
2021-05-07 08:28:46 +00:00
Syaoran Kuo
7dd05a8c05
Merge "Remove wifi related test." into sc-dev
2021-05-07 07:54:25 +00:00
Syaoran Kuo
bc1e5321ab
Remove wifi related test.
...
To add these case back, add a success case to avoid empty test error.
Bug: 186372528
Test: atest SettingsComponentTest
Change-Id: I6d973a244338f67e3d35e9657d1d46eba8ba4501
2021-05-07 13:44:08 +08:00
Yi-Ling Chuang
1be773da62
Turn on the transition flag
...
Test: robotests
Bug: 186701900
Change-Id: I09c821e17fca88ee532f6535031a52c4c832a1e8
2021-05-07 13:21:42 +08:00
TreeHugger Robot
3b72e00b7a
Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975
Change-Id: I7cc7eda7d2839b92f37d91188f4507426ba336f8
2021-05-07 05:11:14 +00:00
TreeHugger Robot
db624992ed
Merge "Wallet/controls - Migrate existing settings" into sc-dev
2021-05-07 05:05:34 +00:00
Edgar Wang
78f5f98a25
Merge "Add personal dictionary summary text" am: 0cbc974638
am: 7106d10dd0
am: b4ada164a0
am: febe901c8e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874
Change-Id: I882a9a14eccdbbf9db33f764e0db42090b62b91b
2021-05-07 05:03:51 +00:00
Edgar Wang
febe901c8e
Merge "Add personal dictionary summary text" am: 0cbc974638
am: 7106d10dd0
am: b4ada164a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874
Change-Id: If3b1222631f8ed62b4499f6be5d3a4947a86f5cf
2021-05-07 04:49:18 +00:00
Joe Bolinger
955c8349ed
Prevent multi-sensor enrollment from doing nothing.
...
Fix: 186499864
Test: manual (setup with managed account)
Change-Id: If2b2623b2e348ef9d335c81189dbe23e4fe5f003
2021-05-06 21:41:43 -07:00
Edgar Wang
b4ada164a0
Merge "Add personal dictionary summary text" am: 0cbc974638
am: 7106d10dd0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874
Change-Id: I9e7e25716d18b62a38250d6b02c2794cc2046886
2021-05-07 04:32:55 +00:00
Edgar Wang
7106d10dd0
Merge "Add personal dictionary summary text" am: 0cbc974638
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874
Change-Id: Ie7686e0df4f0e44bdb1dcb2d55a21e0c957d65b2
2021-05-07 04:18:17 +00:00
TreeHugger Robot
77fe80dd73
Merge "Fix the battery usage screen left alignment issue" into sc-dev am: 8642ee35ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455997
Change-Id: I0d8290318b917d46822f6c2f2d4bc21b87fb9317
2021-05-07 04:12:17 +00:00
Treehugger Robot
ca26867de4
Merge "Move myself to the emeritus section" am: 9119105da9
am: 27a27acb2c
am: 026ecdd388
am: e24cba9b59
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923
Change-Id: Ia54fb8041f7c4ba294430bd5bda7d822f5d18e4a
2021-05-07 04:11:40 +00:00
Edgar Wang
0cbc974638
Merge "Add personal dictionary summary text"
2021-05-07 04:02:00 +00:00
TreeHugger Robot
8642ee35ad
Merge "Fix the battery usage screen left alignment issue" into sc-dev
2021-05-07 03:59:13 +00:00
Treehugger Robot
e24cba9b59
Merge "Move myself to the emeritus section" am: 9119105da9
am: 27a27acb2c
am: 026ecdd388
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923
Change-Id: If7854bb03db1b001bb6dfd35f28f074a66b77abe
2021-05-07 03:39:34 +00:00
Treehugger Robot
026ecdd388
Merge "Move myself to the emeritus section" am: 9119105da9
am: 27a27acb2c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923
Change-Id: I8aa67688d4c88a64c549e1094f3311ec4a4b2499
2021-05-07 03:11:46 +00:00
TreeHugger Robot
2929cdd115
Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev am: b1b7029fa6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441409
Change-Id: I34041ae1c70231864a1905d545ceea383db20c65
2021-05-07 03:10:45 +00:00
Betty Chang
e7f72efe61
Merge "Change Network detail string form TYPE to Type" into sc-dev am: 19f21656a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441413
Change-Id: I0078fa1a23e4534782b0e8013004974d0fce10a9
2021-05-07 03:10:24 +00:00
TreeHugger Robot
dce7f21a9d
Merge "Adopt new battery history map with interpolation method" into sc-dev am: b7ffc45052
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441406
Change-Id: I5c84839a83ab8c7e3699b2e79613eaf556f9003f
2021-05-07 03:09:22 +00:00
TreeHugger Robot
b1b7029fa6
Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev
2021-05-07 02:58:16 +00:00
Treehugger Robot
27a27acb2c
Merge "Move myself to the emeritus section" am: 9119105da9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923
Change-Id: I5dc08c10017d0109271f68e86729bdabaa26262f
2021-05-07 02:53:45 +00:00
ykhung
3b6e225a5c
Fix the battery usage screen left alignment issue
...
Bug: 187383692
Test: make SettingsRoboTests
Change-Id: I9abb17562bea3727f31ce781cf452412a4ee7818
2021-05-07 10:48:28 +08:00
Betty Chang
19f21656a1
Merge "Change Network detail string form TYPE to Type" into sc-dev
2021-05-07 02:29:35 +00:00
TreeHugger Robot
b7ffc45052
Merge "Adopt new battery history map with interpolation method" into sc-dev
2021-05-07 02:09:43 +00:00
TreeHugger Robot
57f25c2fe3
Merge "Refactor ChooseLockGenericController" into sc-dev am: b3b59d6edd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14269154
Change-Id: Iaf50c89889b985c638211a9101fa9f8f664097ac
2021-05-07 00:12:02 +00:00
TreeHugger Robot
b3b59d6edd
Merge "Refactor ChooseLockGenericController" into sc-dev
2021-05-06 23:59:17 +00:00
Treehugger Robot
9119105da9
Merge "Move myself to the emeritus section"
2021-05-06 22:24:55 +00:00
Rubin Xu
8e4acdbf51
Refactor ChooseLockGenericController
...
* Move all logics around aggregating password policies
to the controller
* Replace HIDE_DISABLED_PREFS and MINIMUM_QUALITY_KEY
with HIDE_INSECURE_OPTIONS as all call sites are just
using them to hide insecure screenlock options.
* Remove password policy aggregation logic from
ChooseLockPassword and make it use policies passed in.
* Remove padlock from disabled screen lock options,
per UX mock.
* Increase char limit for some strings
Bug: 177638284
Bug: 177641868
Bug: 182561862
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Test: 1. set profile password quality/complexity and enroll device lock
2. set profile password quality/complexity and enroll work challenge
3. set parent password quality/complexity and enroll device lock
4. set parent password quality/complexity and enroll work challenge
5. set profile and parent password complexity, then enroll work challenge
6. set profile and parent password complexity, then unify work challenge
7. Enroll device lock during SUW
Change-Id: Iba1d37e6f33eba7b7e8e1f805f8e37aaec108404
2021-05-06 23:09:27 +01:00
Julia Reynolds
7abbde1371
Merge "Update the theme for Notification history page" into sc-dev am: 7d3c283e27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442218
Change-Id: I54f63a76ad81f9a87c562bf0937f8303d744d91d
2021-05-06 18:42:53 +00:00
Julia Reynolds
7d3c283e27
Merge "Update the theme for Notification history page" into sc-dev
2021-05-06 18:15:00 +00:00
ykhung
f76ba1189a
Adopt new battery history map with interpolation method
...
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I5c45a443d0a72df352d4bb707412328ad009f6d4
2021-05-07 00:25:33 +08:00
Alex Stetson
aff80d1e14
Use shared model for non-system overlay toggle
...
Allows settings applications on other platforms to re-use values by
migrating to Settings.secure and moving HideNonSystemOverlayMixin to
SettingsLib.
Bug: 184967544
Test: atest SettingsUnitTests
Change-Id: If9aaeca29ebb8b481d75622934503e368d7435d3
2021-05-06 08:28:19 -07:00
Eran Messeri
6f3630c393
Move myself to the emeritus section
...
As I no longer expect to be working on security-related settings, move
myself to the emeritus section.
Bug: 187395769
Test: N/A
Change-Id: Ic91dd36f6de39ef79f1ced90083e1c5c7836c651
2021-05-06 15:16:40 +01:00