Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,753 Commits 1 Branch 0 Tags
bb4d0250bbf44ac7aeb8501bee8a86cfdb6fe94e
Commit Graph

27295 Commits

Author SHA1 Message Date
Behnam Heydarshahi
ee4d902410 Merge "Add notification volume controller in settings" into tm-qpr-dev am: 7f6c833b89 am: 8b2496eb9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19940409

Change-Id: Ia1b13bf425da2ef90c287b3aaee6231891c67bd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 20:38:18 +00:00
Behnam Heydarshahi
8b2496eb9e Merge "Add notification volume controller in settings" into tm-qpr-dev am: 7f6c833b89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19940409

Change-Id: Iffd5dcd7eb9ad645807d9529f352582457dc3f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 20:07:05 +00:00
Behnam Heydarshahi
7f6c833b89 Merge "Add notification volume controller in settings" into tm-qpr-dev 2022-10-12 19:37:26 +00:00
Edgar Wang
a307fa1371 Merge "Update the strings of Admin-Support Dialog" 2022-10-12 16:39:21 +00:00
TreeHugger Robot
689350d4d4 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-10-12 13:38:54 +00:00
TreeHugger Robot
9b960b32e0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-10-12 13:38:54 +00:00
TreeHugger Robot
38e1727150 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-10-12 13:38:54 +00:00
Hugh Chen
b1fac0fb92 RESTRICT AUTOMERGE Refactoring settings UI am: f891f7ba86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20034710

Change-Id: I2e6bb7660f690b2aa2db5a2ef4c628e406d674c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 06:35:46 +00:00
Edgar Wang
0b7944d38e Update the strings of Admin-Support Dialog 
Bug: 252967902
Test: manual
Change-Id: I1c196aef3bea0771e99487b583c7d29fe9264a98
 2022-10-12 13:08:24 +08:00
Lauren Winston
246597c1ac Merge "Revert "Add a cursor preference to Accessibility Settings"" 2022-10-11 23:00:34 +00:00
Lauren Winston
4f493778a6 Revert "Add a cursor preference to Accessibility Settings" 
This reverts commit 205018a854.

Reason for revert: Software Cursor not launching in Android U

Change-Id: Ieddc6b27a8a28910e7c12328ee6d1b5e0d2e4c17
 2022-10-11 18:32:27 +00:00
Treehugger Robot
fcf10fa0a5 Merge "Add fallback summary text if there is no matching screen timeout value" am: 007c215c3e am: 44431c73e7 am: 332183ee4d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2239486

Change-Id: I3a672bdfab89c1b7048f6501c3444a4b598daaf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-11 07:29:39 +00:00
Treehugger Robot
332183ee4d Merge "Add fallback summary text if there is no matching screen timeout value" am: 007c215c3e am: 44431c73e7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2239486

Change-Id: I39f0b958a99e4109b454a2edc66c0dee1c03a7ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-11 06:56:21 +00:00
Treehugger Robot
44431c73e7 Merge "Add fallback summary text if there is no matching screen timeout value" am: 007c215c3e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2239486

Change-Id: I2a5103f40ff538d327f1db9d1062de044683b615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-11 06:27:16 +00:00
Hugh Chen
f891f7ba86 RESTRICT AUTOMERGE Refactoring settings UI 
Bug: 248174653
Test: build & boot pass
Change-Id: I124a65941349d3338145865cae2c8354678897fa
 2022-10-11 04:30:09 +00:00
TreeHugger Robot
29e751e021 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-10-10 20:03:37 +00:00
TreeHugger Robot
320974f1a6 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-10-10 20:03:37 +00:00
TreeHugger Robot
ac17d14412 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-10-10 20:03:37 +00:00
Behnam Heydarshahi
3ac6aaf796 Add notification volume controller in settings 
Separate notification and ring controllers based on the ring/volume
stream alias boolean in config.xml.

For both ring and volume controller: Not show vibrate icon when vibration is not supported on device. Show
silent icon instead.

Known issue: Add the notification volume slider only in Settings, and
not in VolumePanelDialog. When the alias is set to false and the streams
separated, the ring volume slider in VolumePanelDialog keeps its title
of "Ring & notification volume" instead of changing to "Ring volume".

Bug: b/38477228

Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=NotificationVolumePreferenceControllerTest RunSettingsRoboTests -j40
      make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=RingVolumePreferenceControllerTest RunSettingsRoboTests -j40
      make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=SoundSettingsTest RunSettingsRoboTests

Change-Id: Id17523f49b291a5cf612b90f93c3b2ab6486c62f
 2022-10-10 14:42:56 +00:00
Bill Yi
8e5a2508d1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2059426b17b50acca54064684c5d5fb52b6d96e4
 2022-10-09 20:43:13 -07:00
Bill Yi
95447f53a8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia489b62a2937de65887dedb8eaaa34b0e87ce533
 2022-10-09 20:41:24 -07:00
Bill Yi
e729683b8f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7a42785ad43d43c8185c6ba06fd40672bb674b13
 2022-10-09 20:37:39 -07:00
Bill Yi
783286b516 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I36b5791ec7c6fb6d65d094e84f1282cea10627b0
 2022-10-09 20:31:31 -07:00
Bill Yi
3f2f1212a6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I23abdb70990b8472d4e2ee881a89df083cf064a6
 2022-10-09 20:27:40 -07:00
Bill Yi
9d544547a3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2e3506a75c1d9ce7cb51d0dec205e9ad79b1823d
 2022-10-09 20:25:18 -07:00
Chaohui Wang
a947e88c9f Clean up unused AppPermissionsPreferenceController 
This one is replaced by AppPermissionPreferenceController.

Bug: 234570979
Test: m Settings
Change-Id: Id9d16caf33cdea626f79a3cd142dfcde2c54769f
 2022-10-09 15:42:01 +08:00
Shen Lin
97a61bad7d Add fallback summary text if there is no matching screen timeout value 
Screen timeout summary string can be null if there is no matching candidate, so we need a fallback summary here to avoid showing unexpected summary text.

Bug: 252340891
Test: manual

Change-Id: I939ae97a50063b2ffe84029135c3f340aeedf4c7
 2022-10-09 01:59:02 +00:00
Lauren Winston
3f8d62fbf1 Revert "Add toggles for two Software Cursor settings: keyboard shift and trigger" 
This reverts commit 28b4b34f92.

Reason for revert: Software Cursor is not launching in Android U

Test: manual

Change-Id: I213cf64ca94fce51883a30a9d6b734b4ed874dad
 2022-10-06 23:58:50 +00:00
Wesley Wang
c8e077368f Fix battery saver number format issue 
- The summary of battery saver scheduler use util to convert the number
   but saver sticky preference use another way to convert it, update
   them to use the same convert method

Bug: 250684701
Test: make SettingsRoboTests
Change-Id: I4f188a2e8e9d4810d187b870e331dc84f50b2b6f
 2022-10-06 10:23:28 +00:00
TreeHugger Robot
848dab0ad3 Merge "Refine the verified links preference" 2022-10-06 06:24:32 +00:00
Xin Li
ec0cf19aad Merge "Merge TP1A.221005.003" am: 2af8366306 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240893

Change-Id: Ic9f25644a305419732cb5406b96166e8708a3975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 22:39:29 +00:00
TreeHugger Robot
a94259a716 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-10-04 01:45:21 +00:00
Bill Yi
130ca8d869 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic1d704580d378aceba24a558590c41bf16b97b07
 2022-10-03 13:19:00 -07:00
Xin Li
f51d201af3 Merge TP1A.221005.003 
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Change-Id: Ia7b51d3cc694287b930d240c77e5ba0ed9a527f4
 2022-10-03 13:17:48 -07:00
Bill Yi
ad1d5c5080 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I16b0a52db27e52e07af91f9a7b88796c5bbec9c8
 2022-10-03 13:16:02 -07:00
TreeHugger Robot
b85726f975 Merge "Make preference unselectable" 2022-10-03 13:58:28 +00:00
TreeHugger Robot
12a1ed5662 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-30 18:14:33 +00:00
Tsung-Mao Fang
05412c37c7 Make preference unselectable 
Because Encrypt phone is not an entry which can launch to next page,
let's make it unselectable now.

Change-Id: I860c76c501fccc488b2e120a4702c652f1bee134
Test: Manual test
Fix: 249193859
 2022-09-30 15:15:50 +08:00
Bill Yi
cf54fdb73b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I095695f0dfaf97b6944010e51b3b1463c3b7fbb0
 2022-09-29 18:54:45 -07:00
Bill Yi
bd23528a6e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0acd1bf9cb484251df0a025179c001f527aad09a
 2022-09-29 18:48:37 -07:00
Tom Hsu
f0635482c7 Merge "Revert "[Languages] Add new information to system language page."" into tm-qpr-dev am: 43ceaa85ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064133

Change-Id: Ie4a6ec648a8a524d25f44dca22cbc145884c664b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 16:27:06 +00:00
Tom Hsu
43ceaa85ee Merge "Revert "[Languages] Add new information to system language page."" into tm-qpr-dev 2022-09-29 15:52:32 +00:00
Tom Hsu
6dbf883bd8 Merge "Revert "[Languages] Add new information to system language page."" 2022-09-29 09:08:09 +00:00
Tim Peng
2a51ffb68b Merge "single component HFP device has no battery info in the Device details page" 2022-09-29 08:28:40 +00:00
timhypeng
7c4e04b187 single component HFP device has no battery info in the Device details page 
-get full summary when the metadata does not contain the battery
information
-remove unexpected "test_summary" text

Bug: 237594992
Test: make -j50 RunSettingsGoogleRoboTests ROBOTEST_FILTER=AppBypassBroadcastReceiverTest

Change-Id: I3e3682cf88cdd147d4b7cd68f37f5e33f01c788d
 2022-09-29 08:27:33 +00:00
Sunny Shao
0cf48a43c3 Refine the verified links preference 
- Let UI look cleaner and reduce the confusion.

Fixes: 246875492
Test: manual test
Change-Id: Ic2c947c0e05e7f9d5307c43c022638ae4b6dec8f
 2022-09-29 15:03:02 +08:00
Tom Hsu
a4c78e3820 Revert "[Languages] Add new information to system language page." 
This reverts commit 3cbb6f8680.

Reason for revert: b/248456615

Change-Id: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
Merged-In: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
 2022-09-29 04:38:30 +00:00
Tom Hsu
2f753c7ba7 Revert "[Languages] Add new information to system language page." 
This reverts commit 3cbb6f8680.

Reason for revert: b/248456615

Bug: b/248456615
Test: Manual test pass

Change-Id: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
 2022-09-29 04:01:03 +00:00
Xuanang Zhao
82f23fe8df Merge "Add auto rotation icon resource." 2022-09-28 15:09:55 +00:00
Xuanang Zhao
569932474e Add auto rotation icon resource. 
Change-Id: Ica60e4239439b01f1545bae6f1d809e29a4a9033
Bug: 248428429
Test: manual
 2022-09-28 17:55:01 +08:00