Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,667 Commits 1 Branch 0 Tags
7c82ea06a23142c7fe9e8571f0e4e8edea7680a7
Commit Graph

47641 Commits

Author SHA1 Message Date
Kweku Adams
7c82ea06a2 Merge "Revert "Remove duplicate strings."" into udc-dev am: 9a087d6c19 am: eaba347a70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22106646

Change-Id: I903e6289111448ffe71856b1830b914823ff1953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 20:45:56 +00:00
Julia Reynolds
f98a5d8fb6 Merge "Remove explicit number from string" into udc-dev am: fe310a86de am: 91ef0f1ee4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121609

Change-Id: Iec0ebc4d6e02029800c0009778e9e7f8cf3f2306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 20:40:26 +00:00
Kweku Adams
9a087d6c19 Merge "Revert "Remove duplicate strings."" into udc-dev 2023-03-16 20:14:16 +00:00
Julia Reynolds
fe310a86de Merge "Remove explicit number from string" into udc-dev 2023-03-16 18:52:25 +00:00
Matías Hernández
25514d5380 Merge "Refresh the app's "Conversations" list when there are none" into udc-dev am: 08893ed0b3 am: d0db72339d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22119305

Change-Id: I1240d0ea17e6fff1a9f15a3ec0bd215987c57214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 17:00:57 +00:00
Julia Reynolds
8126e93ff2 Remove explicit number from string 
So it can be translated properly
Test: View notification history screen
Fixes: 222128037

Change-Id: I2d11dd4e427c19ef0c003b1fa2b6882267e2026e
 2023-03-16 12:27:37 -04:00
Matías Hernández
08893ed0b3 Merge "Refresh the app's "Conversations" list when there are none" into udc-dev 2023-03-16 15:57:11 +00:00
Matías Hernández
a5eea1c034 Refresh the app's "Conversations" list when there are none 
Also hide the header in that case (simiarly to bubbles).

Test: atest (new) + manual
Fixes: 273748214
Change-Id: I4f758a0bf5bb8cfa91701185f1568b358d8903a0
 2023-03-16 15:07:13 +01:00
Jason Hsu
35788cfdd2 Merge "Update strings for hearing device U features" into udc-dev am: 5c1652eab0 am: c7f1eb2232 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087473

Change-Id: I18fbcf3a3fe2f1428c4a39fd4ee3fabd0c7f89d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 10:18:22 +00:00
Jason Hsu
5c1652eab0 Merge "Update strings for hearing device U features" into udc-dev 2023-03-16 09:16:51 +00:00
jasonwshsu
1b0a454344 Update strings for hearing device U features 
Bug: 270086620
Test: flash the rom and check UI
Change-Id: Iafc1691d2a51fc1c8111059ff5b2953889b40012
 2023-03-16 16:08:40 +08:00
Chaohui Wang
8b31ed172e Merge "Move LogEvent action to Settings" into udc-dev am: ba39aa506b am: 4b86d5df4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22067164

Change-Id: I40bbed089befb8e3abaa080aa792fb06770727c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 06:55:41 +00:00
Chaohui Wang
ba39aa506b Merge "Move LogEvent action to Settings" into udc-dev 2023-03-16 06:34:14 +00:00
Dmitry Dementyev
118dbc4e47 Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: 6faa24da9d am: c264e26eb2 am: ccfdc32542 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: Iddb91c4d9f6e17701c645c5c47af8d34cbb6f717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:15:31 +00:00
Dmitry Dementyev
c264e26eb2 Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: 6faa24da9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I78c604d15fbb47533e9b302a501c71f5e38a9f78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:52:45 +00:00
Lifu Tang
caa1b51ef2 Revert "Remove duplicate strings." 
Revert submission 19748582-settings_yesno

Reason for revert: Common strings in English could be translated into different strings in other languages.

Reverted changes: /q/submissionid:19748582-settings_yesno

Bug: 272603842
Test: build and open Settings app
Test: atest SettingsRoboTests
Change-Id: Iaad301c5513478fb95e40987ea3ccb4f923d71fa
 2023-03-15 22:39:24 +00:00
Dmitry Dementyev
9bec974991 Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: Ia0bfeee6be995a2df857147a0aadc17f41672d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 21:34:39 +00:00
Dmitry Dementyev
7f73a168fe Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I4815a1e5e05bcee661a8ce037a2671086d16faee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 21:01:01 +00:00
Dmitry Dementyev
4f67ca0cfa Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I887d715a24724806bf20808ca91b6ed23d492b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 20:19:04 +00:00
Dmitry Dementyev
32813a2bef Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I859c957eb1f94bd9c5858b71c551a1e2e10b0468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 19:39:21 +00:00
Dmitry Dementyev
f56584cd21 Convert argument to intent in AddAccountSettings. am: c7e8052b52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I83ab1d878491552ccb3ea1545742d1915fd8a6f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 19:01:57 +00:00
Julia Reynolds
686e7169ca Merge "Reduce jank when revoking notification permission" into udc-dev am: 068a55384b am: 84671635cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888168

Change-Id: I0531dfd13ac5a1639275fadd3432fedf893a1f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 15:37:08 +00:00
Julia Reynolds
068a55384b Merge "Reduce jank when revoking notification permission" into udc-dev 2023-03-15 14:50:07 +00:00
Julia Reynolds
a331c50b53 Reduce jank when revoking notification permission 
-Reorder fields so the appear/disappear more cleanly
-Remove some divider lines- they don't animate with the content, for
some reason
-Remove an unused field
-Hide the badge field (remaining field with divider) if there are no
channels
-Change style of 'Notifications are blocked' field to better match
the other fields

Test: revoke notification permission for apps with and without channels
Test: BadgePreferenceControllerTest
Fixes: 233962859
Change-Id: Ife894172bf91d838edf3b0546c5ee00e206a855f
 2023-03-15 09:08:10 -04:00
Jason Hsu
c2dffa7aa4 Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev am: 9f29b957e7 am: 54fffdc6ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21974622

Change-Id: I3d8dc59a5ade8161d2d43e6b1ee9fdf78f0bb9c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 12:50:52 +00:00
TreeHugger Robot
db2bd32285 Merge "Hide Dock speaker plays from sound pages" into udc-dev am: df5bbc630d am: 59b7f47307 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21955162

Change-Id: I95a3d90e0b6f6bcd213c11ec3c4cb33e2132a4f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 12:49:19 +00:00
Jason Hsu
9f29b957e7 Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev 2023-03-15 12:00:37 +00:00
TreeHugger Robot
df5bbc630d Merge "Hide Dock speaker plays from sound pages" into udc-dev 2023-03-15 11:52:38 +00:00
Matías Hernández
6b13d794bc Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev am: 2cabe8786e am: be3c8b66ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988900

Change-Id: Ifc5f1477f20b3c33075bc866ed473fbd5e6649b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 10:59:30 +00:00
Mill Chen
a860bf3220 Hide Dock speaker plays from sound pages 
In order to ensure the setting only works on the analog docks, adding
the docking state checks.

Bug: 270492232
Test: manual test
1) Connect to digital dock
2) Check the sound page and the dock speaker plays shouldn't be
   displayed

Change-Id: I1dc1e0aac8b9067ec8f5f1defc721294caf2949e
 2023-03-15 10:25:32 +00:00
Matías Hernández
2cabe8786e Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev 2023-03-15 10:12:23 +00:00
TreeHugger Robot
f96a7553a2 Merge "[Regional preference] Make prerference and fragment title are same." into udc-dev am: bec6e40dd3 am: 05da9199bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087475

Change-Id: I9420e554b4dfd9af4d74107044f445a5f10c7ee0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 09:46:33 +00:00
SongFerng Wang
40cf9a2132 Merge "Avoid ANR when UI query network selection state" into udc-dev 2023-03-15 09:46:21 +00:00
Daniel Huang
8c87d9233d Merge "The PK settings UI should show subtype labels instead of the subtype's language names." into udc-dev am: f826b3f427 am: fd695cd189 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809546

Change-Id: Ida6029fe696b145b625949e6ac0287cc27d2d119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 09:45:49 +00:00
TreeHugger Robot
bec6e40dd3 Merge "[Regional preference] Make prerference and fragment title are same." into udc-dev 2023-03-15 08:55:50 +00:00
Daniel Huang
f826b3f427 Merge "The PK settings UI should show subtype labels instead of the subtype's language names." into udc-dev 2023-03-15 08:15:07 +00:00
SongFerngWang
7b9c22348a Avoid ANR when UI query network selection state 
Moving the quert network selection state to back ground
and listening the service state to detect the betwork selection
changed.

Bug: 270652395
Test: atest AutoSelectPreferenceControllerTest
Change-Id: I81a597f28cf7ce25ff4eff5100bdb4d29c897a14
(cherry picked from commit 7b80b4ecd9)
 2023-03-15 07:54:06 +00:00
SongFerng Wang
65734dd29b Merge "Avoid ANR when UI query network selection state" 2023-03-15 07:52:59 +00:00
Jason Hsu
bfd9c0e2d0 Merge "Return getMetricsCategory() for each new page hearing aid and flash notifications in android U" into udc-dev am: 7ab852b48e am: b6a359d888 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978662

Change-Id: I680ded035b514a239c95eeeaab882b42509c82ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 07:38:47 +00:00
tom hsu
97821a7317 [Regional preference] Make prerference and fragment title are same. 
Bug: b/272440256
Test: Manual test passed
Change-Id: I0d5ce8f55977ce6fc300b28501f98f4860031380
 2023-03-15 15:35:34 +08:00
SongFerngWang
7b80b4ecd9 Avoid ANR when UI query network selection state 
Moving the quert network selection state to back ground
and listening the service state to detect the betwork selection
changed.

Bug: 270652395
Test: atest AutoSelectPreferenceControllerTest
Change-Id: I81a597f28cf7ce25ff4eff5100bdb4d29c897a14
 2023-03-15 14:45:05 +08:00
Jason Hsu
7ab852b48e Merge "Return getMetricsCategory() for each new page hearing aid and flash notifications in android U" into udc-dev 2023-03-15 06:25:13 +00:00
Tom Hsu
2f4e3b3041 Merge "Add Regional preference UI for Physical keyboard location." into udc-dev am: 29bcb4d553 am: 510b9b6b49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21913842

Change-Id: Iac2042b8bfe511b51551394b7e7cd5b0cb16da17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 05:32:52 +00:00
Tom Hsu
29bcb4d553 Merge "Add Regional preference UI for Physical keyboard location." into udc-dev 2023-03-15 04:21:02 +00:00
tom hsu
397f06abff Add Regional preference UI for Physical keyboard location. 
Bug: b/271805730
Test: Maunal test.
Test: atest passed.
Change-Id: Iab4351c158d6cf24d1a5aa1307ef0182eec522ae
 2023-03-15 12:10:21 +08:00
Lucas Silva
95d06ff9de Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191 am: d17cb44367 am: c1e0f6f3ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: Ia6d2268fb3ede33f805447fbdf8ed9c7fbd73145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 23:43:16 +00:00
TreeHugger Robot
e87159a591 Merge "Merge credential manager providers by package name" into udc-dev 2023-03-14 22:55:34 +00:00
Lucas Silva
d17cb44367 Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: Ib9e3e0effc2f486a15c4caec31bdecde0f358029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 22:39:31 +00:00
Behnam Heydarshahi
8e10c8e488 Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976 am: afb4dd1ece am: a1daad718e am: 4f3401050d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206

Change-Id: Ia429c3c5a8520b540b542a6634316d45f5ca15d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 21:59:55 +00:00
Lucas Silva
5671ddb191 Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: I4ba691553814eeb5b2b73f3b9665829db905de10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 21:54:01 +00:00