PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,245 Commits 1 Branch 0 Tags
40f66f93d88310ed3f78eb8a6f7e6960b25e378b
Commit Graph

82245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bill Yi
af6cb9521a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0002b7e1f99b67a31204e15c90ba5dbc1d4c37c2
 2021-04-27 11:44:41 +00:00
Bill Yi
73e1e602f3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia451dd13495fb8921ec6c86e1351802e94d078d4
 2021-04-27 11:41:02 +00:00
Bill Yi
bfdd5160c6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic0ed785c170a86f67ab29d9c90dd6829c8311e41
 2021-04-27 11:39:24 +00:00
Bill Yi
1296c998dc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifb1673ddffb724df5b7a587e9dd9a761b9820b3b
 2021-04-27 11:36:37 +00:00
Bill Yi
abedd5d55a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8a23676662f760eca22337c8cee2b1df7b348ccc
 2021-04-27 11:33:06 +00:00
Bill Yi
4012b44f4f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I829f3d222f9d37b06d9d6f3408f0f67297162a76
 2021-04-27 11:30:15 +00:00
Bill Yi
02a535e27d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1f604c21a5a6dc46c093cab5eadd178e5b931837
 2021-04-27 11:26:41 +00:00
Tsung-Mao Fang
4470faa175 Tweak spacing for private DNS mode dialog 
Test: See the screen
Fix: 186499972
Change-Id: Iaae7d625ef2931b9ba22e6edbd414ebe14cfdc3f
 2021-04-27 17:59:01 +08:00
YUKAI HUNG
f81503e7bc Merge "Draw timestamp information into BatteryChartView manually (1/2)" into sc-dev am: 95b5d0393d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319865

Change-Id: I894265d5ef62befca05fbff6b9f51754288f2fa0
 2021-04-27 09:43:19 +00:00
Jeremy Goldman
a9b19776f8 Merge "Combine 5G and recommended strings" into sc-dev am: f1ee6987e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233637

Change-Id: I979e3a78742eeca8405e4cb5be1bc7f0fe8cad3c
 2021-04-27 09:43:09 +00:00
YUKAI HUNG
95b5d0393d Merge "Draw timestamp information into BatteryChartView manually (1/2)" into sc-dev 2021-04-27 09:19:17 +00:00
Peter_Liang
50efd602b9 Update the BC style for the vision settings in SuW. 
Bug: 179234608
Test: manual test
Change-Id: I152eaab8ad77c7a1fccbc82d7ed8cef406fc1821
 2021-04-27 16:29:56 +08:00
Jeremy Goldman
f1ee6987e6 Merge "Combine 5G and recommended strings" into sc-dev 2021-04-27 07:41:45 +00:00
ykhung
2f441d2a3e Draw timestamp information into BatteryChartView manually (1/2) 
screenshot: https://screenshot.googleplex.com/8zJcMJeMDovfhdD

Bug: 183921876
Test: make SettingsRoboTests
Change-Id: Ib4ac21ba2d12a6cb65b46ba3f1023fe9f14c539b
 2021-04-27 07:25:53 +00:00
Yanting Yang
a62dfa6e8c Merge "Update homepage icon for Wallpaper & style" into sc-dev am: 72ba46a9bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319863

Change-Id: I56a5524c31a708bdec6560a30508cf10756ec694
 2021-04-27 07:18:46 +00:00
Yanting Yang
72ba46a9bb Merge "Update homepage icon for Wallpaper & style" into sc-dev 2021-04-27 07:04:40 +00:00
Lucas Lin
00eb4bbf58 Merge "Use [set|get]PrivateDnsMode directly" into sc-dev am: 614f653aeb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14230401

Change-Id: Ib5143bd894b26b93681f5330bbe681dbc903c492
 2021-04-27 06:15:06 +00:00
Lucas Lin
614f653aeb Merge "Use [set|get]PrivateDnsMode directly" into sc-dev 2021-04-27 06:03:14 +00:00
Joy Babafemi
8dce1c8da7 Merge "Update UWB toggle state with a getter API" into sc-dev am: 4b19eae08b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14283946

Change-Id: I34f3cbe25b051f269f1e4359662919b97fc911d0
 2021-04-27 05:26:53 +00:00
Joy Babafemi
4b19eae08b Merge "Update UWB toggle state with a getter API" into sc-dev 2021-04-27 05:10:52 +00:00
Yanting Yang
c70d3e10d2 Merge "Update string for the wallpaper title on homepage" into sc-dev am: db74d13d4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297856

Change-Id: I02e5879c2be5c284e171a148376c46adcea28268
 2021-04-27 03:48:39 +00:00
Joy Babafemi
7cf391dddd Update UWB toggle state with a getter API 
Also updates capitalization for strings

Test: Manual on Raven & Robotest
Bug: 183254940
Change-Id: I9d3a4694746b44e80c60a9097abd0cbb647c1348
 2021-04-27 03:46:39 +00:00
Yanting Yang
243956834d Update homepage icon for Wallpaper & style 
Bug: 185334720
Bug: 178363516
Test: visual
Change-Id: Iebc213be301e157a10299ff611817e8b03704c8a
 2021-04-27 03:07:15 +00:00
Yanting Yang
db74d13d4f Merge "Update string for the wallpaper title on homepage" into sc-dev 2021-04-27 03:05:18 +00:00
Dmitri Plotnikov
9fac937e35 Merge "Replace TIME_COMPONENT_... constants with POWER_COMPONENT_ constants" into sc-dev am: dd9c9a8c17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14298485

Change-Id: I94de1fe24348462df7a73317ec6fd0f5dcb84fa6
 2021-04-26 22:47:40 +00:00
Dmitri Plotnikov
dd9c9a8c17 Merge "Replace TIME_COMPONENT_... constants with POWER_COMPONENT_ constants" into sc-dev 2021-04-26 22:44:26 +00:00
Evan Chen
404dbe7c55 Merge "Companion Device App showing in Settings" into sc-dev am: e14cc634dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14148351

Change-Id: I272037634069cb76cea518abafbb09b62f7127a9
 2021-04-26 18:59:25 +00:00
Evan Chen
e14cc634dc Merge "Companion Device App showing in Settings" into sc-dev 2021-04-26 18:22:02 +00:00
Edgar Wang
aa3b120acb Merge "Remove divider in Date & Time Settings" into sc-dev am: c603e02d11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187783

Change-Id: Ie06ec7328e2ae059b3f9d43e29e4b9c2ca7109a4
 2021-04-26 16:36:18 +00:00
Edgar Wang
c603e02d11 Merge "Remove divider in Date & Time Settings" into sc-dev 2021-04-26 16:15:55 +00:00
TreeHugger Robot
03664458f5 Merge "Tweak title in privacy page" into sc-dev am: 42e05a07b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297858

Change-Id: I80c938defad591a9c46698b91fad3fb81ea4bc4a
 2021-04-26 14:23:16 +00:00
TreeHugger Robot
42e05a07b5 Merge "Tweak title in privacy page" into sc-dev 2021-04-26 13:54:51 +00:00
Edgar Wang
4f3ee93285 Remove divider in Date & Time Settings 
- Add preferenceCategory for Time zone

Fixes: 183578528
Test: robotest & visual
Change-Id: If275c569d810a8bc4d2e2620c51b54379dca31b4
 2021-04-26 20:50:23 +08:00