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

Fix the color of dot wrongly in device admin page

Browse Source 
In this cl, we migrate origin files/method from framework into settings app.
So, we can control layout and drawble without impacting other app.

And we only remove to set a tint color in app_permission_item.xml.
Currently, it won't tint color for dot now.

Test: See the screen and dot's color is correct.
Fix: 188188444
Change-Id: I18054b47ba07e7864e7c238f2bec5fbe1d3feeea
This commit is contained in:
Tsung-Mao Fang
2021-05-20 20:21:56 +08:00
parent bac284a622
commit 3720ae21b0
3 changed files with 104 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
View File

@@ -38,6 +38,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.os.Binder;
import android.os.Bundle;
import android.os.Handler;
@@ -52,11 +53,11 @@ import android.text.method.ScrollingMovementMethod;
import android.util.EventLog;
import android.util.Log;
import android.view.Display;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.view.WindowManager;
import android.widget.AppSecurityPermissions;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
@@ -134,6 +135,8 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
boolean mIsCalledFromSupportDialog = false;
private LayoutInflater mLayoutInflaternflater;
@Override
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
@@ -142,6 +145,7 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
mDPM = (DevicePolicyManager)getSystemService(Context.DEVICE_POLICY_SERVICE);
mAppOps = (AppOpsManager)getSystemService(Context.APP_OPS_SERVICE);
mLayoutInflaternflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
PackageManager packageManager = getPackageManager();
if ((getIntent().getFlags()&Intent.FLAG_ACTIVITY_NEW_TASK) != 0) {
@@ -735,14 +739,36 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
for (DeviceAdminInfo.PolicyInfo pi : mDeviceAdmin.getUsedPolicies()) {
int descriptionId = isAdminUser ? pi.description : pi.descriptionForSecondaryUsers;
int labelId = isAdminUser ? pi.label : pi.labelForSecondaryUsers;
View view = AppSecurityPermissions.getPermissionItemView(this, getText(labelId),
showDescription ? getText(descriptionId) : "", true);
View view = getPermissionItemView(getText(labelId),
showDescription ? getText(descriptionId) : "");
mAdminPolicies.addView(view);
}
mAdminPoliciesInitialized = true;
}
}
/**
* Utility to retrieve a view displaying a single permission. This provides
* the UI layout for permissions.
*/
private View getPermissionItemView(CharSequence grpName, CharSequence description) {
Drawable icon = this.getDrawable(com.android.internal.R.drawable.ic_text_dot);
View permView = mLayoutInflaternflater.inflate(R.layout.app_permission_item, null);
TextView permGrpView = permView.findViewById(R.id.permission_group);
TextView permDescView = permView.findViewById(R.id.permission_list);
ImageView imgView = (ImageView) permView.findViewById(R.id.perm_icon);
imgView.setImageDrawable(icon);
if (grpName != null) {
permGrpView.setText(grpName);
permDescView.setText(description);
} else {
permGrpView.setText(description);
permDescView.setVisibility(View.GONE);
}
return permView;
}
void toggleMessageEllipsis(View v) {
TextView tv = (TextView) v;