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

Merge "AppClone: Changes to display app list on Cloned Apps page."

Browse Source
This commit is contained in:
Ankita Vyas
2022-11-28 15:41:37 +00:00
committed by Android (Google) Code Review
parent d1dc8b9443 d3019d3ee0
commit 3bdedc2add
11 changed files with 276 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
View File

@@ -21,6 +21,7 @@ import androidx.annotation.IntDef;
import com.android.settings.R;
import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
import com.android.settings.applications.AppStateAppBatteryUsageBridge;
import com.android.settings.applications.AppStateClonedAppsBridge;
import com.android.settings.applications.AppStateInstallAppsBridge;
import com.android.settings.applications.AppStateLocaleBridge;
import com.android.settings.applications.AppStateLongBackgroundTasksBridge;
@@ -63,6 +64,7 @@ public class AppFilterRegistry {
FILTER_APPS_BATTERY_OPTIMIZED,
FILTER_APPS_BATTERY_RESTRICTED,
FILTER_LONG_BACKGROUND_TASKS,
FILTER_APPS_CLONE,
})
@interface FilterType {}
@@ -92,8 +94,9 @@ public class AppFilterRegistry {
public static final int FILTER_APPS_BATTERY_OPTIMIZED = 22;
public static final int FILTER_APPS_BATTERY_RESTRICTED = 23;
public static final int FILTER_LONG_BACKGROUND_TASKS = 24;
// Next id: 25. If you add an entry here, please change NUM_FILTER_ENTRIES.
private static final int NUM_FILTER_ENTRIES = 25;
public static final int FILTER_APPS_CLONE = 25;
// Next id: 26. If you add an entry here, please change NUM_FILTER_ENTRIES.
private static final int NUM_FILTER_ENTRIES = 26;
private static AppFilterRegistry sRegistry;
@@ -251,10 +254,15 @@ public class AppFilterRegistry {
AppStateLongBackgroundTasksBridge.FILTER_LONG_JOBS_APPS,
FILTER_LONG_BACKGROUND_TASKS,
R.string.long_background_tasks_title);
// Apps that are cloneable or cloned.
mFilters[FILTER_APPS_CLONE] =
new AppFilterItem(
AppStateClonedAppsBridge.FILTER_APPS_CLONE,
FILTER_APPS_CLONE,
R.string.cloned_apps_dashboard_title);
}
public static AppFilterRegistry getInstance() {
if (sRegistry == null) {
sRegistry = new AppFilterRegistry();
@@ -291,6 +299,8 @@ public class AppFilterRegistry {
return FILTER_APPS_BATTERY_OPTIMIZED;
case ManageApplications.LIST_TYPE_LONG_BACKGROUND_TASKS:
return FILTER_LONG_BACKGROUND_TASKS;
case ManageApplications.LIST_TYPE_CLONED_APPS:
return FILTER_APPS_CLONE;
default:
return FILTER_APPS_ALL;
}

27
src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.applications.manageapplications;
import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_CLONED_APPS;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
@@ -49,6 +52,8 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
@VisibleForTesting
final Switch mSwitch;
private static int sListType;
private final ImageView mAppIcon;
ApplicationViewHolder(View itemView) {
@@ -65,15 +70,31 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
return newView(parent, false /* twoTarget */);
}
static View newView(ViewGroup parent , boolean twoTarget, int listType, Context context) {
sListType = listType;
return newView(parent, twoTarget);
}
static View newView(ViewGroup parent, boolean twoTarget) {
ViewGroup view = (ViewGroup) LayoutInflater.from(parent.getContext())
.inflate(R.layout.preference_app, parent, false);
final ViewGroup widgetFrame = view.findViewById(android.R.id.widget_frame);
if (twoTarget) {
if (widgetFrame != null) {
LayoutInflater.from(parent.getContext())
.inflate(R.layout.preference_widget_primary_switch, widgetFrame, true);
if (sListType == LIST_TYPE_CLONED_APPS) {
LayoutInflater.from(parent.getContext())
.inflate(R.layout.preference_widget_add, widgetFrame, true);
//todo(b/259022623): Invoke the clone backend flow i.e.
// i) upon onclick of add icon, create new clone profile the first time
// and clone an app.
// ii) Show progress bar while app is being cloned
// iii) And upon onClick of trash icon, delete the cloned app instance
// from clone profile.
// iv) Log metrics
} else {
LayoutInflater.from(parent.getContext())
.inflate(R.layout.preference_widget_primary_switch, widgetFrame, true);
}
View divider = LayoutInflater.from(parent.getContext()).inflate(
R.layout.preference_two_target_divider, view, false);
// second to last, before widget frame

40
src/com/android/settings/applications/manageapplications/ManageApplications.java
View File

@@ -92,6 +92,7 @@ import com.android.settings.R;
import com.android.settings.Settings.AlarmsAndRemindersActivity;
import com.android.settings.Settings.AppBatteryUsageActivity;
import com.android.settings.Settings.ChangeWifiStateActivity;
import com.android.settings.Settings.ClonedAppsListActivity;
import com.android.settings.Settings.HighPowerApplicationsActivity;
import com.android.settings.Settings.LongBackgroundTasksActivity;
import com.android.settings.Settings.ManageExternalSourcesActivity;
@@ -109,6 +110,7 @@ import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
import com.android.settings.applications.AppStateAppBatteryUsageBridge;
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
import com.android.settings.applications.AppStateBaseBridge;
import com.android.settings.applications.AppStateClonedAppsBridge;
import com.android.settings.applications.AppStateInstallAppsBridge;
import com.android.settings.applications.AppStateLocaleBridge;
import com.android.settings.applications.AppStateLongBackgroundTasksBridge;
@@ -250,6 +252,7 @@ public class ManageApplications extends InstrumentedFragment
public static final int LIST_TYPE_APPS_LOCALE = 14;
public static final int LIST_TYPE_BATTERY_OPTIMIZATION = 15;
public static final int LIST_TYPE_LONG_BACKGROUND_TASKS = 16;
public static final int LIST_TYPE_CLONED_APPS = 17;
// List types that should show instant apps.
public static final Set<Integer> LIST_TYPES_WITH_INSTANT = new ArraySet<>(Arrays.asList(
@@ -544,6 +547,8 @@ public class ManageApplications extends InstrumentedFragment
return SettingsEnums.BATTERY_OPTIMIZED_APPS_LIST;
case LIST_TYPE_LONG_BACKGROUND_TASKS:
return SettingsEnums.LONG_BACKGROUND_TASKS;
case LIST_TYPE_CLONED_APPS:
return SettingsEnums.CLONED_APPS;
default:
return SettingsEnums.PAGE_UNKNOWN;
}
@@ -798,9 +803,11 @@ public class ManageApplications extends InstrumentedFragment
&& mSortOrder != R.id.sort_order_size);
mOptionsMenu.findItem(R.id.show_system).setVisible(!mShowSystem
&& mListType != LIST_TYPE_HIGH_POWER && mListType != LIST_TYPE_APPS_LOCALE);
&& mListType != LIST_TYPE_HIGH_POWER && mListType != LIST_TYPE_APPS_LOCALE
&& mListType != LIST_TYPE_CLONED_APPS);
mOptionsMenu.findItem(R.id.hide_system).setVisible(mShowSystem
&& mListType != LIST_TYPE_HIGH_POWER && mListType != LIST_TYPE_APPS_LOCALE);
&& mListType != LIST_TYPE_HIGH_POWER && mListType != LIST_TYPE_APPS_LOCALE
&& mListType != LIST_TYPE_CLONED_APPS);
mOptionsMenu.findItem(R.id.reset_app_preferences).setVisible(mListType == LIST_TYPE_MAIN);
@@ -983,6 +990,8 @@ public class ManageApplications extends InstrumentedFragment
screenTitle = R.string.app_battery_usage_title;
} else if (className.equals(LongBackgroundTasksActivity.class.getName())) {
screenTitle = R.string.long_background_tasks_title;
} else if (className.equals(ClonedAppsListActivity.class.getName())) {
screenTitle = R.string.cloned_apps_dashboard_title;
} else {
if (screenTitle == -1) {
screenTitle = R.string.all_apps;
@@ -1111,6 +1120,7 @@ public class ManageApplications extends InstrumentedFragment
private static final int VIEW_TYPE_APP = 0;
private static final int VIEW_TYPE_EXTRA_VIEW = 1;
private static final int VIEW_TYPE_APP_HEADER = 2;
private static final int VIEW_TYPE_TWO_TARGET = 3;
private final ApplicationsState mState;
private final ApplicationsState.Session mSession;
@@ -1188,6 +1198,8 @@ public class ManageApplications extends InstrumentedFragment
mExtraInfoBridge = new AppStateAppBatteryUsageBridge(mContext, mState, this);
} else if (mManageApplications.mListType == LIST_TYPE_LONG_BACKGROUND_TASKS) {
mExtraInfoBridge = new AppStateLongBackgroundTasksBridge(mContext, mState, this);
} else if (mManageApplications.mListType == LIST_TYPE_CLONED_APPS) {
mExtraInfoBridge = new AppStateClonedAppsBridge(mContext, mState, this);
} else {
mExtraInfoBridge = null;
}
@@ -1301,6 +1313,14 @@ public class ManageApplications extends InstrumentedFragment
R.string.desc_app_locale_selection_supported);
} else if (mManageApplications.mListType == LIST_TYPE_NOTIFICATION) {
view = ApplicationViewHolder.newView(parent, true /* twoTarget */);
} else if (mManageApplications.mListType == LIST_TYPE_CLONED_APPS
&& viewType == VIEW_TYPE_APP_HEADER) {
view = ApplicationViewHolder.newHeader(parent,
R.string.desc_cloned_apps_intro_text);
} else if (mManageApplications.mListType == LIST_TYPE_CLONED_APPS
&& viewType == VIEW_TYPE_TWO_TARGET) {
view = ApplicationViewHolder.newView(
parent, true, LIST_TYPE_CLONED_APPS, mContext);
} else {
view = ApplicationViewHolder.newView(parent, false /* twoTarget */);
}
@@ -1309,8 +1329,11 @@ public class ManageApplications extends InstrumentedFragment
@Override
public int getItemViewType(int position) {
if (position == 0 && mManageApplications.mListType == LIST_TYPE_APPS_LOCALE) {
if (position == 0 && (mManageApplications.mListType == LIST_TYPE_APPS_LOCALE
|| mManageApplications.mListType == LIST_TYPE_CLONED_APPS)) {
return VIEW_TYPE_APP_HEADER;
} else if (mManageApplications.mListType == LIST_TYPE_CLONED_APPS) {
return VIEW_TYPE_TWO_TARGET;
}
return VIEW_TYPE_APP;
}
@@ -1570,7 +1593,8 @@ public class ManageApplications extends InstrumentedFragment
@Override
public int getItemCount() {
int count = getApplicationCount();
if (count != 0 && mManageApplications.mListType == LIST_TYPE_APPS_LOCALE) {
if (count != 0 && (mManageApplications.mListType == LIST_TYPE_APPS_LOCALE
|| mManageApplications.mListType == LIST_TYPE_CLONED_APPS)) {
count++;
}
return count;
@@ -1720,6 +1744,9 @@ public class ManageApplications extends InstrumentedFragment
case LIST_TYPE_LONG_BACKGROUND_TASKS:
holder.setSummary(LongBackgroundTasksDetails.getSummary(mContext, entry));
break;
case LIST_TYPE_CLONED_APPS:
holder.setSummary(null);
break;
default:
holder.updateSizeText(entry, mManageApplications.mInvalidSizeStr, mWhichSize);
break;
@@ -1741,6 +1768,9 @@ public class ManageApplications extends InstrumentedFragment
holder.setSummary(null);
}
break;
case LIST_TYPE_CLONED_APPS:
//todo(b/259022623): Attach onClick listener here.
break;
}
}
@@ -1754,7 +1784,7 @@ public class ManageApplications extends InstrumentedFragment
public static int getApplicationPosition(int listType, int position) {
int applicationPosition = position;
// Adjust position due to header added.
if (listType == LIST_TYPE_APPS_LOCALE) {
if (listType == LIST_TYPE_APPS_LOCALE || listType == LIST_TYPE_CLONED_APPS) {
applicationPosition = position > 0 ? position - 1 : RecyclerView.NO_POSITION;
}
return applicationPosition;

3
src/com/android/settings/applications/manageapplications/ManageApplicationsUtil.kt
View File

@@ -21,6 +21,7 @@ import android.util.FeatureFlagUtils
import com.android.settings.Settings.AlarmsAndRemindersActivity
import com.android.settings.Settings.AppBatteryUsageActivity
import com.android.settings.Settings.ChangeWifiStateActivity
import com.android.settings.Settings.ClonedAppsListActivity
import com.android.settings.Settings.GamesStorageActivity
import com.android.settings.Settings.HighPowerApplicationsActivity
import com.android.settings.Settings.LongBackgroundTasksActivity
@@ -38,6 +39,7 @@ import com.android.settings.applications.manageapplications.ManageApplications.L
import com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_ALARMS_AND_REMINDERS
import com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_APPS_LOCALE
import com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_BATTERY_OPTIMIZATION
import com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_CLONED_APPS
import com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_GAMES
import com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_HIGH_POWER
import com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_LONG_BACKGROUND_TASKS
@@ -81,6 +83,7 @@ object ManageApplicationsUtil {
AppLocaleDetails::class to LIST_TYPE_APPS_LOCALE,
AppBatteryUsageActivity::class to LIST_TYPE_BATTERY_OPTIMIZATION,
LongBackgroundTasksActivity::class to LIST_TYPE_LONG_BACKGROUND_TASKS,
ClonedAppsListActivity::class to LIST_TYPE_CLONED_APPS,
)
@JvmField