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

Define ICON_UNAVAILABLE for no icon status

Browse Source 
Bug: 147776885
Test: make -j42 RunSettingsRoboTests
Change-Id: I0fd0e203bb7590955d0caf2679ebc78be68b4e50
This commit is contained in:
timhypeng
2020-01-20 13:51:06 +08:00
parent adae7475b0
commit 0206434667
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,11 +28,13 @@ import java.util.List;
*/ */
public interface PanelContent extends Instrumentable { public interface PanelContent extends Instrumentable {
int ICON_UNAVAILABLE = -1;
/** /**
* @return a icon resource for the title of the Panel. * @return a icon resource for the title of the Panel.
*/ */
default int getIcon() { default int getIcon() {
return -1; return ICON_UNAVAILABLE;
} }
/** /**

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

@@ -193,7 +193,7 @@ public class PanelFragment extends Fragment {
loadAllSlices(); loadAllSlices();
final int iconRes = mPanel.getIcon(); final int iconRes = mPanel.getIcon();
if (iconRes == -1) { if (iconRes == PanelContent.ICON_UNAVAILABLE) {
mTitleView.setText(mPanel.getTitle()); mTitleView.setText(mPanel.getTitle());
} else { } else {
mTitleView.setVisibility(View.GONE); mTitleView.setVisibility(View.GONE);