PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,727 Commits 1 Branch 0 Tags
27449fb2a75855b144054d3431eac47fd6ed4dbc
Commit Graph

81727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Curtis Belmonte
1e1b259445 Revert "Turn on the transition flag" 
This reverts commit 1be773da62.

Reason for revert: b/187517936

Fixes: 187517936
Change-Id: I57d0a7a16bdb76e105b0febd43bdf81521e69e3a
 2021-05-07 22:43:05 +00:00
Xin Li
7df22b02ca DO NOT MERGE - Mark RQ2A.210105.001 as merged. 
Bug: 180401296
Merged-In: Ic91dd36f6de39ef79f1ced90083e1c5c7836c651
Change-Id: I82a9266b107ebaf80b897deb8066e6976642644b
 2021-05-07 14:32:28 -07:00
TreeHugger Robot
4fbf1990bf 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: I2d828a873e008d056f453053dac8e921599c5ac8
 2021-05-07 20:43:21 +00:00
TreeHugger Robot
0842cc9adc Merge "Prevent multi-sensor enrollment from doing nothing." into sc-dev 2021-05-07 20:25:35 +00:00
Matt Pietal
a13e30c11a Controls/Wallet privacy settings 
Addressing feedback from ag/14353975

Fixes: 185597511
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I4de5b7f94d4be44820b1fa463d97f4f098f64bff
 2021-05-07 14:54:54 -04:00
ykhung
985c9a3d42 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: Iec922589d53bad35cc4aab891850f05948a28f55
 2021-05-07 17:52:13 +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
5ced13c831 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I77632e0a713314bd782dfaa3256e5181078ef332
 2021-05-07 16:57:00 +00:00
Bill Yi
51221d77f7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I830341ac6e908b358eb878baa11e62ebbf4fcfd9
 2021-05-07 16:53:34 +00: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
2f3826948a 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: Ida104293c42790f4bfcbb88f8f75237cfb8ed10f
 2021-05-07 14:15:05 +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
adfbb68838 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: If33d0ec952dbf09416507db253493ce890ee00a0
 2021-05-07 09:53:41 +00:00
Edgar Wang
b54caf63f2 Rename PreferenceTheme.SettingsBase to PreferenceTheme.SettingsLib 
Bug: 182179573
Test: robotest & manual
Change-Id: Iadb51c8601b49294eef2f6fb13369576e62e5b7a
 2021-05-07 17:41:02 +08: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
3fb211bc4e 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: I80c2fc6bcf6863bee4636a151c018af38511d4f3
 2021-05-07 09:16:14 +00:00
Yanting Yang
f94fe0e86c 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: I7058a16e5d50badbd4f18fdf7545328421475f50
 2021-05-07 09:15:42 +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
84dfab789e 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: I28fa9b25ec03e5323198e81837bf266f28f2b02c
 2021-05-07 08:30:50 +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
1b2bf94780 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: I9a72d99adc6efb84a6f48df261564d802ddde25f
 2021-05-07 05:06:19 +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
TreeHugger Robot
db624992ed Merge "Wallet/controls - Migrate existing settings" into sc-dev 2021-05-07 05:05:34 +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
Suprabh Shukla
ce53343669 Commit changes only when activity is closed 
The consequences of revoking the permission are irreversible so delay
committing until the user navigates out of the activity.

Test: Manual

Bug: 186280600
Change-Id: Ib53496fd4e39fe15dca4aadc5bcc773d5433131c
 2021-05-06 21:39:09 -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
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
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
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
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