Commit graph

3010 commits

Author SHA1 Message Date
Shivangi Dubey
8cd720051a [automerger skipped] Merge "Refine fold setting" into udc-qpr-dev am: 9e5f0664e4 am: f3c4e4a78c -s ours
am skip reason: Merged-In I59e8ba653bdac397eec0be60b931dc1c6649843c with SHA-1 61519d18a6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24446088

Change-Id: I042d838d80d3298e4b4833a65795cf7d189c7d83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 23:04:15 +00:00
Wilson Sung
b1daa78ce4 Update UWB CERTIFICATE to PRESIGNED am: 0d937f7123 am: 981057ce92 am: 28f78b35aa
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24681110

Change-Id: I2c290ad639e459b67e6bfe46328257126e0f8cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 00:31:01 +00:00
Wilson Sung
28f78b35aa Update UWB CERTIFICATE to PRESIGNED am: 0d937f7123 am: 981057ce92
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24681110

Change-Id: I4778a346adf35e0fe975d573e06b99864ca439eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 23:34:10 +00:00
Wilson Sung
981057ce92 Update UWB CERTIFICATE to PRESIGNED am: 0d937f7123
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24681110

Change-Id: I77be0eb165344b3b9a6e32d6cbe4518d67daec04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 22:56:30 +00:00
Wilson Sung
0d937f7123 Update UWB CERTIFICATE to PRESIGNED
Bug: 290766628
Change-Id: Id5ec87873a34a7c27f1b90209385884196efae1d
2023-09-06 17:26:18 +00:00
Shivangi Dubey
f3c4e4a78c Merge "Refine fold setting" into udc-qpr-dev am: 9e5f0664e4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24446088

Change-Id: If23d5a50eb94fd908a52c7bf2b7d4b66c2c86365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 15:06:39 +00:00
Shivangi Dubey
9e5f0664e4 Merge "Refine fold setting" into udc-qpr-dev 2023-09-06 14:28:45 +00:00
dshivangi
eb1b08f16b Refine fold setting
Current fold setting has a toggle button which can enable the “Stay unlocked on fold” setting.
Create a new page for fold setting which will allow us to choose something from three options.(https://screenshot.googleplex.com/6W65aTYtigGpr3v)
 *Always - Front display turns on when you fold your device [Currently available setting]
 *Only games, videos, and more - Front display turns on for apps that stop your screen going idle [Default]
 *Never - Front display locks when you fold your device [New option for user]

Test: atest FoldLockBehaviorSettingsTest FoldLockBehaviorPreferenceControllerTest
*Manual
  Flash the build with these changes
  Manually select options one by one
  Observe the behavior

Fixes: 294194379
Change-Id: I59e8ba653bdac397eec0be60b931dc1c6649843c
Merged-In: I59e8ba653bdac397eec0be60b931dc1c6649843c
2023-09-06 10:50:23 +00:00
Shivangi Dubey
04fac1660b Merge "Refine fold setting" into main 2023-09-06 10:47:26 +00:00
Xin Li
f073cf5da3 [automerger skipped] Merge UP1A.230905.019 am: 12032b942f -s ours am: 32953a9018 -s ours am: f34af8bb46 -s ours am: f31fcb9dd8 -s ours
am skip reason: Merged-In I4890e0ed2191993887aa550053a827c2aca3aafe with SHA-1 64da307f5f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24624441

Change-Id: I63f69a23615910a6a355d069a6ea1c835e843e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 21:26:52 +00:00
Xin Li
f31fcb9dd8 [automerger skipped] Merge UP1A.230905.019 am: 12032b942f -s ours am: 32953a9018 -s ours am: f34af8bb46 -s ours
am skip reason: Merged-In I4890e0ed2191993887aa550053a827c2aca3aafe with SHA-1 64da307f5f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24624441

Change-Id: I378fc6846d8c64a0a7a8099e59cfbb62f5b13bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 21:07:28 +00:00
Xin Li
f34af8bb46 [automerger skipped] Merge UP1A.230905.019 am: 12032b942f -s ours am: 32953a9018 -s ours
am skip reason: Merged-In I4890e0ed2191993887aa550053a827c2aca3aafe with SHA-1 64da307f5f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24624441

Change-Id: I192dbf0edc60f1db233201777bef349a46f7c83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 20:34:36 +00:00
Xin Li
32953a9018 [automerger skipped] Merge UP1A.230905.019 am: 12032b942f -s ours
am skip reason: Merged-In I4890e0ed2191993887aa550053a827c2aca3aafe with SHA-1 64da307f5f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24624441

Change-Id: I482d9b52ba5b5beb6888719e8609cd75adc73e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:45:20 +00:00
dshivangi
61519d18a6 Refine fold setting
Current fold setting has a toggle button which can enable the “Stay unlocked on fold” setting.
Create a new page for fold setting which will allow us to choose something from three options.(https://screenshot.googleplex.com/6W65aTYtigGpr3v)
 *Always - Front display turns on when you fold your device [Currently available setting]
 *Only games, videos, and more - Front display turns on for apps that stop your screen going idle [Default]
 *Never - Front display locks when you fold your device [New option for user]

Test: atest FoldLockBehaviorSettingsTest FoldLockBehaviorPreferenceControllerTest
*Manual
  Flash the build with these changes
  Manually select options one by one
  Observe the behavior

Fixes: 294194379
Change-Id: I59e8ba653bdac397eec0be60b931dc1c6649843c
2023-09-04 15:08:45 +00:00
Yung Ti Su
cf1cd05603 add mixer path for BT SCO voice call am: fb96524dc9 am: 4a7772f77b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24632407

Change-Id: Ic2b7072971c2e40579eacafd4cdf4da2f50d01f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 03:53:16 +00:00
Yung Ti Su
4a7772f77b add mixer path for BT SCO voice call am: fb96524dc9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24632407

Change-Id: I6b47745b57aa56af3fdb4ea926e365d660258a82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 02:58:18 +00:00
Yung Ti Su
fb96524dc9 add mixer path for BT SCO voice call
Bug: 297794937
Test: manual

Change-Id: I88ae3fc8290fdf83d33c71def8cb3ca705136f38
Signed-off-by: Yung Ti Su <andysu@google.com>
2023-09-01 02:26:14 +00:00
Xin Li
12032b942f Merge UP1A.230905.019
Merged-In: I4890e0ed2191993887aa550053a827c2aca3aafe
Change-Id: I6a61ab7455e00e60b4944f19a6d84bf859c642a9
2023-08-31 12:12:38 -07:00
Treehugger Robot
02b8c51a4d Merge "gps: set high accuracy shape mode and enable always-on measurements log" into udc-qpr-dev am: eb3a9d2e62 am: 7c15fa00d6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24579394

Change-Id: Ia1ef92803dee4a13a834ee06c9bee3deabfdc423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 14:42:23 +00:00
Treehugger Robot
7c15fa00d6 Merge "gps: set high accuracy shape mode and enable always-on measurements log" into udc-qpr-dev am: eb3a9d2e62
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24579394

Change-Id: I95480af639aede1de9086d861ab714b9d54c35d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 13:49:11 +00:00
Treehugger Robot
eb3a9d2e62 Merge "gps: set high accuracy shape mode and enable always-on measurements log" into udc-qpr-dev 2023-08-31 12:49:36 +00:00
Wayne Lin
0b6ddcd04b gps: set high accuracy shape mode and enable always-on measurements log
Bug: 277337710
Bug: 286158090
Test: verify pass in b/286158090#comment53 and b/277336756#comment32
Change-Id: I305b18f2e281eef0f24d7a6915a44d3b816137a7
2023-08-31 05:29:37 +00:00
Treehugger Robot
1a513f2b30 Merge "Fix overlap between smartspace and weather clock" into udc-qpr-dev am: 5ba793c2ff am: a1de289fc6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24458576

Change-Id: I574eb1401e0a8661a45665b95164891ad5949f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 21:51:11 +00:00
Treehugger Robot
a1de289fc6 Merge "Fix overlap between smartspace and weather clock" into udc-qpr-dev am: 5ba793c2ff
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24458576

Change-Id: I19991c2e849e1b0cd949c931a3290c50a95b9510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 20:53:26 +00:00
Xin Li
a773f3dbc5 [automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 66e687a2a4 -s ours am: f4b38e7b46 -s ours am: 4fcacced52 -s ours am: f769bfa370 -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: I7ca3fbd599eae1de50433b235d5c029335bd070e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 20:43:29 +00:00
Treehugger Robot
5ba793c2ff Merge "Fix overlap between smartspace and weather clock" into udc-qpr-dev 2023-08-29 20:39:37 +00:00
Xin Li
1c4121820c [automerger skipped] Merge Android U (ab/10368041) am: d1c9942792 -s ours am: b7cf79b50d -s ours am: 721d839d2a -s ours am: e4a3248e2d -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: I048381b355a799c393d547af4e917a9405f4617f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 20:38:14 +00:00
Florian Mayer
880a4129d0 Add aosp_felix_hwasan am: c2556c4c61 am: 50889ad4db am: 9c8f7cff7b am: 4165369e1c am: c94c63a579
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295

Change-Id: I39a81cedb191abe16c3a93eac2a16dbd88cdd6ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 20:02:54 +00:00
Xin Li
f769bfa370 [automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 66e687a2a4 -s ours am: f4b38e7b46 -s ours am: 4fcacced52 -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: I1cdd59776777d136a1c419cb7937ddd18fea70ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 01:16:26 +00:00
Xin Li
e4a3248e2d [automerger skipped] Merge Android U (ab/10368041) am: d1c9942792 -s ours am: b7cf79b50d -s ours am: 721d839d2a -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: I6b31d13f301abb1b81fbc89dce87f95d765ecd8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 01:11:08 +00:00
Florian Mayer
c94c63a579 Add aosp_felix_hwasan am: c2556c4c61 am: 50889ad4db am: 9c8f7cff7b am: 4165369e1c
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295

Change-Id: I7388ae5e8ee5791b421305ff9ecd676047af20a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 01:00:33 +00:00
Xin Li
4fcacced52 [automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 66e687a2a4 -s ours am: f4b38e7b46 -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: I90d949caaa1be25870115a8ed82732c52aed4eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:40:44 +00:00
Xin Li
721d839d2a [automerger skipped] Merge Android U (ab/10368041) am: d1c9942792 -s ours am: b7cf79b50d -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: Iaf68020e3327bc52f0dd2141c4d5b669016d575c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:35:25 +00:00
Florian Mayer
4165369e1c Add aosp_felix_hwasan am: c2556c4c61 am: 50889ad4db am: 9c8f7cff7b
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295

Change-Id: Idb24b83a65598fc76197639461a0fb4e7b7470e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:26:03 +00:00
Xin Li
f4b38e7b46 [automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 66e687a2a4 -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: Ief104b9a8579ed786718adf55dfad6e0ef4a2f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:04:44 +00:00
Xin Li
b7cf79b50d [automerger skipped] Merge Android U (ab/10368041) am: d1c9942792 -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: I261bdf7ef23cfabc3ed6a0fe67b2044509d108cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:59:25 +00:00
Florian Mayer
9c8f7cff7b Add aosp_felix_hwasan am: c2556c4c61 am: 50889ad4db
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295

Change-Id: Idac8aa35d09e6eeaa92a9125ee39ce2421ca1096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:42:54 +00:00
Xin Li
66e687a2a4 Merge "Merge Android U (ab/10368041)" into aosp-main-future 2023-08-28 22:12:23 +00:00
Florian Mayer
50889ad4db Add aosp_felix_hwasan am: c2556c4c61
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295

Change-Id: I29e672a12cd2cec8bcb880c19f99dbd03fe2aac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 22:11:26 +00:00
Florian Mayer
c2556c4c61 Add aosp_felix_hwasan
Bug: 297918380
Change-Id: I934dc696c9066bdc337a4279296b91744d0b0382
2023-08-28 13:11:01 -07:00
Yung Ti Su
ba7991ce63 [AIDL] Add mixer paths for BT am: 96c377d870 am: 5e690c0a4c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24548399

Change-Id: I55368655d4a12dd95ba6fbfa4714071dafed670f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 19:17:40 +00:00
Yung Ti Su
5e690c0a4c [AIDL] Add mixer paths for BT am: 96c377d870
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24548399

Change-Id: I2c24b7daddd725a5a9ac98e0d9c3c694b5b345f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 18:33:11 +00:00
Yung Ti Su
96c377d870 [AIDL] Add mixer paths for BT
Bug: 293221641
Test: manual

Change-Id: I2c1ca5ca43665595639ce1f785b807e68a59ed90
Signed-off-by: Yung Ti Su <andysu@google.com>
2023-08-28 17:58:28 +00:00
Sherry Zhou
2850f8598b Fix overlap between smartspace and weather clock
Test: manually test on Felix
Bug: 286888430
Change-Id: I92286b1ef610b13b76c0f24ffe1fc3592e26fe9e
2023-08-24 21:59:22 +00:00
Joey Poomarin Phloyphisut
6619708767 Merge "[USB Audio AIDL] Add mixer_paths for usb audio." into udc-qpr-dev am: 7dd2e35ae5 am: 859e412e25
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24457669

Change-Id: Ib0f215e9f82a194d379796a412c848fc82c7f3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 06:59:19 +00:00
Joey Poomarin Phloyphisut
859e412e25 Merge "[USB Audio AIDL] Add mixer_paths for usb audio." into udc-qpr-dev am: 7dd2e35ae5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24457669

Change-Id: I930440a30126b1a8e5373e537c3e59abd6ca9fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 06:17:56 +00:00
Joey Poomarin Phloyphisut
7dd2e35ae5 Merge "[USB Audio AIDL] Add mixer_paths for usb audio." into udc-qpr-dev 2023-08-24 05:49:50 +00:00
Cheng Chang
21105d1827 Merge "update the gps conf to the latest version" into udc-qpr-dev am: 7a82185421 am: e57fe1ee92
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24398895

Change-Id: I994764316b86bddb8cba2e249c6d53fc6e8655fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 19:14:55 +00:00
Cheng Chang
e57fe1ee92 Merge "update the gps conf to the latest version" into udc-qpr-dev am: 7a82185421
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24398895

Change-Id: Icd4939623b15e9d019b9d94c8e744b3243b617dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 18:46:46 +00:00
Poomarin Phloyphisut
c4a811f8cd [USB Audio AIDL] Add mixer_paths for usb audio.
Test: Local Test
Bug: 274870625
Change-Id: I850679b60bc523f5e88884729d5439056dcafab3
2023-08-23 08:08:03 +00:00