From 02064346671a15751d17bbde58c8e4b8d6f50de3 Mon Sep 17 00:00:00 2001
From: timhypeng <timhypeng@google.com>
Date: Mon, 20 Jan 2020 13:51:06 +0800
Subject: [PATCH] Define ICON_UNAVAILABLE for no icon status

Bug: 147776885
Test: make -j42 RunSettingsRoboTests
Change-Id: I0fd0e203bb7590955d0caf2679ebc78be68b4e50
---
 src/com/android/settings/panel/PanelContent.java  | 4 +++-
 src/com/android/settings/panel/PanelFragment.java | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/panel/PanelContent.java b/src/com/android/settings/panel/PanelContent.java
index de3dc8971c3..badaeb1ba46 100644
--- a/src/com/android/settings/panel/PanelContent.java
+++ b/src/com/android/settings/panel/PanelContent.java
@@ -28,11 +28,13 @@ import java.util.List;
  */
 public interface PanelContent extends Instrumentable {
 
+    int ICON_UNAVAILABLE = -1;
+
     /**
      * @return a icon resource for the title of the Panel.
      */
     default int getIcon() {
-        return -1;
+        return ICON_UNAVAILABLE;
     }
 
     /**
diff --git a/src/com/android/settings/panel/PanelFragment.java b/src/com/android/settings/panel/PanelFragment.java
index db01a283eb8..40706fe6b86 100644
--- a/src/com/android/settings/panel/PanelFragment.java
+++ b/src/com/android/settings/panel/PanelFragment.java
@@ -193,7 +193,7 @@ public class PanelFragment extends Fragment {
         loadAllSlices();
 
         final int iconRes = mPanel.getIcon();
-        if (iconRes == -1) {
+        if (iconRes == PanelContent.ICON_UNAVAILABLE) {
             mTitleView.setText(mPanel.getTitle());
         } else {
             mTitleView.setVisibility(View.GONE);