PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502

Change-Id: Id609ee38c9b5230def2c8d1cffb7aac8e209e4e6
This commit is contained in:
tim peng
2020-06-12 05:10:33 +00:00
committed by Automerger Merge Worker
parent 34a3ec22f4 c21406a0a2
commit b2ab3dfff2
10 changed files with 74 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/panel/MediaOutputGroupPanel.java
View File

@@ -159,6 +159,6 @@ public class MediaOutputGroupPanel implements PanelContent, LocalMediaManager.De
@Override
public int getViewType() {
return PanelContent.VIEW_TYPE_SLIDER;
return PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON;
}
}

2
src/com/android/settings/panel/MediaOutputPanel.java
View File

@@ -246,7 +246,7 @@ public class MediaOutputPanel implements PanelContent, LocalMediaManager.DeviceC
@Override
public int getViewType() {
return PanelContent.VIEW_TYPE_SLIDER;
return PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON;
}
private final MediaController.Callback mCb = new MediaController.Callback() {

1
src/com/android/settings/panel/PanelContent.java
View File

@@ -31,6 +31,7 @@ import java.util.List;
public interface PanelContent extends Instrumentable {
int VIEW_TYPE_SLIDER = 1;
int VIEW_TYPE_SLIDER_LARGE_ICON = 2;
/**
* @return a icon for the title of the Panel.

2
src/com/android/settings/panel/PanelSlicesAdapter.java
View File

@@ -75,6 +75,8 @@ public class PanelSlicesAdapter
View view;
if (viewType == PanelContent.VIEW_TYPE_SLIDER) {
view = inflater.inflate(R.layout.panel_slice_slider_row, viewGroup, false);
} else if (viewType == PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON) {
view = inflater.inflate(R.layout.panel_slice_slider_row_large_icon, viewGroup, false);
} else {
view = inflater.inflate(R.layout.panel_slice_row, viewGroup, false);
}