PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,374 Commits 1 Branch 0 Tags
5067d29ba49b8fdede295080bf6784015c2d749d
Commit Graph

26565 Commits

Author SHA1 Message Date
Lucas Silva
5067d29ba4 Merge "Update dream summary when dream suppressed by bedtime mode" into tm-qpr-dev am: 6a8e193fad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20216381

Change-Id: I72ec38de9b99e704d909ddf9e21e7ac825b00abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 17:43:35 +00:00
Lucas Silva
51f838ba4b Update dream summary when dream suppressed by bedtime mode 
Bug: 246472225
Test: enabled bedtime mode, verified settings summary updated
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.WhenToDreamPreferenceControllerTest"
Change-Id: I4de12f636975b1bdf36898f7a530fde2f55644d4
 2022-10-18 13:23:49 +00:00
TreeHugger Robot
2fa81e2257 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-10-17 16:49:37 +00:00
Bill Yi
10685ce812 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I52af69635563e5f832ff9b2db1988ab1a0b8947a
 2022-10-15 15:51:11 -07:00
Bill Yi
8b6197643d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9e456fa02748875d1d19cb5e74440837eb5c6ba0
 2022-10-15 15:45:37 -07: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
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
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
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
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
3f2f1212a6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I23abdb70990b8472d4e2ee881a89df083cf064a6
 2022-10-09 20:27:40 -07: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
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
12a1ed5662 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-30 18:14:33 +00: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
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
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
Bill Yi
c920993671 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If4efd7d3316b1782c9e502c75284a753fc9d692d
 2022-09-27 10:00:16 -07:00
Bill Yi
5419d3f04e Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-26 03:07:25 +00:00
Bill Yi
2a57051294 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-26 03:07:25 +00:00
Treehugger Robot
5d95b855dc Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0 am: 41e0e6fea7 am: 984e74a32e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: Ib32baeda6471ed9a8a2e5aa2cd84088505c1f7ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-24 10:26:46 +00:00
Treehugger Robot
984e74a32e Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0 am: 41e0e6fea7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: I03ee47dea1bfc1ac0f5d6f49e738346571f304e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-24 09:57:27 +00:00
Treehugger Robot
41e0e6fea7 Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: Iaeef4967d528aca3e4d66f98952635cb97ed9350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-24 09:27:24 +00:00
Bill Yi
a068e61a94 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0ad02e480a4a792ddeaa12e07a12f968659d3faa
 2022-09-23 11:04:43 -07:00
Bill Yi
53322b1886 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4a5a43e5ad52047121da5fc18e8cdfb7a84e1556
 2022-09-23 11:01:33 -07:00
Bill Yi
751384c381 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifaf8bc76ea5a8afb638a8305cd0ec1873a0e3754
 2022-09-23 01:06:15 -07:00
Bill Yi
ddab089dab Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9bcf14095ff5043e49a327a29e3c48731336d78a
 2022-09-22 14:14:21 -07:00
Grace Cheng
59f4b7bdc9 Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev am: 108b73d972 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19995253

Change-Id: Ifc2d6aeaba2ac559b695fd1084ce6668fcc8c94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 18:38:19 +00:00
Grace Cheng
94f6a76ea1 Merge "Updates SFPS enrollment finished assets" into tm-qpr-dev am: 8669dc3697 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19979253

Change-Id: I9d17ad0d79285590ae460146f056b59a0d46066b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 18:37:41 +00:00
Grace Cheng
108b73d972 Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev 2022-09-22 17:37:13 +00:00
Grace Cheng
8669dc3697 Merge "Updates SFPS enrollment finished assets" into tm-qpr-dev 2022-09-22 17:26:22 +00:00
Bill Yi
65c5abe617 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-22 14:30:33 +00:00
Bill Yi
4c5b5a7326 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-22 14:30:33 +00:00
Jason Hsu
b161bade37 Merge "Fix not on the top when entering device detail page" into tm-qpr-dev am: 9ac1712145 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20008465

Change-Id: I2a8dd8e4bb9f11ab239ec7a4e420b38c52623a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 08:27:44 +00:00
Bill Yi
c1b4909f3c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I404fe77587be7e7a199e0b638a99f8528bc55e9e
 2022-09-21 17:17:45 -07:00
Bill Yi
82148a40ea Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I42f13be21657749f18b7e808ca1f6a008a38cf26
 2022-09-21 17:14:58 -07:00
jasonwshsu
35e20d5ace Fix not on the top when entering device detail page 
Root Cause: Added SpacePreference in xml let the page renders order
incorrectly.

Solution: That SpacePreference should only be visible when the device is
hearing aid.

Bug: 245681095
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest
Merged-In: Ic0be940c8466b5e1e301255868c29d06bd4428bd
Merged-In: I442445a861898258a73f37ad8f85bcee387fbf58
Change-Id: Icca48d9c2643507638b2b581d052530521cce5df
 2022-09-21 23:54:15 +08:00
Bill Yi
198cb56664 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-20 22:47:08 +00:00