diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-29 10:10:07 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-29 10:10:07 +0100 |
commit | 43930ed8f2d890585b5b85cd963d4f564cdb736f (patch) | |
tree | 9dec295070f13f909fb5661ca35df65358ce562b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui | |
parent | 5564f65a69d3d6bdc6ff7fbf61004f31a0017877 (diff) | |
download | open-keychain-43930ed8f2d890585b5b85cd963d4f564cdb736f.tar.gz open-keychain-43930ed8f2d890585b5b85cd963d4f564cdb736f.tar.bz2 open-keychain-43930ed8f2d890585b5b85cd963d4f564cdb736f.zip |
Move key list logic into fragment, UI fixes for nav drawer
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui')
3 files changed, 0 insertions, 57 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java index e5edd6a0f..f4cd553d0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java @@ -92,9 +92,6 @@ public class AccountSettingsActivity extends BaseActivity { case R.id.menu_account_settings_delete: deleteAccount(); return true; - case R.id.menu_account_settings_cancel: - finish(); - return true; } return super.onOptionsItemSelected(item); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java index e91482e28..36d6ad888 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java @@ -47,13 +47,6 @@ public class AppSettingsActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // let the actionbar look like Android's contact app -// ActionBar actionBar = getSupportActionBar(); -// actionBar.setDisplayHomeAsUpEnabled(true); -// actionBar.setIcon(android.R.color.transparent); -// actionBar.setHomeButtonEnabled(true); - - mSettingsFragment = (AppSettingsFragment) getSupportFragmentManager().findFragmentById( R.id.api_app_settings_fragment); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java deleted file mode 100644 index 3b4cc654e..000000000 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2013-2014 Dominik Schürmann <dominik@dominikschuermann.de> - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -package org.sufficientlysecure.keychain.remote.ui; - -import android.os.Bundle; - -import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.ui.DrawerActivity; -import org.sufficientlysecure.keychain.ui.NavDrawerActivity; - -public class AppsListActivity extends NavDrawerActivity { - -// @Override -// protected void onCreate(Bundle savedInstanceState) { -// super.onCreate(savedInstanceState); -// -// activateDrawerNavigation(savedInstanceState); -// } - - @Override - public void init(Bundle savedInstanceState) { - super.init(savedInstanceState); - setContentView(R.layout.api_apps_list_activity); - } - - -// @Override -// protected void initLayout() { -// setContentView(R.layout.api_apps_list_activity); -// } - -} |