PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,012 Commits 1 Branch 0 Tags
f1e3313fa256a0fd0a704dca653a9d6e12b45ff9
Commit Graph

83012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Julia Reynolds
540ad99d88 Fix work profile setting appearing too often 
That is, when the user didn't have work profile

Test: robotests, manual
Fixes: 187520760
Change-Id: I9394359a6bc278d58ef13b30f8ce99cbaa595c25
 2021-05-07 15:02:54 -04: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
Julia Reynolds
2fe3273f3a Handle NLS metadata when provided as strings 
Test: atest
Bug: 181175697
Change-Id: I40d935ffb7c1fb9f978160d28297da84412501fb
 2021-05-07 18:37:10 +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
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
Syaoran Kuo
87cc2e19e5 Add more log for debugging resource id issue. 
Bug: 187485845
Test: atest SettingsComponentTests
Change-Id: I6268809eca172b0b4aa9f1a252e0d519ad758083
 2021-05-07 18:49:26 +08: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
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
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
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