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

Merge "Move Notifications to the homepage group"

Browse Source
This commit is contained in:
Yanting Yang
2020-11-10 08:37:11 +00:00
committed by Android (Google) Code Review
parent ccdf18ccee be4decead1
commit 4128d636ca
3 changed files with 117 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
View File

@@ -21,12 +21,14 @@ import android.app.usage.UsageStats;
import android.content.Context;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
import android.util.FeatureFlagUtils;
import android.view.View;
import androidx.annotation.NonNull;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.FeatureFlags;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.notification.EmergencyBroadcastPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -65,6 +67,10 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment
@Override
protected int getPreferenceScreenResId() {
// TODO(b/168166015): Remove this when the new Apps page ready.
if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
return R.xml.apps;
}
return R.xml.app_and_notification;
}