PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,295 Commits 1 Branch 0 Tags
d0366d4e18d1c3fbe90407ea1daf74f1352d54e0
Commit Graph

82295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
d0366d4e18 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2450eeb436 -s ours am: fc9217fca5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I085d3e2df813e4494036ad268d827a75c8d022b6
 2021-05-07 23:44:55 +00:00
Bill Yi
bfdfd71000 [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: I67e2c754644bcec9fd0220da48da9815c2f2b7b8
 2021-05-07 23:44:27 +00:00
TreeHugger Robot
fc9217fca5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2450eeb436 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie591b4ce89aaf28b338d6f854f06e13444e5acd7
 2021-05-07 23:28:02 +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
2450eeb436 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-07 23:17:12 +00:00
TreeHugger Robot
6b54214256 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: I77fbcd299e5bc9ac10c85943c15f2b065ea5f0e9
 2021-05-07 20:43:14 +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
f9629da099 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: Ibcfad865ab1cfdfc3a68c1b19cbe710d57379324
 2021-05-07 17:50:19 +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
Bill Yi
3bc6bf4361 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I33d29fb6c9a4362b326a72b354aa44a219b813ba
 2021-05-07 16:47:30 +00:00
Alex Stetson
6bce729342 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: I8451ca2a698ea037e85f069e038d7c65c5b14464
 2021-05-07 14:13:47 +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
f619511195 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: Id9bd417e852a2bbc26b4d8a56b807b2f3d9e1f01
 2021-05-07 09:51:58 +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
097c717d9c 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: I96bf13d162ee1f8823e902fb103f4f98049c23b9
 2021-05-07 09:14:26 +00:00
Yanting Yang
f93d748e39 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: Ia37803139c26349cfc0df75badd5a907c0735c26
 2021-05-07 09:14:23 +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
4ec71237bb 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: Idde9165abeb18ab8e348c0041ed2dce3db126b9f
 2021-05-07 08:28:14 +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
072d0b9a2d 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: Ibc4ec9f604d045450f14d5cea8e5d11f9f4d334e
 2021-05-07 05:11:44 +00:00
TreeHugger Robot
db624992ed Merge "Wallet/controls - Migrate existing settings" into sc-dev 2021-05-07 05:05:34 +00:00
Edgar Wang
bee5f45d12 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: I0bd42f5e5dacb6e366af1f73f1b06d72abdf994e
 2021-05-07 05:04:06 +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
ff445f593b 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: I8b38a671a5cec88547b906f1ed625c01006a9b56
 2021-05-07 04:13:23 +00:00
Treehugger Robot
583a92a34f 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: I0848ff33d5273fe386bc83ece390004c7afcccc1
 2021-05-07 04:12:43 +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
f738723370 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: Ib0bfc323ee5712ccd6dcdf382235188cddbdf5da
 2021-05-07 03:10:57 +00:00
Betty Chang
08f06afcae 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: Ib43063a5566b3dcc8c11e1d973689099d597d85c
 2021-05-07 03:10:48 +00:00
TreeHugger Robot
c0ae51025b 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: I749b72856d56f0cb1366ea2669775252ef78e974
 2021-05-07 03:10:35 +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
67739493d4 Merge "Refactor ChooseLockGenericController" into sc-dev am: b3b59d6edd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14269154

Change-Id: Ib1056680d62dd10e6708ae9aadf9ae949771f0c1
 2021-05-07 00:12:31 +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
d0906f1299 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: I62b0f2677eda8c49436c569b1440358b06fe9e9c
 2021-05-06 18:42:35 +00:00