Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,554 Commits 1 Branch 0 Tags
249de94deaf6b7c7b48cf08b5969b3a80c2009b0
Commit Graph

87554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
947f4d458a 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: I173b8e677bf99e9d120604678ba1ceb79e29737c
 2021-05-07 04:13:40 +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
151435a12f 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: Iab3cd8d70e3e7295ffe34a40889da640e107c09c
 2021-05-07 04:13:20 +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
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
94fc21d00a 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: I7c7f25049044e894725c9622d7e6c1b1dbe77fdf
 2021-05-07 04:11:56 +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
Treehugger Robot
23c3a67321 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: I3a497f119a4ba9a85db257ca78062001151e83b6
 2021-05-07 04:11:33 +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
50073054dd Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev am: b1b7029fa6 am: b829a124a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441409

Change-Id: I72eec1ce19563110fde0d27be59165ba88748b18
 2021-05-07 03:40:56 +00:00
Betty Chang
c041e2123f Merge "Change Network detail string form TYPE to Type" into sc-dev am: 19f21656a1 am: f843e9f9f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441413

Change-Id: I09109511859459f7f5f5b2ebc9c17d9b690265b8
 2021-05-07 03:40:45 +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
2cdb44cb6e Merge "Adopt new battery history map with interpolation method" into sc-dev am: b7ffc45052 am: ceece92af2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441406

Change-Id: Ia9e1b12619f8c11909f74dfcab94e7b34d8e0329
 2021-05-07 03:38:57 +00:00
Yi-Ling Chuang
377410de6d Merge existing bundle with ActivityOptions 
Use Bundle.putAll() to take both the bundle passed in to the
startActivity(Intent, Bundle) and also the new created ActivityOptions
bundle, so no extra info will be lost.

Test: rebuild and add log to make sure all bundle info are kept
Bug: 187471344
Change-Id: I69c2978488f51f1c8ee705dc1bcd1bf17928fe33
 2021-05-07 11:30:21 +08:00
TreeHugger Robot
b829a124a1 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: I7023186716b3eecf46a0257f937b17e4d6af8730
 2021-05-07 03:13:19 +00:00
Betty Chang
f843e9f9f1 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: I307dc48903f33628b96faf04ab258c0fe1b193ec
 2021-05-07 03:13:06 +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
ceece92af2 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: Idcb68611823205243720ffcaaf51f8aa97389711
 2021-05-07 03:11:25 +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
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
TreeHugger Robot
2ec9be2d6b 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: I6fd5cc40bcbfed8ccb9f2c09f7a09d5d7f8b165e
 2021-05-07 03:10:41 +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
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
Betty Chang
700b881701 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: I77b698e9f9cfdf6ae06ce2b659d47f793aa574de
 2021-05-07 03:10:17 +00:00
TreeHugger Robot
139745d11b 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: I32b338b48aceb00536b208421ac17a802e81adbf
 2021-05-07 03:10:10 +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
493da906c0 Merge "Refactor ChooseLockGenericController" into sc-dev am: b3b59d6edd am: fa9a904c1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14269154

Change-Id: I7cf8c7b1689d594473f2a31a011d368769a60e6a
 2021-05-07 00:45:05 +00:00
TreeHugger Robot
fa9a904c1f Merge "Refactor ChooseLockGenericController" into sc-dev am: b3b59d6edd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14269154

Change-Id: I6bce8daa7fcdc06417f0ad94c1a400255f20bf78
 2021-05-07 00:14:04 +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
380cb79ace Merge "Refactor ChooseLockGenericController" into sc-dev am: b3b59d6edd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14269154

Change-Id: I8413aa03a66772644b70efcfcf1985223249c57c
 2021-05-07 00:12:29 +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
c644ded2c5 Merge "Update the theme for Notification history page" into sc-dev am: 7d3c283e27 am: ffde414545 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442218

Change-Id: I72805c258a4b479330c471b48117f9855b3ee63c
 2021-05-06 19:27:24 +00:00
Julia Reynolds
ffde414545 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: I74646710289c980b8b7e59cb4582ccbe32911e89
 2021-05-06 18:44:54 +00:00
Julia Reynolds
a546fdbdac 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: I12ceedfd2c4dfc1688d138c4c80a4ab1514a29d5
 2021-05-06 18:43:05 +00: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
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
Yu-Han Yang
bac25a750c Revert "Remove dynamic location settings footer" 
Revert submission 13809184-location_footer

Reason for revert: b/187211885

Reverted Changes:
Iaf14044e0:Remove dynamic location settings footer
Ifa6468b11:Remove dynamic location settings footer
If3ab49241:Remove dynamic location settings footer

Bug: 187211885
Test: on device

Change-Id: If9fdefee60d191607ed777ce0046e4cf6d0e4018
 2021-05-06 11:38:10 -07: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