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

[Panlingual] Fix the item clicked is not match target application

Browse Source 
- Remove unnecessary action of shift poistion.

Bug: b/232754527
Test: local and see b/232754527#2
Change-Id: Ief8655661dd3cc468e68a085dede528694ede33c
This commit is contained in:
tom hsu
2022-05-16 18:42:25 +08:00
parent ec3ae8bb17
commit c5bb55689b
1 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1480,6 +1480,10 @@ public class ManageApplications extends InstrumentedFragment
} }
} }
/**
* Item count include all items. If UI has a header on the app list, it shall shift 1 to
* application count for the total item count.
*/
@Override @Override
public int getItemCount() { public int getItemCount() {
int count = getApplicationCount(); int count = getApplicationCount();
@@ -1493,29 +1497,42 @@ public class ManageApplications extends InstrumentedFragment
return mEntries != null ? mEntries.size() : 0; return mEntries != null ? mEntries.size() : 0;
} }
public AppEntry getAppEntry(int position) { public AppEntry getAppEntry(int applicationPosition) {
return mEntries.get( return mEntries.get(applicationPosition);
getApplicationPosition(mManageApplications.mListType, position));
} }
/**
* Item Id follows all item on the app list. If UI has a header on the list, it shall
* shift 1 to the position for correct app entry.
*/
@Override @Override
public long getItemId(int position) { public long getItemId(int position) {
int applicationPosition = int applicationPosition =
getApplicationPosition(mManageApplications.mListType, position); getApplicationPosition(mManageApplications.mListType, position);
if (applicationPosition == mEntries.size()) { if (applicationPosition == mEntries.size()
|| applicationPosition == RecyclerView.NO_POSITION) {
return -1; return -1;
} }
return mEntries.get(applicationPosition).id; return mEntries.get(applicationPosition).id;
} }
/**
* Check item in the list shall enable or disable.
* @param position The item position in the list
*/
public boolean isEnabled(int position) { public boolean isEnabled(int position) {
if (getItemViewType(position) == VIEW_TYPE_EXTRA_VIEW int itemViewType = getItemViewType(position);
if (itemViewType == VIEW_TYPE_EXTRA_VIEW || itemViewType == VIEW_TYPE_APP_HEADER
|| mManageApplications.mListType != LIST_TYPE_HIGH_POWER) { || mManageApplications.mListType != LIST_TYPE_HIGH_POWER) {
return true; return true;
} }
ApplicationsState.AppEntry entry =
mEntries.get( int applicationPosition =
getApplicationPosition(mManageApplications.mListType, position)); getApplicationPosition(mManageApplications.mListType, position);
if (applicationPosition == RecyclerView.NO_POSITION) {
return true;
}
ApplicationsState.AppEntry entry = mEntries.get(applicationPosition);
return !mBackend.isSysAllowlisted(entry.info.packageName) return !mBackend.isSysAllowlisted(entry.info.packageName)
&& !mBackend.isDefaultActiveApp(entry.info.packageName); && !mBackend.isDefaultActiveApp(entry.info.packageName);
@@ -1528,10 +1545,16 @@ public class ManageApplications extends InstrumentedFragment
return; return;
} }
int applicationPosition =
getApplicationPosition(mManageApplications.mListType, position);
if (applicationPosition == RecyclerView.NO_POSITION) {
return;
}
// Bind the data efficiently with the holder // Bind the data efficiently with the holder
final ApplicationsState.AppEntry entry = // If there is a header on the list, the position shall be shifted. Thus, it shall use
mEntries.get( // #getApplicationPosition to get real application position for the app entry.
getApplicationPosition(mManageApplications.mListType, position)); final ApplicationsState.AppEntry entry = mEntries.get(applicationPosition);
synchronized (entry) { synchronized (entry) {
mState.ensureLabelDescription(entry); mState.ensureLabelDescription(entry);
holder.setTitle(entry.label, entry.labelDescription); holder.setTitle(entry.label, entry.labelDescription);
@@ -1641,8 +1664,8 @@ public class ManageApplications extends InstrumentedFragment
public static int getApplicationPosition(int listType, int position) { public static int getApplicationPosition(int listType, int position) {
int applicationPosition = position; int applicationPosition = position;
// Adjust position due to header added. // Adjust position due to header added.
if (position > 0 && listType == LIST_TYPE_APPS_LOCALE) { if (listType == LIST_TYPE_APPS_LOCALE) {
applicationPosition = position - 1; applicationPosition = position > 0 ? position - 1 : RecyclerView.NO_POSITION;
} }
return applicationPosition; return applicationPosition;
} }