PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,732 Commits 1 Branch 0 Tags
ef0f32b7963b25837a7589f495e051c0cadb65cc
Commit Graph

80732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andras Kloczl
4f095b1a6b [automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours am: b21072b773 -s ours 
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If83710ea2b67104d3f3cbc1ce55f32ed129770cf
 2021-03-11 10:42:24 +00:00
András Klöczl
e690821501 [automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours am: 28539c02dd -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2052e3022c61172aac54fb1855d500eb3f0755a
 2021-03-11 10:42:15 +00:00
Andras Kloczl
a95829294d [automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4017e71f1c6b9f6a1eee1cde5d8c3534fa4a4ed5
 2021-03-11 10:42:06 +00:00
Andras Kloczl
6355d222cd [automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I745498eef55d159e98e6d1b2d549fc20a05c59e4
 2021-03-11 10:28:59 +00:00
Andras Kloczl
b21072b773 [automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours 
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41fd0e7c9aaef6aa0f4d0784ba916612f95e89dc
 2021-03-11 10:28:53 +00:00
Andras Kloczl
7f3b720d75 Prevent using invalid result uri during multi user image change am: e36357b20c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815797

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1a8977045597d896bd58ace3f2319aefbd86858
 2021-03-11 10:28:52 +00:00
András Klöczl
28539c02dd [automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4bfc7671ae0401b97ec24b32c53146926490809f
 2021-03-11 10:28:43 +00:00
Andras Kloczl
963c939143 [automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours am: 1d48089aa2 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7025da5c224cb2f0ce92e31e8b3f9645c588701
 2021-03-11 10:24:42 +00:00
Andras Kloczl
f9eacae4a0 [automerger skipped] Prevent using invalid result uri during multi user image change am: e36357b20c -s ours am: 94872d6be0 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 07e414017c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1081ba90dd6e3b49489237b60ac14496ec419617
 2021-03-11 10:24:33 +00:00
Andras Kloczl
94ed37dacf [automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours 
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7e57866c554495b9f8fd8b48b9c03ccde9f8160
 2021-03-11 10:24:31 +00:00
Andras Kloczl
1d48089aa2 [automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad298e6c9211ca2af4ba36be3d6b40cc634e3394
 2021-03-11 10:24:30 +00:00
Andras Kloczl
c40b15712c [automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I155c9ce1031960174f802c15102d3c2a3619bfb6
 2021-03-11 10:24:25 +00:00
Andras Kloczl
0e9cbfc86e Prevent using invalid result uri during multi user image change am: 07e414017c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98dd17745edd2e700169959537e640a33b81e07b
 2021-03-11 10:24:24 +00:00
Andras Kloczl
94872d6be0 [automerger skipped] Prevent using invalid result uri during multi user image change am: e36357b20c -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 07e414017c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58a14824bee13043f07ced00fd31bae1a6d14526
 2021-03-11 10:24:19 +00:00
Andras Kloczl
373b53a7cc [automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c374ecf934e3356f6d656908dab6f02ab215763
 2021-03-11 10:24:17 +00:00
András Klöczl
f1125282f9 Merge "Prevent using invalid result uri during multi user image change" into pi-dev 2021-03-11 09:48:07 +00:00
TreeHugger Robot
b69b44aae7 Merge "Declare activities for factory reset pages" into sc-dev am: 4082b27b0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824395

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If045f08e6885eeebea99a8beacd4abb3d8894d73
 2021-03-11 09:43:38 +00:00
TreeHugger Robot
4082b27b0a Merge "Declare activities for factory reset pages" into sc-dev 2021-03-11 09:05:58 +00:00
Mill Chen
b0548113d2 Fix no apps text overlapping with filter bar 
Since Settings UI has been changed and the filter bar will be staying
in a fixed place, the "no apps" text will be overlapped with filter bar.
To make the text seperate from filter bar, the string will be put
in the bottom of text view.

Fixes: 182173848
Test: visual verified
1) Settings -> Notifications -> See all from last 7 days -> select
Turned off on filter bar
2) Observe and see if the "no apps" is overlapping with filter bar

Change-Id: Ib99bb5122fb72f05a2404b8f61b025a46d6d53dd
 2021-03-11 16:44:48 +08:00
Wesley Wang
54b58b9a97 Merge "Update UsageProgressBarPref icon when device is charging or low battery" into sc-dev am: 1d5d101aa6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13805543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id96b38dce8a4dc895bbd2263df16c17294bf0fa4
 2021-03-11 08:07:53 +00:00
Arc Wang
c57f2917bd Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: 3d1658e93d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824398

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief0358d51ddbace52059bbe3f8860fcac6ef1629
 2021-03-11 08:07:40 +00:00
Wesley Wang
1d5d101aa6 Merge "Update UsageProgressBarPref icon when device is charging or low battery" into sc-dev 2021-03-11 07:53:12 +00:00
Arc Wang
3d1658e93d Merge "Hide non-system overlay window on ActivityPicker" into sc-dev 2021-03-11 07:45:43 +00:00
Bill Yi
0bd6866b6e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4858792cf94ada11fa80e777d321ac02f7259353
 2021-03-10 23:33:56 -08:00
Bill Yi
2e4d6058d3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id310e8b22e9d0d422e66ebf61b7bde73ef537abc
 2021-03-10 22:46:02 -08:00
TreeHugger Robot
921567214d Merge "Use title area for enrollment error messages" into sc-dev am: 53d7495162 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824391

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id960686ac67fad4be87622d6ad81bf745bd42a62
 2021-03-11 06:44:26 +00:00
Wesley.CW Wang
e940dcb448 Update UsageProgressBarPref icon when device is charging or low battery 
- Add new icon for battery low state
 - Update UsageProgressBarPref icon when charging or low battery
 Screenshots:
   https://screenshot.googleplex.com/9HBvV6t6dVsG8eD.png
   https://screenshot.googleplex.com/6TsRu6BTN338FvT.png
   https://screenshot.googleplex.com/nGE29cfsmgKuuaP.png
   https://screenshot.googleplex.com/85NWXSg2PevXAsy.png

Bug: 179237746
Test: make RunSettingsRoboTests -j40
Change-Id: I057874bbf45594c90466cf346b054bf033815dac
 2021-03-11 06:32:20 +00:00
TreeHugger Robot
53d7495162 Merge "Use title area for enrollment error messages" into sc-dev 2021-03-11 06:16:42 +00:00
Yi Jiang
5531480a80 Merge "Fixes UI style issues in Screen Timeout setting" into sc-dev am: 5c11109ffc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13828187

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If656cd60942d21319e1f49044285141bdfb5643f
 2021-03-11 05:14:04 +00:00
Yi Jiang
5c11109ffc Merge "Fixes UI style issues in Screen Timeout setting" into sc-dev 2021-03-11 04:48:04 +00:00
Arc Wang
3b4853e109 Hide non-system overlay window on ActivityPicker 
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I6e2845cc19dc012cba2933318a067bbb8db90a23
 2021-03-11 12:10:18 +08:00
Treehugger Robot
c96d4d9328 Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f am: eda1be644f am: 2817c677b1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91223c2147f0ea173fe4bb8675d692fba0f80615
 2021-03-11 03:59:54 +00:00
Treehugger Robot
2817c677b1 Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f am: eda1be644f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I755a0f00c44dfd39b84e4f843a1553de2e8850a2
 2021-03-11 03:23:22 +00:00
Treehugger Robot
eda1be644f Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80ebc15814491a28b3da23b6554b81022ab49db3
 2021-03-11 02:41:39 +00:00
Kevin Chyn
4ff118db02 Merge changes from topics "fp-revokeChallenge", "new-revokeChallenge" into sc-dev am: 13b05b6fb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13820985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6343bd4f0c9cfcb3d76cb11ed627f8ec54680ab
 2021-03-11 02:00:45 +00:00
Kevin Chyn
26e7d7d23a Update revokeChallenge together with frameworks/base am: e91e39b604 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13818078

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76939100b1559b07ef29c58e7e348296f246bbc0
 2021-03-11 02:00:43 +00:00
Abel Tesfaye
8dc582b3fa Merge "Update autorotate search terms" into sc-dev am: bf182903ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13818585

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I142ad532dc803d404ad97b900d1e7dbcd67c5a18
 2021-03-11 02:00:20 +00:00
Abel Tesfaye
70c11a7047 Update auto-rotate UI to comply with guidelines 
Bug: 182411771

Test: locally with flame
Change-Id: Id94ae379dcf2590460b9cbbdf7a292290666796d
 2021-03-11 01:52:18 +00:00
Kevin Chyn
13b05b6fb8 Merge changes from topics "fp-revokeChallenge", "new-revokeChallenge" into sc-dev 
* changes:
  Update fingerprint revokeChallenge with frameworks/base
  Update revokeChallenge together with frameworks/base
 2021-03-11 01:14:15 +00:00
Treehugger Robot
dac69ccd8f Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74024fbb550f8c405f2850bd20b90599370b0bad
 2021-03-11 00:58:01 +00:00
Sooraj Sasindran
1ce8eb765a update isCrossSimCallingEnabledByUser name 
update isCrossSimCallingEnabledByUser name to
isCrossSimCallingEnabled

Bug: 179143945
Test: build
Change-Id: I8bb0196cc04dc437ed709548ecd569c4dd7828a1
 2021-03-10 16:43:49 -08:00
Andras Kloczl
6746add669 Prevent using invalid result uri during multi user image change 
Test: manual
Bug: 172939189
Change-Id: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
 2021-03-11 00:16:46 +00:00
Andras Kloczl
9c0024f455 Prevent using invalid result uri during multi user image change 
Test: manual
Bug: 172939189
Change-Id: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
 2021-03-11 00:16:03 +00:00
Andras Kloczl
e0f8214e80 Prevent using invalid result uri during multi user image change 
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
 2021-03-11 00:15:46 +00:00
Andras Kloczl
798bdd90b0 Prevent using invalid result uri during multi user image change 
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
 2021-03-11 00:15:27 +00:00
Andras Kloczl
e36357b20c Prevent using invalid result uri during multi user image change 
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
 2021-03-11 00:14:59 +00:00
Andras Kloczl
07e414017c Prevent using invalid result uri during multi user image change 
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
 2021-03-11 00:13:05 +00:00
jasonwshsu
ffe8521b9f Add seekBar properties 'tickMark' to LabeledSeekBarPreference 
Bug: 173940869
Test: manual
Change-Id: I135e52181bdb86ded6187a3fa30b9cffeb69d451
(cherry picked from commit 9584ba6b57)
 2021-03-10 23:34:26 +00:00
Abel Tesfaye
bf182903ed Merge "Update autorotate search terms" into sc-dev 2021-03-10 23:25:37 +00:00
Treehugger Robot
e9dff191b0 Merge "Update src/com/android/settings/inputmethod/OWNERS" 2021-03-10 23:05:57 +00:00