PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,375 Commits 1 Branch 0 Tags
cc3d6d818d2961b624db63c00db26e89608acd20
Commit Graph

81375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
981f61e134 [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: I7f2ae3b87fb0b433b3eccd1d449561198775aa87
 2021-04-27 15:58:42 +00:00
TreeHugger Robot
4ef2e056ff [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: I2807fb346fa44da7b0e5d29fbfb3b8a4fd480176
 2021-04-27 15:58:13 +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
dcc3304de4 [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: I56c9b4a173480aebebfd7bb193a88e0685361284
 2021-04-27 13:29:09 +00:00
Tsung-Mao Fang
546d95c57d [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: If4df14051aae25d5873c3acc43a147c174940f42
 2021-04-27 13:28:47 +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
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
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
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
014706d450 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: Iaf6d095ad49a12768f3944735245c8c23ad69886
 2021-04-27 09:46:17 +00:00
Jeremy Goldman
85de104c6d 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: I11b5cab56faee9089a4507b8bcff3b29c36d2528
 2021-04-27 09:45:56 +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
f846e9108b 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: I1f5bb99102f503b32dd07ab20306fe4c1a74e7db
 2021-04-27 07:21:01 +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
97dd9ed21b 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: I22ea7aea469066c50ecc2dd2dc527e4ab4fb605d
 2021-04-27 06:16:59 +00:00
Lucas Lin
614f653aeb Merge "Use [set|get]PrivateDnsMode directly" into sc-dev 2021-04-27 06:03:14 +00:00
Joy Babafemi
6e2ee60708 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: Iff3618032b2348fab542d87a9bea8a8d5ee7245a
 2021-04-27 05:28:48 +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
05d9f2643e 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: I2fcb281f0dd98706b113ceea026f8f310f3b2ab2
 2021-04-27 03:50:46 +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
3f97ae6990 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: I58a233b516a7dd6b50adaa375dc0d91a8e999ff2
 2021-04-26 22:48:55 +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
40c712e007 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: I84a993c830238e1d44f238cea9583fb67678abe4
 2021-04-26 19:02:55 +00:00