Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide space for title if the title is GONE.

Browse Source 
am: 790a34e1a9

Change-Id: I515514013819133228f3185166fe7962ab2f27c8
This commit is contained in:
Michael Kwan
2016-08-17 17:48:32 +00:00
committed by android-build-merger
parent 46bf9f50e9 790a34e1a9
commit 9019052e96
1 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
core/java/com/android/internal/widget/WatchHeaderListView.java
View File

@@ -103,7 +103,8 @@ public class WatchHeaderListView extends ListView {
@Override
public int getHeaderViewsCount() {
return mTopPanel == null ? super.getHeaderViewsCount() : super.getHeaderViewsCount() + 1;
return mTopPanel == null ? super.getHeaderViewsCount()
: super.getHeaderViewsCount() + (mTopPanel.getVisibility() == GONE ? 0 : 1);
}
private void wrapAdapterIfNecessary() {
@@ -133,7 +134,7 @@ public class WatchHeaderListView extends ListView {
}
private int getTopPanelCount() {
return mTopPanel == null ? 0 : 1;
return (mTopPanel == null || mTopPanel.getVisibility() == GONE) ? 0 : 1;
}
@Override
@@ -143,33 +144,19 @@ public class WatchHeaderListView extends ListView {
@Override
public boolean areAllItemsEnabled() {
return mTopPanel == null && super.areAllItemsEnabled();
return getTopPanelCount() == 0 && super.areAllItemsEnabled();
}
@Override
public boolean isEnabled(int position) {
if (mTopPanel != null) {
if (position == 0) {
return false;
} else {
return super.isEnabled(position - 1);
}
}
return super.isEnabled(position);
int topPanelCount = getTopPanelCount();
return position < topPanelCount ? false : super.isEnabled(position - topPanelCount);
}
@Override
public Object getItem(int position) {
if (mTopPanel != null) {
if (position == 0) {
return null;
} else {
return super.getItem(position - 1);
}
}
return super.getItem(position);
int topPanelCount = getTopPanelCount();
return position < topPanelCount ? null : super.getItem(position - topPanelCount);
}
@Override
@@ -187,15 +174,9 @@ public class WatchHeaderListView extends ListView {
@Override
public View getView(int position, View convertView, ViewGroup parent) {
if (mTopPanel != null) {
if (position == 0) {
return mTopPanel;
} else {
return super.getView(position - 1, convertView, parent);
}
}
return super.getView(position, convertView, parent);
int topPanelCount = getTopPanelCount();
return position < topPanelCount
? mTopPanel : super.getView(position - topPanelCount, convertView, parent);
}
@Override