Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,554 Commits 1 Branch 0 Tags
249de94deaf6b7c7b48cf08b5969b3a80c2009b0
Commit Graph

87554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Curtis Belmonte
c17e2e75a5 Merge "Log new auth-related framework atoms for Android 12" into sc-dev am: b662335341 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14257139

Change-Id: Ic20841bee00c0a6627d1c772c346409edf894ba1
 2021-04-21 21:57:59 +00:00
Curtis Belmonte
0df91fb86c Merge "Log new auth-related framework atoms for Android 12" into sc-dev am: b662335341 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14257139

Change-Id: I1078fe8732411656a2b7191e9b5e68a37861aab1
 2021-04-21 21:56:01 +00:00
Curtis Belmonte
ddd6e8dde7 Merge "Log new auth-related framework atoms for Android 12" into sc-dev am: b662335341 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14257139

Change-Id: I53c80ff6d1e69df9c69dd90fb3d6daa42c3a30bc
 2021-04-21 21:55:36 +00:00
Curtis Belmonte
b662335341 Merge "Log new auth-related framework atoms for Android 12" into sc-dev 2021-04-21 21:34:22 +00:00
Neil Fuller
297ba96a01 Merge "Remove restriction for "Use location..."" into sc-dev am: 33aa65b3cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14251331

Change-Id: Ief6368326813f6e444675ce0ff19ba35b3e0ff93
 2021-04-21 20:01:40 +00:00
Neil Fuller
1ce7157d63 Merge "Remove restriction for "Use location..."" into sc-dev am: 33aa65b3cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14251331

Change-Id: I89c59f36081d244a722f726e950e23a327afe0b1
 2021-04-21 20:00:47 +00:00
Neil Fuller
91f2d0010f Merge "Remove restriction for "Use location..."" into sc-dev am: 33aa65b3cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14251331

Change-Id: Ia0d58fb47e9317d7d95398f31a6e0d3f987dc730
 2021-04-21 20:00:24 +00:00
Neil Fuller
33aa65b3cc Merge "Remove restriction for "Use location..."" into sc-dev 2021-04-21 19:54:41 +00:00
Chloris Kuo
61bb91658f NAS setting onboarding string change 
Bug: 185112379
Bug: 185535840
Test: manual test on device
Change-Id: Ieb7ea74398ac333b4adc722ea54b30b9f89d02a1
 2021-04-21 12:15:52 -07:00
lucaslin
188d66a709 Use [set|get]PrivateDnsMode directly 
The value of PRIVATE_DNS_MODE_* has changed from String to int and
ConnectivityManager provides 2 new APIs to set and get private
DNS mode, the caller can use them directly and doesn't need to update
Settings by itself.

Bug: 185311744
Test: 1. make RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest
      2. make RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Change-Id: I47706efe9c53a00438fdec97fda244638cecb3dc
 2021-04-22 01:46:05 +08:00
TreeHugger Robot
ffb9e456d3 Merge "Notif history styling updates" into sc-dev am: b768489fa0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14266709

Change-Id: Ie0ee54c030626845189e05ca4e8268450edf83eb
 2021-04-21 17:19:25 +00:00
TreeHugger Robot
4976265375 Merge "Notif history styling updates" into sc-dev am: b768489fa0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14266709

Change-Id: Id48c975be077f7689dd48b61d388844be58842be
 2021-04-21 17:18:03 +00:00
TreeHugger Robot
3825c962b9 Merge "Notif history styling updates" into sc-dev am: b768489fa0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14266709

Change-Id: I0f9478f1b44d7c3edc362f168728d737d5a2dcd8
 2021-04-21 17:16:54 +00:00
TreeHugger Robot
b768489fa0 Merge "Notif history styling updates" into sc-dev 2021-04-21 16:46:31 +00:00
Sally Yuen
8a495fd55c Merge "Add extra dim keywords to aosp settings" into sc-dev am: 790d69d465 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14252125

Change-Id: I59b5bcb68a725ad69a48dbd8088db7f02d5f850e
 2021-04-21 16:25:30 +00:00
Julia Reynolds
b1dda2487f Merge "Use a new string for category headers" into sc-dev am: 5770b4e928 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14265928

Change-Id: I9bb8705b59e20e3fd49dda97ad345c72e3fcad5b
 2021-04-21 16:25:04 +00:00
Sally Yuen
fb29b725c0 Merge "Add extra dim keywords to aosp settings" into sc-dev am: 790d69d465 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14252125

Change-Id: Ic710c818cab2f65be5db8e8f986c2480093e205d
 2021-04-21 16:23:44 +00:00
Sally Yuen
6a7eb6e47f Merge "Add extra dim keywords to aosp settings" into sc-dev am: 790d69d465 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14252125

Change-Id: I5a550926f200025d66b364a49622cb607abc4589
 2021-04-21 16:23:30 +00:00
Julia Reynolds
4cc62db155 Merge "Use a new string for category headers" into sc-dev am: 5770b4e928 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14265928

Change-Id: Ib01630aa088f3bd0156a55f9cd541cbc4a5f255d
 2021-04-21 16:23:21 +00:00
Julia Reynolds
c258da5c1d Merge "Use a new string for category headers" into sc-dev am: 5770b4e928 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14265928

Change-Id: Ica558f736109f99fadfb60d4fd58812148bf597a
 2021-04-21 16:23:01 +00:00
Sally Yuen
790d69d465 Merge "Add extra dim keywords to aosp settings" into sc-dev 2021-04-21 16:13:46 +00:00
Julia Reynolds
5770b4e928 Merge "Use a new string for category headers" into sc-dev 2021-04-21 16:10:22 +00:00
Julia Reynolds
e8a33e0c83 Notif history styling updates 
Test: manual
Fixes: 185625272
Change-Id: Ie9d62573b2c6480b84ab9172beccf519e7e880dc
 2021-04-21 10:55:51 -04:00
Julia Reynolds
60ded30669 Use a new string for category headers 
The existing string refers to singular objects, but we need
to refer to several

Test: manual
Fixes: 185325146
Change-Id: Ie22fa7a8c1857558baceb05d8ca80cfd6ff61ed4
 2021-04-21 14:48:31 +00:00
YUKAI HUNG
038ea6c4cb Merge "Add new expandable preference component" into sc-dev am: c6c3b383da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260595

Change-Id: If2f78cfb89edee1613b3a5de51c311ff521b8bd2
 2021-04-21 14:47:03 +00:00
YUKAI HUNG
825cee7382 Merge "Add new expandable preference component" into sc-dev am: c6c3b383da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260595

Change-Id: I5f4708a6fb429264e308667fe894c0416208c67e
 2021-04-21 14:45:24 +00:00
YUKAI HUNG
4bb02f3a03 Merge "Add new expandable preference component" into sc-dev am: c6c3b383da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260595

Change-Id: I5265baab866a2f68b90d620a03a2d92e0195b133
 2021-04-21 14:44:58 +00:00
YUKAI HUNG
c6c3b383da Merge "Add new expandable preference component" into sc-dev 2021-04-21 14:20:26 +00:00
Peter_Liang
d2658b57d8 Fix the entire text is aligned middle of the Vision setting screen. 
Root cause:
The preferenceStyle attribute was overridden in the PreferenceTheme.SetupWizard style.

Solution:
Remove the overriden preferenceStyle.

Bug: 183086481
Test: manual test
Change-Id: I60d127baef9274170a31eaf3cfbd210312334311
 2021-04-21 22:08:45 +08:00
TreeHugger Robot
fbc72482e3 Merge "Notif history Long tap functions as short tap" into sc-dev am: e1b63f00a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14254102

Change-Id: I71ed1fcc3356172d93f4a585771a9ec7e8e4a220
 2021-04-21 13:35:08 +00:00
TreeHugger Robot
b4678cd9a0 Merge "Fix background inconsistency of the Settings page in SUW" into sc-dev am: 7f065adfcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14255423

Change-Id: If40e4d2476825477f949a919ca106b63af9da571
 2021-04-21 13:34:58 +00:00
TreeHugger Robot
e80dd29760 Merge "Notif history Long tap functions as short tap" into sc-dev am: e1b63f00a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14254102

Change-Id: I813039bccdc1663b21a125fd333ac5c792287a9d
 2021-04-21 13:33:38 +00:00
TreeHugger Robot
1170dc1800 Merge "Fix background inconsistency of the Settings page in SUW" into sc-dev am: 7f065adfcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14255423

Change-Id: Id669662a2c093a2497653397501c375eb972b57c
 2021-04-21 13:33:29 +00:00
TreeHugger Robot
ecf3583e2e Merge "Notif history Long tap functions as short tap" into sc-dev am: e1b63f00a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14254102

Change-Id: I6db26625699e368eaaf227aadc96426125601052
 2021-04-21 13:33:15 +00:00
TreeHugger Robot
bd2b2cfdc1 Merge "Fix background inconsistency of the Settings page in SUW" into sc-dev am: 7f065adfcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14255423

Change-Id: I3bd7071e577a02b36d44274b49832329b57149fb
 2021-04-21 13:33:07 +00:00
TreeHugger Robot
e1b63f00a2 Merge "Notif history Long tap functions as short tap" into sc-dev 2021-04-21 13:10:25 +00:00
TreeHugger Robot
7f065adfcb Merge "Fix background inconsistency of the Settings page in SUW" into sc-dev 2021-04-21 13:06:45 +00:00
Wesley.CW Wang
2cc7431fa3 Update app usage page active time format 
- Make the text of active time support different states like foreground or background usage time less than one minutes

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I20be88e5b23a679c15f97bac4b9d400557685463
 2021-04-21 20:20:05 +08:00
ykhung
b8721cf980 Add new expandable preference component 
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Id2b2a1f4fa557467efcaa013aa9e978b2c66d974
 2021-04-21 11:58:45 +00:00
Matt Pietal
aa0062c92f Merge "Remove "Device Controls" from Settings" into sc-dev am: ee2086872e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215389

Change-Id: I8936eee6221fc6090e1cf1ee185c1cd0214f5d96
 2021-04-21 11:40:12 +00:00
menghanli
54ded4cb5e [FAB] Improve the shortcut dialog ux after change accessibility button mode 
Problem: The "Customize accessibility button" link only exists when the user selects the FAB location, which may confuse and disorient the user
Solution: It is hard to back to floating menu mode if we turns to navigation bar from "Customize accessibility button" setting.  Added the link in the "navigation bar mode" can help on this problem.

Fix: 183342563
Test: manual test
Change-Id: Ife572b0962f3a57c34af56cd930a487c9d813c0c
 2021-04-21 19:39:13 +08:00
Matt Pietal
9cfa695a4a Merge "Remove "Device Controls" from Settings" into sc-dev am: ee2086872e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215389

Change-Id: Icf782b29fb0670c2b60123e90488d023f9a1abc4
 2021-04-21 11:38:42 +00:00
Matt Pietal
8310786aef Merge "Remove "Device Controls" from Settings" into sc-dev am: ee2086872e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215389

Change-Id: I87db94c693686b479a62f9375f54feb54bf4a031
 2021-04-21 11:38:20 +00:00
Matt Pietal
ee2086872e Merge "Remove "Device Controls" from Settings" into sc-dev 2021-04-21 11:31:33 +00:00
Alex Johnston
8a3372b075 Merge "Fix maximum time to lock" into sc-dev am: 2f9b5b6ad7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14109359

Change-Id: Iea87a55ee8a521b706090543ff5d9c53258b62db
 2021-04-21 09:29:49 +00:00
Alex Johnston
01e46e8b44 Merge "Fix maximum time to lock" into sc-dev am: 2f9b5b6ad7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14109359

Change-Id: Id0b4872853dab8dfb7dd029d69cc9b3370b68c99
 2021-04-21 09:17:49 +00:00
Alex Johnston
364df11fdd Merge "Fix maximum time to lock" into sc-dev am: 2f9b5b6ad7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14109359

Change-Id: I3e6717637d45e7b5470bbd85c5a6df3dcb68b499
 2021-04-21 09:17:43 +00:00
TreeHugger Robot
940ddee02a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b2185f5ede -s ours am: 58ff823e7e -s ours am: d070df12f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic39de791c5b4b59704ec4ace896f07f7a2aad82d
 2021-04-21 09:17:40 +00:00
Automerger Merge Worker
48767f99ca Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34ce6187c8 -s ours am: 95ffa79af1 -s ours" into sc-dev am: 1119508d1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iabf0469a2346e97d7147b161de3d2a7a70eafe9b
 2021-04-21 09:17:33 +00:00
TreeHugger Robot
d064a2bffd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b2185f5ede -s ours am: 58ff823e7e -s ours am: d070df12f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc609f98c416044f78fe2cf31fdd8c552a8f8bfd
 2021-04-21 09:17:29 +00:00