PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,713 Commits 1 Branch 0 Tags
116b57797bed7d11a27e2a7537cdc00f9eeca9fc
Commit Graph

81713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edgar Wang
116b57797b Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 am: b4ada164a0 am: febe901c8e am: 2b301c466f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: I013ca0564c44b3713752bfb8271d20f06834f6c7
 2021-05-07 05:19:14 +00:00
Edgar Wang
2b301c466f 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: I0851b47122f67956784b36d2fd06075dd1e9f6e8
 2021-05-07 05:05:57 +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
TreeHugger Robot
3bfdd162a8 Merge "Fix the battery usage screen left alignment issue" into sc-dev am: 8642ee35ad am: 947f4d458a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455997

Change-Id: I81e768c6d277bc40b831267e3d4428f21af4149d
 2021-05-07 04:36:08 +00:00
Treehugger Robot
3a39be999a Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c am: 026ecdd388 am: e24cba9b59 am: 151435a12f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923

Change-Id: Id67f3b2620a905b0b05c696fb629afd2d1d5ec15
 2021-05-07 04:34:19 +00: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
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
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
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
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
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
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
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
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
TreeHugger Robot
adcdff9e06 Merge "Fix inconsist color filling on collapsing toolbar" into sc-dev am: bbb6562684 am: 7bb2eff8cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442217

Change-Id: I145528161bd80c6aacd0ba63165aec47c3b1a15e
 2021-05-06 11:15:38 +00:00
Menghan Li
fe33a799f6 Merge "Fix Sound Amplifier does not have 'Open XXX' button" into sc-dev am: fa0ef8f2d9 am: a65e9a7ec5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409965

Change-Id: I3269b736731381acf6516381d882f7c4d92da986
 2021-05-06 11:15:34 +00:00
Menghan Li
800c75fadc Merge "Rename Tap assistance to Timing controls" into sc-dev am: 51fa8a290b am: 88df66be69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441407

Change-Id: Ied40750e486e69f48577e971e9926070206b6ed6
 2021-05-06 11:15:26 +00:00
changbetty
e4cd381d3c Change Network detail string form TYPE to Type 
Screenshot: https://photos.app.goo.gl/k9xSS3f7LcDQih6u9

Bug: 187252277
Test: manual test
Change-Id: Ia17a01c77880d62b65b25d4f85c75d963591fa4c
 2021-05-06 19:09:10 +08:00
TreeHugger Robot
7bb2eff8cc Merge "Fix inconsist color filling on collapsing toolbar" into sc-dev am: bbb6562684 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442217

Change-Id: I6fc04fd9fe429c9d078d5bf974b5d907362d57e0
 2021-05-06 11:09:05 +00:00
TreeHugger Robot
bbb6562684 Merge "Fix inconsist color filling on collapsing toolbar" into sc-dev 2021-05-06 11:04:31 +00:00
Menghan Li
a65e9a7ec5 Merge "Fix Sound Amplifier does not have 'Open XXX' button" into sc-dev am: fa0ef8f2d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409965

Change-Id: I189c69439052ca5051caabf2f67387d55867701b
 2021-05-06 11:01:27 +00:00
Menghan Li
88df66be69 Merge "Rename Tap assistance to Timing controls" into sc-dev am: 51fa8a290b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441407

Change-Id: Ie962bf922be7909538836c7dc78e7202f3126ed3
 2021-05-06 11:01:23 +00:00
Menghan Li
fa0ef8f2d9 Merge "Fix Sound Amplifier does not have 'Open XXX' button" into sc-dev 2021-05-06 10:48:19 +00:00
Menghan Li
51fa8a290b Merge "Rename Tap assistance to Timing controls" into sc-dev 2021-05-06 10:43:54 +00:00
Mill Chen
872db9c41a Add require scrolling button for FingerprintEnrolling intro 
The consent in the fingerprint introduction has been updated. Users are
required to read through the content. Adding a scrolling button is to
prevent directly going to next page from this page. It also makes sure
the content has to be scrolled down to the bottom of page.

Fix: 184591438
Test: visual verified
1) Prepare a device with fingerprint sensor
2) Settings > Security > Fingerprint unlock
3) Entering the enrollment flow and see if the introduction has a button
named "More" on the right-bottom side.

Change-Id: I1916293807ca9fb04f5d576cf4f6aaccbbe1ff00
 2021-05-06 17:29:38 +08:00
menghanli
924506e131 Fix Sound Amplifier does not have 'Open XXX' button 
SettingsMainSwitchPreference does not allow hide switch bar. For support
this launch preference, we hide the SettingsMainSwitchPreference and add
new preference into the list.

Bug: 184711985
Test: Manual testing
Change-Id: I293800e83aafb387e0bb0a4988af774b56f508e6
 2021-05-06 17:01:39 +08:00
Les Lee
696d0ded3d [automerger skipped] Merge "wifi: Use new API for wifi data usage function" am: 7469890c87 am: f38761e027 am: eb9ec7f664 -s ours am: 956fdad9c6 -s ours am: cf4980bcc4 -s ours 
am skip reason: Merged-In Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb with SHA-1 26128e8722 is already in history

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

Change-Id: Icf3864daa2fa256cf396ee7f9e3b8dbe6b64dcf5
 2021-05-06 08:40:53 +00:00
TreeHugger Robot
5e3232cc63 Merge "Fix the section below "Pair new device" moves up a few pixels" into sc-dev am: e6b78a5ada am: 6d44c61935 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319866

Change-Id: I9bba8b4a88e7916862936af624d0e4f81a2612a9
 2021-05-06 08:40:30 +00:00
Les Lee
cf4980bcc4 [automerger skipped] Merge "wifi: Use new API for wifi data usage function" am: 7469890c87 am: f38761e027 am: eb9ec7f664 -s ours am: 956fdad9c6 -s ours 
am skip reason: Merged-In Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb with SHA-1 26128e8722 is already in history

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

Change-Id: I4c1479e199cdcf1f1bc5db6a5248a868fec1fdee
 2021-05-06 08:27:42 +00:00
TreeHugger Robot
6d44c61935 Merge "Fix the section below "Pair new device" moves up a few pixels" into sc-dev am: e6b78a5ada 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319866

Change-Id: Ie3838f6a81f4274886986d2f33070a7e91f94207
 2021-05-06 08:27:30 +00:00