PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,687 Commits 1 Branch 0 Tags
48bd757face26b80df1edcc0169b2105f27a7876
Commit Graph

33356 Commits

Author SHA1 Message Date
Xiangyu/Malcolm Chen
48bd757fac Merge "Automatically dismiss SIM combination warnings and selection dialogs." am: 33657f8d44 am: 04d95b6e8e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531286

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd0289d605724fd55adc9a5f37c7555e150efa85
 2020-12-16 20:05:15 +00:00
Malcolm Chen
1305cee98e Automatically dismiss SIM combination warnings and selection dialogs. 
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
Merged-In: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
 2020-12-15 16:45:27 -08:00
Hugh Chen
416110bac0 Add condition to check case of accessory combinations am: b767df1a08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218259

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a4502e3568d0049c4fff7f730b42d1bc975cea4
 2020-12-15 05:01:42 +00:00
Hugh Chen
c61ec502f5 Do nothing when choosing file transfer when in accessory mode am: e8dc7bc283 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218257

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bd051363458a75a0dd190f41b0cf2901e3bf680
 2020-12-15 05:01:34 +00:00
Hugh Chen
2676dd763c Fix the usb menu didn't switch to "File Transfer/Android Auto" right after connecting to the car unit. am: 91ed63124c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218253

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ca5a04cc2e8db3b2f50d1656fa54c8e02f8e394
 2020-12-15 05:01:25 +00:00
Hugh Chen
b767df1a08 Add condition to check case of accessory combinations 
Before this CL, we only compare whether the value of function is
equal to accessory to ensure usb is in accessory mode. But in some
cases there are different accessory combinations, like
"accessory,audio source". It will make the condition return false
when encountering accessory combinations.

This CL will check whether the function will include accessory mode
to fix this issue.

Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I7c80f02de5340799e292949608e19b86b187b982
Merged-In: I7c80f02de5340799e292949608e19b86b187b982
(cherry picked from commit 7d71081d45)
 2020-12-14 07:32:41 +00:00
Hugh Chen
e8dc7bc283 Do nothing when choosing file transfer when in accessory mode 
- Before this CL, the device will be disconnected and reconnected
  to accessory mode when choosing "File transfer/Android Auto" in
  accessory mode. Because the USB menu didn't check state of
  function, it should do nothing when choosing
  "File transfer/Android Auto" in accessory mode.

  This CL add condition to check state of function, it will do
  nothing when choosing "File transfer/Android Auto" in
  accessory mode.

Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I1749c6c43d2a192e4ce1bf1ae5343ff8deafbe48
Merged-In: I1749c6c43d2a192e4ce1bf1ae5343ff8deafbe48
(cherry picked from commit 3251a04ba3)
 2020-12-14 06:59:06 +00:00
Hugh Chen
91ed63124c Fix the usb menu didn't switch to "File Transfer/Android Auto" right after connecting to the car unit. 
- Before this CL, the usb receivers didn't check the extra information
  of the accessory. It causes the usb menu not to be aware that the
  usb port is switched to accessory mode.

  In this CL, the receivers will check whether the intent has an
  accessory extra. If the usb port is switched to accessory mode
  the usb menu will switch to "File Transfer/Android Auto".

Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I0eca89a23670c674b74753fc526256cc1d52e759
Merged-In: I0eca89a23670c674b74753fc526256cc1d52e759
(cherry picked from commit af0a45bb7a)
 2020-12-14 06:58:26 +00:00
Robert Luo
4dd011b3c7 Merge "Migrate media output switcher metrics - 2/n" into rvc-qpr-dev 2020-12-11 06:56:24 +00:00
Robert Luo
a2e12619d5 Merge "Migrate media output switcher metrics - 3/n" into rvc-qpr-dev-plus-aosp 2020-12-11 02:15:47 +00:00
tim peng
b36ec713ce Merge "Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority" into rvc-qpr-dev am: 656867b4de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13136220

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e1054e999a39a7a91ad9fa04f874b12370b8a89
 2020-12-10 05:53:28 +00:00
tim peng
656867b4de Merge "Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority" into rvc-qpr-dev 2020-12-10 05:30:42 +00:00
Robert Luo
8da41d2eda Migrate media output switcher metrics - 3/n 
Bug: 172181610
Test: run statsd_testdrive 277 and check the
output correctness after content switching.

Change-Id: I5abb471452ec92670d220b2472eadbe77e243653
Merged-In: I5abb471452ec92670d220b2472eadbe77e243653
 2020-12-10 11:10:45 +08:00
TreeHugger Robot
317aa9e772 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196 am: 0b89867372 am: 79bf00aac3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2a7d0a9ebb8f0840a18f6997bd512f720e35a71
 2020-12-09 14:50:28 +00:00
TreeHugger Robot
79bf00aac3 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196 am: 0b89867372 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadf73a6dac422ef24851c603a1e5cd1ab8c0dcf2
 2020-12-09 14:31:38 +00:00
TreeHugger Robot
0b89867372 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81cd1495fd0beb356554d5a86daa30214d0d27d0
 2020-12-09 14:03:32 +00:00
TreeHugger Robot
f49e9d2196 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36f99bfb1e5eee253bb4ce030d7000cb40c2ff63
 2020-12-09 13:49:10 +00:00
TreeHugger Robot
635029b87f Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad91ec439965d52c652f79ce4d6fe3b125631f79
 2020-12-09 13:03:53 +00:00
TreeHugger Robot
cfdae774cd Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3605d2b4dbad8b7b4979b644c89352ee8449ba1
 2020-12-09 12:17:08 +00:00
TreeHugger Robot
2117006bc6 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d7dcaefd10f297c9e268d8f9d8bf666d98b08fd
 2020-12-09 12:08:40 +00:00
TreeHugger Robot
504b96d76c Merge "Add bluetooth package to permission request intent" into oc-mr1-dev 2020-12-09 12:06:33 +00:00
Jakub Pawlowski
c721dc5bad Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I956e8906633af45f12617dabbec4e060c14502f2
 2020-12-09 11:32:56 +00:00
Jakub Pawlowski
b29c036522 Prevent overlay drawing on top of Bluetooth activity dialog 
Bug: 168504491
Merged-In: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
Change-Id: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
 2020-12-09 08:00:22 +00:00
Robert Luo
2b6fd92de9 Migrate media output switcher metrics - 2/n 
Bug: 172181610
Test: run statsd_testdrive 277 and check the
output correctness after content switching.

Change-Id: I5abb471452ec92670d220b2472eadbe77e243653
Merged-In: I5abb471452ec92670d220b2472eadbe77e243653
 2020-12-09 15:42:56 +08:00
TreeHugger Robot
3a150908c3 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2 am: 4c4f83eb21 am: db48b810b6 am: f7f1781146 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7414cd5ed7a804b1cf6a31dc57d6c0197219b386
 2020-12-09 00:55:13 +00:00
TreeHugger Robot
f7f1781146 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2 am: 4c4f83eb21 am: db48b810b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I42ad211ac7f3341c38d7b7f992b19e3ae52c9373
 2020-12-09 00:32:11 +00:00
TreeHugger Robot
db48b810b6 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2 am: 4c4f83eb21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id38617a0c134feeb458a734a86c57360108fdd15
 2020-12-09 00:16:09 +00:00
TreeHugger Robot
4c4f83eb21 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic39ad9f7212cdb757f79c61e23c84ac614e73fed
 2020-12-08 23:58:02 +00:00
TreeHugger Robot
537c730ca2 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c3d91f901bc38554732ff2cc428232f117efea0
 2020-12-08 23:27:51 +00:00
TreeHugger Robot
721f43dcdc Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev 2020-12-08 22:56:46 +00:00
tim peng
c93b70e3a0 Merge changes from topic "media_output_dialog" into rvc-qpr-dev am: 3cea72fb2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115230

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0416c3b3f9ce31ed35ba07363a519b15a4a0d0d
 2020-12-08 06:28:52 +00:00
timhypeng
3273b4ebb4 Update rule of launching media output dialog am: 6472c98ffa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115229

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaeec1436e45b25fce4a4ef08155d35b8b047d916
 2020-12-08 06:28:50 +00:00
timhypeng
c26d9f3d48 Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings am: 7127fff467 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115228

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0fc610e5b5f17f9788fc12b96d2871c20be9725
 2020-12-08 06:28:49 +00:00
timhypeng
3254d59f0f Add PairNewBluetoothReceiver to launch Bluetooth pairing page am: 6afe358556 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115227

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0bce385da81472db27ebe07634e0ad9f0507e47f
 2020-12-08 06:28:46 +00:00
tim peng
3cea72fb2b Merge changes from topic "media_output_dialog" into rvc-qpr-dev 
* changes:
  Redirect to output switcher panel to the new dialog
  Update rule of launching media output dialog
  Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings
  Add PairNewBluetoothReceiver to launch Bluetooth pairing page
 2020-12-08 05:46:13 +00:00
tim peng
32ef316678 Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev am: de2f2754d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13136219

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4c0ebb50dd2caaeabb1f39549a80d1de0890201
 2020-12-08 01:09:56 +00:00
tim peng
de2f2754d9 Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev 2020-12-08 00:55:21 +00:00
Eugene Susla
c8d81959a2 RESTRICT AUTOMERGE am: 2e82aa5d05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689

Change-Id: I850120ab85fa938ebce7115c778b833b5266594c
 2020-12-07 19:28:31 +00:00
Eugene Susla
337aa8dbf3 RESTRICT AUTOMERGE am: bfa7a75545 am: d67e22c122 am: 31505ca0b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998688

Change-Id: Ibef7c004a50181c2b3708d282d7c9f166c90708c
 2020-12-07 17:21:25 +00:00
Eugene Susla
31505ca0b3 RESTRICT AUTOMERGE am: bfa7a75545 am: d67e22c122 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998688

Change-Id: I1a046e98511c50641b0fcb42b97233b3fa36e6dd
 2020-12-07 16:58:33 +00:00
Eugene Susla
d67e22c122 RESTRICT AUTOMERGE am: bfa7a75545 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998688

Change-Id: Id7909dd47451e3fbd02b5ca3ce4643cdd1da6715
 2020-12-07 16:44:22 +00:00
Xin Li
07ccb42665 DO NOT MERGE - Merge RQ1A.201205.011 
Bug: 172690556
Merged-In: I3f7d41c196569c0cb61e89cfc270b957e2f0add5
Change-Id: Id2d9c4f56beae280e6299b6695185577a1521345
 2020-12-07 00:39:43 -08:00
Wesley.CW Wang
974f359a26 Add Battery Defender feature to Settings am: 7ccb54feb6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13108999

Change-Id: I3b172988dd71c520ac6e1d286ae055243cb723e0
 2020-12-07 08:29:16 +00:00
Wesley.CW Wang
7ccb54feb6 Add Battery Defender feature to Settings 
- Adding new tips of Battery Defender, will be presented once battery is overheated
 - Launch Help Center article of battery overheat when clicking Battery Defender tip
 Screenshots: https://screenshot.googleplex.com/7jUibTJANgR6UQ6.png
 	      https://screenshot.googleplex.com/tUj2LLi87SfndBN.png

Bug: 172794045
Bug: 173497281
Bug: 173496188
Test: make RunSettingsRoboTests -j40
Merged-In: Ibb106a5d42cdf6232abf9ddf4b3225bdcebccf4a
Change-Id: Id400cec248a87dd27194d93bdf035e43bbcb7f4f
 2020-12-07 08:06:22 +00:00
TreeHugger Robot
cbbc224e4d Merge "Fix output switcher will show 2 media sessions in some use cases" into rvc-qpr-dev am: 9ccf19cb9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13109545

Change-Id: I5f2c4d8549c28d1c91d81b7808183b0c97700dda
 2020-12-07 06:47:40 +00:00
Hugh Chen
d1da284831 Fix output switcher will show 2 media sessions in some use cases 
Before this CL, we didn't check whether the remote session existed
in the list before. If the priority of a remote session is higher than
a local session, it causes us to return the local session even if
the list has a remote session.

This CL uses a list to cache package names of remote sessions.
If the local session has the same package name of the remote session
then don't return the local session.

Bug: 169052790
Test: make -j42 RunSettingsRoboTests
Change-Id: I2726a3deb397f646e4c74a8c445dde6fafb694a8
Merged-In: I2726a3deb397f646e4c74a8c445dde6fafb694a8
(cherry picked from commit 3a7293cbbf)
 2020-12-07 06:28:52 +00:00
TreeHugger Robot
436633ab5d Merge "Fix output switcher will show 2 media session when remote playing" into rvc-qpr-dev am: d7cf95ef74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13109544

Change-Id: I5ca519b1a3475afb9697bc76b20f550997afda2b
 2020-12-07 03:29:14 +00:00
Xin Li
cec81e3030 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 
Bug: 172690556
Merged-In: Iafcefc2aa64cf3c50b1d139ec0204a315be29da7
Change-Id: I5d4e70fe723d890b5694c3490d6ec841b1ac596e
 2020-12-02 00:29:15 -08:00
timhypeng
b97ff55b3b Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority 
Bug: 172178632
Test: make -j50 RunSettingsRoboTests
Merged-In: Idf6b07fb5918c487956fd1485d409c3161525f1b
Change-Id: Idf6b07fb5918c487956fd1485d409c3161525f1b
 2020-11-30 13:34:16 +00:00
timhypeng
7207584d6c Redirect to output switcher panel to the new dialog 
-Redirect for Cast button
-Send intent when call MediaOutputPanel::create()
-Return null to finish the activity

Bug: 172178632
Test: make -j50 RunSettingsRoboTests
Merged-In: I1038e237113f433c847aff98a45b1dd6089d80a8
Change-Id: I1038e237113f433c847aff98a45b1dd6089d80a8
 2020-11-30 13:34:07 +00:00