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

Merge "Remove ref to tile.remoteView, which is no longer used"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-07-20 21:32:07 +00:00
committed by Android (Google) Code Review
parent b9dce70c97 171e14eec9
commit 70e1ca3599
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/core/SettingsBaseActivity.java
View File

@@ -35,15 +35,14 @@ import android.view.Window;
import android.view.WindowManager.LayoutParams; import android.view.WindowManager.LayoutParams;
import android.widget.Toolbar; import android.widget.Toolbar;
import androidx.fragment.app.FragmentActivity;
import com.android.settings.R; import com.android.settings.R;
import com.android.settingslib.drawer.CategoryManager; import com.android.settingslib.drawer.CategoryManager;
import com.android.settingslib.drawer.TileUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.fragment.app.FragmentActivity;
public class SettingsBaseActivity extends FragmentActivity { public class SettingsBaseActivity extends FragmentActivity {
protected static final boolean DEBUG_TIMING = false; protected static final boolean DEBUG_TIMING = false;
@@ -174,7 +173,7 @@ public class SettingsBaseActivity extends FragmentActivity {
} }
public String getSettingPkg() { public String getSettingPkg() {
return TileUtils.SETTING_PKG; return CategoryManager.SETTING_PKG;
} }
public interface CategoryListener { public interface CategoryListener {

17
src/com/android/settings/dashboard/DashboardData.java
View File

@@ -20,6 +20,9 @@ import android.graphics.drawable.Drawable;
import android.service.settings.suggestions.Suggestion; import android.service.settings.suggestions.Suggestion;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.recyclerview.widget.DiffUtil;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.dashboard.conditional.Condition; import com.android.settings.dashboard.conditional.Condition;
import com.android.settingslib.drawer.DashboardCategory; import com.android.settingslib.drawer.DashboardCategory;
@@ -31,9 +34,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import androidx.annotation.VisibleForTesting;
import androidx.recyclerview.widget.DiffUtil;
/** /**
* Description about data list used in the DashboardAdapter. In the data list each item can be * Description about data list used in the DashboardAdapter. In the data list each item can be
* Condition, suggestion or category tile. * Condition, suggestion or category tile.
@@ -411,16 +411,7 @@ public class DashboardData {
&& TextUtils.equals(localTile.summary, targetTile.summary); && TextUtils.equals(localTile.summary, targetTile.summary);
case TYPE_SUGGESTION_CONTAINER: case TYPE_SUGGESTION_CONTAINER:
case TYPE_CONDITION_CONTAINER: case TYPE_CONDITION_CONTAINER:
// If entity is suggestion and contains remote view, force refresh // Fall through to default
final List entities = (List) entity;
if (!entities.isEmpty()) {
Object firstEntity = entities.get(0);
if (firstEntity instanceof Tile
&& ((Tile) firstEntity).remoteViews != null) {
return false;
}
}
// Otherwise Fall through to default
default: default:
return entity == null ? targetItem.entity == null return entity == null ? targetItem.entity == null
: entity.equals(targetItem.entity); : entity.equals(targetItem.entity);