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

82347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edgar Wang
9790762101 Merge "Rename PreferenceTheme.SettingsBase to PreferenceTheme.SettingsLib" into sc-dev am: 9da824db15 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456003

Change-Id: I56bde38153b1e9371418f6c74e7fe188ab4971bb
 2021-05-11 14:57:32 +00:00
TreeHugger Robot
5113155194 Merge "Controls/Wallet privacy settings" into sc-dev am: 67fd37c837 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470513

Change-Id: Iff0120d038448d3e739a93a9cf8ff90917be2c2b
 2021-05-11 14:57:15 +00:00
Xin Li
6f8f1260d8 [automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -s ours am: 1b68f3bfd3 -s ours am: a7d220aad7 -s ours am: e49a0d1b4e -s ours 
am skip reason: Merged-In Ic91dd36f6de39ef79f1ced90083e1c5c7836c651 with SHA-1 6f3630c393 is already in history

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

Change-Id: I9b275f79563f16e7ee16141e9f51aec9e17c787e
 2021-05-11 14:53:55 +00:00
Edgar Wang
9da824db15 Merge "Rename PreferenceTheme.SettingsBase to PreferenceTheme.SettingsLib" into sc-dev 2021-05-08 07:29:36 +00:00
TreeHugger Robot
67fd37c837 Merge "Controls/Wallet privacy settings" into sc-dev 2021-05-08 02:46:54 +00:00
Xin Li
e49a0d1b4e [automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -s ours am: 1b68f3bfd3 -s ours am: a7d220aad7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d1066d472d9b053a19ac80c8dba094d0017a271
 2021-05-08 02:37:05 +00:00
Xin Li
a7d220aad7 [automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -s ours am: 1b68f3bfd3 -s ours 
am skip reason: Merged-In Ic91dd36f6de39ef79f1ced90083e1c5c7836c651 with SHA-1 6f3630c393 is already in history

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

Change-Id: I810710363abf4ab5cffa5d3c05095468716d2466
 2021-05-08 02:13:47 +00:00
Xin Li
1b68f3bfd3 [automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -s ours 
am skip reason: Merged-In Ic91dd36f6de39ef79f1ced90083e1c5c7836c651 with SHA-1 6f3630c393 is already in history

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

Change-Id: Ifc6c1d5d1192a56c9f33ded1a984e1d4b73157c9
 2021-05-08 01:48:55 +00:00
Xin Li
6811428c9c Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." 2021-05-08 01:28:18 +00:00
TreeHugger Robot
a8aabc7fab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87 -s ours am: 2332a37557 -s ours am: 0c847ab549 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e3b8cbcb37c72cdae1adf9d372b723d49852c2f
 2021-05-07 23:45:10 +00:00
Bill Yi
d13fa4af2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831 -s ours am: d32b02b4b4 -s ours am: 8d2d27953d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I654148c92fbb65abbdaa0ed5f1f5cd430ca5f0a2
 2021-05-07 23:45:01 +00:00
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
0c847ab549 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87 -s ours am: 2332a37557 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ac1d36b4343b3d008d21090ee9ac69caae48460
 2021-05-07 23:36:59 +00:00
Bill Yi
8d2d27953d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831 -s ours am: d32b02b4b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82d19d77c91088c415ec95a3c9ecf794893eac2a
 2021-05-07 23:36:52 +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
2332a37557 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b468892d531003b9ada3fac1ffb0b54866e61e9
 2021-05-07 23:19:54 +00:00
Bill Yi
d32b02b4b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e49484d667bbe12c60fc975be09cf477e090877
 2021-05-07 23:19:11 +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
31e0f46d87 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-07 23:07:35 +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
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
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
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
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
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
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
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