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

Merge "RequestManageCredentials landscape mode" into sc-dev

Browse Source
This commit is contained in:
Alex Johnston
2021-06-10 09:38:29 +00:00
committed by Android (Google) Code Review
parent e2f5b87c14 4ef1438512
commit 17101d6ebe
3 changed files with 180 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/settings/security/RequestManageCredentials.java
View File

@@ -21,7 +21,10 @@ import android.app.Activity;
import android.app.admin.DevicePolicyEventLogger;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.content.res.Configuration;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
@@ -37,7 +40,9 @@ import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
@@ -83,6 +88,7 @@ public class RequestManageCredentials extends Activity {
private KeyChain.KeyChainConnection mKeyChainConnection;
private boolean mDisplayingButtonPanel = false;
private boolean mIsLandscapeMode = false;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -114,6 +120,8 @@ public class RequestManageCredentials extends Activity {
.setStrings(mCredentialManagerPackage)
.write();
setContentView(R.layout.request_manage_credentials);
mIsLandscapeMode = getResources().getConfiguration().orientation
== Configuration.ORIENTATION_LANDSCAPE;
mKeyChainTread = new HandlerThread("KeyChainConnection");
mKeyChainTread.start();
@@ -134,6 +142,9 @@ public class RequestManageCredentials extends Activity {
getNumberOfAuthenticationPolicyUris(mAuthenticationPolicy))
.write();
if (mIsLandscapeMode) {
loadHeader();
}
loadRecyclerView();
loadButtons();
loadExtendedFloatingActionButton();
@@ -193,7 +204,7 @@ public class RequestManageCredentials extends Activity {
CredentialManagementAppAdapter recyclerViewAdapter = new CredentialManagementAppAdapter(
this, mCredentialManagerPackage, mAuthenticationPolicy.getAppAndUriMappings(),
/* include header= */ true, /* include expander= */ false);
/* include header= */ !mIsLandscapeMode, /* include expander= */ false);
mRecyclerView.setAdapter(recyclerViewAdapter);
}
@@ -214,12 +225,33 @@ public class RequestManageCredentials extends Activity {
private void loadExtendedFloatingActionButton() {
mExtendedFab = findViewById(R.id.extended_fab);
mExtendedFab.setOnClickListener(v -> {
mRecyclerView.scrollToPosition(mAuthenticationPolicy.getAppAndUriMappings().size());
final int position = mIsLandscapeMode
? mAuthenticationPolicy.getAppAndUriMappings().size() - 1
: mAuthenticationPolicy.getAppAndUriMappings().size();
mRecyclerView.scrollToPosition(position);
mExtendedFab.hide();
showButtonPanel();
});
}
private void loadHeader() {
final ImageView mAppIconView = findViewById(R.id.credential_management_app_icon);
final TextView mTitleView = findViewById(R.id.credential_management_app_title);
try {
ApplicationInfo applicationInfo =
getPackageManager().getApplicationInfo(mCredentialManagerPackage, 0);
mAppIconView.setImageDrawable(getPackageManager().getApplicationIcon(applicationInfo));
mTitleView.setText(TextUtils.expandTemplate(
getText(R.string.request_manage_credentials_title),
applicationInfo.loadLabel(getPackageManager())));
} catch (PackageManager.NameNotFoundException e) {
mAppIconView.setImageDrawable(null);
mTitleView.setText(TextUtils.expandTemplate(
getText(R.string.request_manage_credentials_title),
mCredentialManagerPackage));
}
}
private void setOrUpdateCredentialManagementAppAndFinish() {
try {
mKeyChainConnection.getService().setCredentialManagementApp(