cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI experiments for app settings

Browse Source
This commit is contained in:
Dominik Schürmann
2015-02-02 17:19:27 +01:00
parent e651a39279
commit 95e534e1f5
5 changed files with 69 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
View File

@@ -17,6 +17,7 @@
package org.sufficientlysecure.keychain.remote.ui;
import android.app.Activity;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
@@ -59,9 +60,10 @@ public class AppSettingsActivity extends BaseActivity {
new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
cancel();
}
});
setTitle(null);
mSettingsFragment = (AppSettingsHeaderFragment) getSupportFragmentManager().findFragmentById(
R.id.api_app_settings_fragment);
@@ -80,6 +82,13 @@ public class AppSettingsActivity extends BaseActivity {
private void save() {
mAllowedKeysFragment.saveAllowedKeys();
setResult(Activity.RESULT_OK);
finish();
}
private void cancel() {
setResult(Activity.RESULT_CANCELED);
finish();
}
@Override
@@ -127,16 +136,16 @@ public class AppSettingsActivity extends BaseActivity {
mAppSettings = new ProviderHelper(this).getApiAppSettings(appUri);
mSettingsFragment.setAppSettings(mAppSettings);
String appName;
PackageManager pm = getPackageManager();
try {
ApplicationInfo ai = pm.getApplicationInfo(mAppSettings.getPackageName(), 0);
appName = (String) pm.getApplicationLabel(ai);
} catch (PackageManager.NameNotFoundException e) {
// fallback
appName = mAppSettings.getPackageName();
}
setTitle(appName);
// String appName;
// PackageManager pm = getPackageManager();
// try {
// ApplicationInfo ai = pm.getApplicationInfo(mAppSettings.getPackageName(), 0);
// appName = (String) pm.getApplicationLabel(ai);
// } catch (PackageManager.NameNotFoundException e) {
// // fallback
// appName = mAppSettings.getPackageName();
// }
// setTitle(appName);
Uri accountsUri = appUri.buildUpon().appendPath(KeychainContract.PATH_ACCOUNTS).build();
Log.d(Constants.TAG, "accountsUri: " + accountsUri);

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java
View File

@@ -26,6 +26,7 @@ import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;
import org.sufficientlysecure.keychain.R;
@@ -126,5 +127,12 @@ public abstract class BaseActivity extends ActionBarActivity {
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
}
// public void add() {
// LayoutInflater inflater = LayoutInflater.from(mToolbar.getContext());
// View view = inflater.inflate(R.layout.api_app_settings_fragment, null);
// Toolbar.LayoutParams layoutParams = new Toolbar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
//// layoutParams.gravity = Gravity.BOTTOM;
// mToolbar.addView(view, layoutParams);
// }
}