Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,379 Commits 1 Branch 0 Tags
3eb41d4fc63b8dfbe9f5c045119e780370545f2a
Commit Graph

7760 Commits

Author SHA1 Message Date
Ronish Kalia
0b30679a2c Merge changes from topic "qr-code-and" 
* changes:
  Add tests for QRCodeScannerPreferenceController
  Add a new setting for QR Code Scanner button on lockscreen
 2021-11-15 16:35:45 +00:00
TreeHugger Robot
59f749e112 Merge "Revert "Revert "Update styling of NLS dialog""" 2021-11-12 14:01:31 +00:00
Julia Reynolds
617a562660 Revert "Revert "Update styling of NLS dialog"" 
This reverts commit 6d37fdc546.

Reason for revert: The Android Auto test has been disabled

Change-Id: Iddbe3098d79fbe33c16c2a9c06c8df4a22b49afb
Bug: 205920324
Fixes: 191331361
 2021-11-12 11:46:37 +00:00
Shaowei Shen
1f41bae30f Merge "[Sound panel] Use localized string for button text" into sc-v2-dev am: 2874b6442e am: da06c920b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16236322

Change-Id: I39cf8181840d77c828183f3e11b8996ea5bb7551
 2021-11-12 09:49:52 +00:00
Shaowei Shen
da06c920b9 Merge "[Sound panel] Use localized string for button text" into sc-v2-dev am: 2874b6442e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16236322

Change-Id: I7b413717713090f236d5dcddd8978927dc4da02b
 2021-11-12 09:32:16 +00:00
Shaowei Shen
2874b6442e Merge "[Sound panel] Use localized string for button text" into sc-v2-dev 2021-11-12 09:14:19 +00:00
Julia Reynolds
6d37fdc546 Revert "Update styling of NLS dialog" 
This reverts commit 358fe8e508.

Reason for revert: Android Auto has a test depending on the old layout of the dialog, and we need to revert until that test is updated

Change-Id: I47095be8c89d5bea27de835ea3fa700e3b90b49d
Bug: 205920324
Bug: 191331361
 2021-11-11 18:55:35 +00:00
shaoweishen
dbc08a2178 [Sound panel] Use localized string for button text 
use localized string "Settings" as button text in Sound panel.
revert text change in ag/15926634

Bug: 204326209
Test: Verified on device
Change-Id: Ibe99369d3c9f9f2131a33b7831f93a5d1554db3f
 2021-11-11 08:24:04 +00:00
Julia Reynolds
358fe8e508 Update styling of NLS dialog 
To make the content easier to parse

Test: manual
Fixes: 191331361
Change-Id: I1a86b761a09fd29a9581abfd9c4b313feb19394a
 2021-11-08 20:54:40 +00:00
Julia Reynolds
98cc4f1302 Some updates for better localization 
Test: manual
Fixes: 190021494
Fixes: 185203196
Fixes: 190088372
Change-Id: Ia2871814870a1f0e5c5f2deed06dcbef7b2bd967
 2021-11-05 20:05:41 +00:00
TreeHugger Robot
d1f20d673e Merge "Update "Mobile network standby" attribute label into "Mobile network"" into sc-v2-dev am: c425a4ae93 am: 8e9b44ea7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16182698

Change-Id: I2b01076c97aad16df7ed6576a1b13cbfc6c23bd1
 2021-11-04 10:28:06 +00:00
TreeHugger Robot
8e9b44ea7d Merge "Update "Mobile network standby" attribute label into "Mobile network"" into sc-v2-dev am: c425a4ae93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16182698

Change-Id: I729cd092754422afd7c44cef0d5873336b070f80
 2021-11-04 10:09:24 +00:00
TreeHugger Robot
c425a4ae93 Merge "Update "Mobile network standby" attribute label into "Mobile network"" into sc-v2-dev 2021-11-04 09:11:04 +00:00
ykhung
22dc875ba7 Update "Mobile network standby" attribute label into "Mobile network" 
Bug: 205051643
Test: make SettingsRoboTests
Change-Id: Ia8f5c3e76d72ffa6fd0601c58b1b3d157b711b30
 2021-11-04 15:55:23 +08:00
TreeHugger Robot
a6566fe3d7 Merge "Remove the text for untethered bt device" into sc-v2-dev am: 8118b9ff29 am: ac476ff63b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170316

Change-Id: Icf3de5a331dc58c0a815e8a0602b8fc69ccd3615
 2021-11-04 04:48:27 +00:00
TreeHugger Robot
ac476ff63b Merge "Remove the text for untethered bt device" into sc-v2-dev am: 8118b9ff29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170316

Change-Id: I89ae3ac6b59ff776e745c5885f03ff529f9c7677
 2021-11-04 04:25:46 +00:00
TreeHugger Robot
8118b9ff29 Merge "Remove the text for untethered bt device" into sc-v2-dev 2021-11-04 04:08:45 +00:00
Hugh Chen
ab3a70cf1e Remove the text for untethered bt device 
Bug: 204066796
Test: make -j64 RunSettingsRoboTests
Change-Id: I35fec4ff998332e6937fc9c360ea488b35b477f8
 2021-11-04 02:52:37 +00:00
ronish
2d0ded469e Add a new setting for QR Code Scanner button on lockscreen 
This change adds a new setting to enable/disable the lock screen entry
point for QR Code scanner

Bug: 200536509
Test: make RunSettingsRoboTests -j40

Change-Id: Id200499b62f59fd631d837f9ae8e494532c23e13
 2021-11-02 16:20:02 +00:00
Jernej Virag
97ea279c45 Add setting to allow configuration of long press home gesture 
This allows configuration of long press home gesture on 2-/3-button navigation configurations. It allows the user to enable and disable the invocation of assistant app using said gesture.

Bug: 191888710
Test: Unit tests and on a physical device.
Change-Id: I18cb290058ac5c2a748d40802b942404f548b868
 2021-10-26 13:34:02 +00:00
Ganesh Olekar
5b44127dc6 Merge "Update toggle string for cam and mic access" into sc-v2-dev am: f24702f643 am: cce029599f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16102463

Change-Id: Ibc16462fbaf1cc37d0f059d1661133637d4e1217
 2021-10-25 17:37:08 +00:00
Ganesh Olekar
cce029599f Merge "Update toggle string for cam and mic access" into sc-v2-dev am: f24702f643 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16102463

Change-Id: I47bf9211925aaa3341f764db54009c58d9a6ffcf
 2021-10-25 17:19:33 +00:00
Ganesh Olekar
444bca2226 Update toggle string for cam and mic access 
Test: Screenshot taken reflecting updated text
Bug: 197757242

Change-Id: Ia8f70d27304d20b1b748c80600e75d1de9f17c55
 2021-10-21 17:23:31 +00:00
Chienyuan
f06def46f7 RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth" am: 1b9a21ffb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048451

Change-Id: I7a693b6644e200a7aa66f09704e39c178aa2baa7
 2021-10-21 15:18:13 +00:00
TreeHugger Robot
c1770fe4cf Merge "RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth"" into sc-v2-dev 2021-10-21 15:04:46 +00:00
Yanting Yang
260365b00a Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-v2-dev am: 06ebebdf0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16081488

Change-Id: If2595b9b8fafcb138e692a2cc35cd378f5524f2b
 2021-10-21 11:09:06 +00:00
YUKAI HUNG
265d683dc1 Merge "Update app usage page power summary" into sc-v2-dev am: 8e97bdd76c am: 054f3b5199 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16091765

Change-Id: Ic7bf43d79304b740b5b6cf2a148b317860ea4869
 2021-10-21 11:08:48 +00:00
Yanting Yang
06ebebdf0f Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-v2-dev 2021-10-21 10:52:25 +00:00
YUKAI HUNG
054f3b5199 Merge "Update app usage page power summary" into sc-v2-dev am: 8e97bdd76c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16091765

Change-Id: Ifbe0fee50f01f00784bd65aa6124081b41b1f3c7
 2021-10-21 10:48:11 +00:00
Wesley.CW Wang
23a5fb5e74 Update app usage page power summary 
- Present empty string when this app consumed power but no usage time,
 usually they are some system components

Bug: 197749108
Test: make -j64 RunSettingsRoboTest
Change-Id: I1e88babb30c871748fa1f5fc23c7b4d834e384fd
 2021-10-21 17:29:36 +08:00
Yanting Yang
2c7eb91a96 Rephrase dialog message of clear storage dialog for security concern 
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620)
 2021-10-19 02:31:14 +00:00
Yanting Yang
d091ce4725 Merge "Rephrase dialog message of clear storage dialog for security concern" 2021-10-19 02:29:35 +00:00
Yuri Lin
8cab46f57a Merge "Merge messages & conversations settings for DND priority senders." 2021-10-18 15:03:27 +00:00
Yanting Yang
0c359da620 Rephrase dialog message of clear storage dialog for security concern 
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
 2021-10-14 15:07:14 +00:00
Chienyuan
1b9a21ffb5 RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth" 
Bug: 197609370
Bug: 201630499
Test: manual
Change-Id: I597a2105ca851dd41d92109f7b1a5d0137942601
(cherry picked from commit 5be9255ddf)
 2021-10-14 08:47:16 +00:00
Betty Chang
4bce73b4f7 Merge "Add String for information about Wi-Fi scanning when Wi-Fi is off." into sc-qpr1-dev am: c0b9f4bdba am: 5a5afba75b am: ae320ac284 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047548

Change-Id: Ie9e189bce8600015e822b576f94b6a37b3cde792
 2021-10-13 17:26:12 +00:00
Betty Chang
ae320ac284 Merge "Add String for information about Wi-Fi scanning when Wi-Fi is off." into sc-qpr1-dev am: c0b9f4bdba am: 5a5afba75b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047548

Change-Id: Iad256ab39ccde14b1996e60d32f3b17127319033
 2021-10-13 17:15:40 +00:00
Betty Chang
5a5afba75b Merge "Add String for information about Wi-Fi scanning when Wi-Fi is off." into sc-qpr1-dev am: c0b9f4bdba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047548

Change-Id: Ifa14bb3bcb79634a06ca53a03a2fb25f882b09b9
 2021-10-13 17:01:59 +00:00
Betty Chang
e7f8a872a5 Merge "Add String for information about Wi-Fi scanning when Wi-Fi is off." into sc-qpr1-dev am: c0b9f4bdba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047548

Change-Id: Ibd751df31fb63f3277b4319ee747f61cdb4640ec
 2021-10-13 17:01:56 +00:00
Betty Chang
c0b9f4bdba Merge "Add String for information about Wi-Fi scanning when Wi-Fi is off." into sc-qpr1-dev 2021-10-13 16:46:07 +00:00
changbetty
b7509a3079 Add String for information about Wi-Fi scanning when Wi-Fi is off. 
Bug: 202323013
Test: make
Change-Id: I22618a57bfecd02508f2d4a53ff6c65071de2fd1
 2021-10-13 14:07:27 +00:00
Shaowei Shen
7a4715c7fe Merge "[Sound panel] Update Ui layout to match with mertial next" into sc-v2-dev am: a6fc26dd45 am: bbff2d4bd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926634

Change-Id: Ibd5a8815b353591384cc624b81a9127a4b72c98f
 2021-10-13 12:21:03 +00:00
Shaowei Shen
bbff2d4bd3 Merge "[Sound panel] Update Ui layout to match with mertial next" into sc-v2-dev am: a6fc26dd45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926634

Change-Id: I751ee13a0ab20cb9caefb8388866dd35c8a3590c
 2021-10-13 12:11:45 +00:00
shaoweishen
fb164fe128 [Sound panel] Update Ui layout to match with mertial next 
please check bug for before/after screenshot.

Bug: 191317779
Test: verified on device
Change-Id: Ia570dde71ce9f18376eaba48102cecde6adb85bb
 2021-10-12 14:24:09 +00:00
TreeHugger Robot
0c8a97ff73 Merge "Remove connection preferences "Files received via Bluetooth"" 2021-10-12 07:14:07 +00:00
Chienyuan
5be9255ddf Remove connection preferences "Files received via Bluetooth" 
Bug: 197609370
Bug: 201630499
Test: manual
Change-Id: I597a2105ca851dd41d92109f7b1a5d0137942601
 2021-10-09 01:19:00 +08:00
TreeHugger Robot
433f2bca45 Merge "Update the title of Gesture Navigation page title" 2021-10-08 01:58:07 +00:00
TreeHugger Robot
bf19d369a0 Merge "Update adaptive preference summary" into sc-v2-dev am: 6ff60d7771 am: e6a10f3487 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15981706

Change-Id: If760aaa0006cadb1f5cbb999b977ffe719dfb6d7
 2021-10-06 10:19:36 +00:00
TreeHugger Robot
e6a10f3487 Merge "Update adaptive preference summary" into sc-v2-dev am: 6ff60d7771 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15981706

Change-Id: I33990898878a7f3a451667827936503f707f09f7
 2021-10-06 10:14:33 +00:00
Wesley.CW Wang
4137253658 Update adaptive preference summary 
Bug: 195627250
Test: make RunSettingsRoboTests
Change-Id: I50ed736bbba7ac8d3d6fcf026e9e17e2116f86a7
 2021-10-05 17:52:43 +08:00