PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,073 Commits 1 Branch 0 Tags
04a8c257feec136eccf0957b09a49cdd88e4f35c
Commit Graph

82073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YUKAI HUNG
04a8c257fe Merge "Draw timestamp information into BatteryChartView manually (2/2)" into sc-dev am: 70c872c160 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319868

Change-Id: I9133f7287227c1a1dd59d6ab1acdb5ae3c767443
 2021-04-28 04:27:05 +00:00
YUKAI HUNG
70c872c160 Merge "Draw timestamp information into BatteryChartView manually (2/2)" into sc-dev 2021-04-28 04:08:55 +00:00
Kevin Chyn
5c71842fcb Merge changes from topic "new-fp-strings" into sc-dev am: 77ddf11ae6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330069

Change-Id: If8fcbd5ff709a17141de83e86e92521ee2a9b49f
 2021-04-28 03:56:23 +00:00
Kevin Chyn
9a42a1dca5 Update FingerprintEnrollIntro text and icons am: 28d635d9aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330066

Change-Id: I2d18e8534a2395988a72506d57c5f628260c132b
 2021-04-28 03:56:17 +00:00
Kevin Chyn
77ddf11ae6 Merge changes from topic "new-fp-strings" into sc-dev 
* changes:
  Update fingerprint strings
  Update FingerprintEnrollIntro text and icons
 2021-04-28 03:31:31 +00:00
TreeHugger Robot
a4cc6e8727 Merge "Revert "Remove "See all" button"" into sc-dev am: e37695c89d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14324027

Change-Id: I2d3f128527daf542d25bc60422afbcc5acc38cce
 2021-04-27 21:41:02 +00:00
Kevin Chyn
290298d58d Update fingerprint strings 
Bug: 185804815
Test: manual
Change-Id: I5d1431646cd320e0f72e3c5f9f22cc2c9c2d0ef6
 2021-04-27 14:37:34 -07:00
Kevin Chyn
28d635d9aa Update FingerprintEnrollIntro text and icons 
This change uses strings that have already been merged. Anything
requiring string changes will be in a follow-up CL

Bug: 185804815
Test: on-device
Change-Id: I4e3d3631bbb9f976badf9d4a1582456b3cb7fae7
 2021-04-27 14:26:22 -07:00
TreeHugger Robot
e37695c89d Merge "Revert "Remove "See all" button"" into sc-dev 2021-04-27 21:00:30 +00:00
Alex Johnston
004042f20d Merge "Correct string ConfirmDeviceCredentialActivity" into sc-dev am: f3be8a6cc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14296227

Change-Id: Ica7131d086918e7946f5cec8fdc517b983e16c64
 2021-04-27 20:35:07 +00:00
Alex Johnston
f3be8a6cc8 Merge "Correct string ConfirmDeviceCredentialActivity" into sc-dev 2021-04-27 20:16:00 +00:00
Yu-Han Yang
cf41f951ff Revert "Remove "See all" button" 
This reverts commit 1170a08d43.

Reason for revert: design decision changed.

Change-Id: I954f8899f33a4c0e8945744e9bfcdbb48d9d705b
 2021-04-27 18:36:18 +00:00
Jakub Pawlowski
38302d8886 Fix app name label spoofing am: 54e74cae5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14076525

Change-Id: I149be19aa3ec85e6a6646c43a938c1ad3d1b327c
 2021-04-27 17:30:50 +00:00
Jakub Pawlowski
54e74cae5f Fix app name label spoofing 
Fix idea was copied from
frameworks/base/core/java/android/accounts/ChooseAccountActivity.java

Bug: 183710549
Test: verified with POC app from bug that the fix is working
Change-Id: I40131965ed0d1e11cdf4b56daef39a95b80fdd7d
 2021-04-27 17:06:59 +00:00
ykhung
10000eb254 Draw timestamp information into BatteryChartView manually (2/2) 
screenshot: https://screenshot.googleplex.com/8zJcMJeMDovfhdD

Bug: 183921876
Test: make SettingsRoboTests
Change-Id: I276f70c3cf8ebd2316f987ace0d6537ed2cf8a45
 2021-04-27 16:55:13 +00:00
Adam Bookatz
4b47ce7659 Merge "UserDetailsSettings uses Guest string, not Guest name" into sc-dev am: e035a81ddc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14282598

Change-Id: I18737caa0626ad2eac6fd93e6c6d564020066724
 2021-04-27 16:46:22 +00:00
Automerger Merge Worker
0fdaafa672 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697411518c -s ours am: 81aaadca0e -s ours" into sc-dev am: 7fe923eec3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7bf0363183ac3f996135a11172eaad96769b697
 2021-04-27 16:46:18 +00:00
TreeHugger Robot
830877c040 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e8413529ce -s ours am: 0509118fc5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3653311dd4cf7750a7470651eea9faa7661e0145
 2021-04-27 16:46:14 +00:00
Automerger Merge Worker
dfa490490d Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: c430db5ca3 -s ours" into sc-dev am: 8b3e1ed7ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86f2744353895339122d9aa40f0b07ae6c2ad5f5
 2021-04-27 16:45:20 +00:00
TreeHugger Robot
4f2fcc4984 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4fd6557446 -s ours am: 8d58c02b06 -s ours am: 9761ce3e93 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib78dd9a3105a466424d0086d33d1d24c7c6444d6
 2021-04-27 16:45:13 +00:00
Adam Bookatz
e035a81ddc Merge "UserDetailsSettings uses Guest string, not Guest name" into sc-dev 2021-04-27 16:35:37 +00:00
TreeHugger Robot
6ba6bae697 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-27 16:25:21 +00:00
TreeHugger Robot
0056ac6bf7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-27 16:24:37 +00:00
Automerger Merge Worker
7fe923eec3 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697411518c -s ours am: 81aaadca0e -s ours" into sc-dev 2021-04-27 16:21:56 +00:00
TreeHugger Robot
0171541f46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697411518c -s ours am: 81aaadca0e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77e8734d4049649fe19c74f0eef0015ef8fbbab1
 2021-04-27 16:21:54 +00:00
TreeHugger Robot
0509118fc5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e8413529ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I513fde8dfce142f3119e08e272ab1f83f10e9b09
 2021-04-27 16:21:52 +00:00
Automerger Merge Worker
8b3e1ed7ac Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: c430db5ca3 -s ours" into sc-dev 2021-04-27 16:21:48 +00:00
TreeHugger Robot
413a305c27 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: c430db5ca3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If4187dd45690d6a2889496db8c83dcc5174ce03f
 2021-04-27 16:21:42 +00:00
TreeHugger Robot
9761ce3e93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4fd6557446 -s ours am: 8d58c02b06 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I45e1115533ba4fec0cef8dc3fd42c873e05b631d
 2021-04-27 16:21:39 +00:00
TreeHugger Robot
e8413529ce Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-27 16:16:39 +00:00
TreeHugger Robot
81aaadca0e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697411518c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ae76a9806d39de81adc2d7e127651f7f39dd735
 2021-04-27 16:04:18 +00:00
TreeHugger Robot
8d58c02b06 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4fd6557446 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1c87402a98bc9642b5b555c66aee6f423b84e9ff
 2021-04-27 16:04:08 +00:00
TreeHugger Robot
cce8a5862e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f69ba03181 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7326930b379f809c09450c8d8943701af2fe5040
 2021-04-27 15:56:26 +00:00
TreeHugger Robot
a03e096bb3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a2a94ad379 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8353f8b578c72c197b5c919a6b9601612901b7b
 2021-04-27 15:56:20 +00:00
TreeHugger Robot
c430db5ca3 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-27 15:55:21 +00:00
TreeHugger Robot
697411518c Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-27 15:50:33 +00:00
TreeHugger Robot
4fd6557446 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-27 15:48:51 +00:00
TreeHugger Robot
f69ba03181 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-27 15:47:01 +00:00
TreeHugger Robot
a2a94ad379 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-27 15:42:58 +00:00
Alex Johnston
a942f3fdd1 Correct string ConfirmDeviceCredentialActivity 
* If there is a managed profile but a separate
  profile challenge is not enabled, use the device
  title and subtitle in ConfirmDeviceCredentialActivity.

Manual testing
* Set device PIN
* Create a work profile using TestDPC
* adb shell am start --user 10 -a android.app.action.CONFIRM_DEVICE_CREDENTIAL
* Verify title says 'Enter your device...'
* Add a work profile PIN
* adb shell am start --user 10 -a android.app.action.CONFIRM_DEVICE_CREDENTIAL
* Verify title says 'Enter your work...'
* Do the same for pattern and password

Bug: 163108636
Test: manual testing
Change-Id: I8b61e7d2df5792cbdb2e12b19e5a5582ea2290b7
 2021-04-27 16:35:42 +01:00
Tsung-Mao Fang
801b6fc194 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 am: 9d5a7aa322 am: 59463e3e04 -s ours am: 744dd99af4 -s ours 
am skip reason: skip tag Change-Id I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

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

Change-Id: I740aeca7ee8f647929469c529e6a934d60685fff
 2021-04-27 13:34:21 +00:00
Tsung-Mao Fang
744dd99af4 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 am: 9d5a7aa322 am: 59463e3e04 -s ours 
am skip reason: skip tag Change-Id I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

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

Change-Id: Ia128429dadf68a8276eff806ee0e0eabad088913
 2021-04-27 13:28:36 +00:00
Tsung-Mao Fang
56f011088c [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 am: 92d5e58003 -s ours am: 78de74aa57 -s ours 
am skip reason: skip tag Change-Id I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 0bf3c98b2f is already in history

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

Change-Id: I794e659939bfa11430ab973481f1f6a2bacfc1c5
 2021-04-27 13:26:50 +00:00
Tsung-Mao Fang
78de74aa57 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 am: 92d5e58003 -s ours 
am skip reason: skip tag Change-Id I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 0bf3c98b2f is already in history

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

Change-Id: I1bf9360219cdc326571ffc9604a42792dcc31aba
 2021-04-27 13:12:34 +00:00
Tsung-Mao Fang
59463e3e04 Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 am: 9d5a7aa322 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797

Change-Id: If58e759bcef83da086ded4366ac60647653d62cc
 2021-04-27 13:11:26 +00:00
Tsung-Mao Fang
92d5e58003 Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797

Change-Id: If97943cb25cbbe5388a9b5d28faa50b4df156aad
 2021-04-27 12:55:29 +00:00
Tsung-Mao Fang
9d5a7aa322 Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797

Change-Id: I64550f7d57fd8c4cd2a142188ed78e9bb49f1c9f
 2021-04-27 12:54:02 +00:00
Tsung-Mao Fang
f470b78ff2 Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797

Change-Id: I4dd08163fb97a16c88aa23bdc39851b327034940
 2021-04-27 12:30:50 +00:00
Tsung-Mao Fang
6ac45a7ceb Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797

Change-Id: I80b527b2bb891b3944a11ceecf296fdefaefff72
 2021-04-27 12:15:53 +00:00
Bill Yi
0dfde85685 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie67bcfcb0c86013aae724ff562709f8c11a8796b
 2021-04-27 11:48:42 +00:00