diff --git a/res/layout/group_add_entry.xml b/res/layout/group_add_entry.xml index cac7ccb3a..7795674a0 100644 --- a/res/layout/group_add_entry.xml +++ b/res/layout/group_add_entry.xml @@ -20,7 +20,7 @@ - diff --git a/res/layout/group_empty.xml b/res/layout/group_empty.xml index 324428210..2a525a95b 100644 --- a/res/layout/group_empty.xml +++ b/res/layout/group_empty.xml @@ -20,7 +20,7 @@ - diff --git a/res/layout/group_root.xml b/res/layout/group_root.xml index f1c04c6c2..c2f7b95c4 100644 --- a/res/layout/group_root.xml +++ b/res/layout/group_root.xml @@ -20,7 +20,7 @@ - diff --git a/res/layout/group_view_only.xml b/res/layout/group_view_only.xml index 6732f57c7..2888abf59 100644 --- a/res/layout/group_view_only.xml +++ b/res/layout/group_view_only.xml @@ -20,7 +20,7 @@ - diff --git a/src/com/keepassdroid/GroupActivity.java b/src/com/keepassdroid/GroupActivity.java index 33cbd8942..ae856e5c5 100644 --- a/src/com/keepassdroid/GroupActivity.java +++ b/src/com/keepassdroid/GroupActivity.java @@ -46,6 +46,9 @@ import com.keepassdroid.database.PwGroupId; import com.keepassdroid.database.PwGroupV3; import com.keepassdroid.database.PwGroupV4; import com.keepassdroid.database.edit.AddGroup; +import com.keepassdroid.view.GroupAddEntryView; +import com.keepassdroid.view.GroupRootView; +import com.keepassdroid.view.GroupViewOnlyView; public abstract class GroupActivity extends GroupBaseActivity { diff --git a/src/com/keepassdroid/GroupBaseActivity.java b/src/com/keepassdroid/GroupBaseActivity.java index 83002d2c8..460324f27 100644 --- a/src/com/keepassdroid/GroupBaseActivity.java +++ b/src/com/keepassdroid/GroupBaseActivity.java @@ -39,6 +39,7 @@ import com.keepassdroid.database.PwGroup; import com.keepassdroid.database.edit.OnFinish; import com.keepassdroid.settings.AppSettingsActivity; import com.keepassdroid.utils.Util; +import com.keepassdroid.view.GroupViewOnlyView; public abstract class GroupBaseActivity extends LockCloseListActivity { public static final String KEY_ENTRY = "entry"; diff --git a/src/com/keepassdroid/search/SearchResults.java b/src/com/keepassdroid/search/SearchResults.java index 59b5e495e..4a6290eca 100644 --- a/src/com/keepassdroid/search/SearchResults.java +++ b/src/com/keepassdroid/search/SearchResults.java @@ -28,13 +28,13 @@ import com.android.keepass.KeePass; import com.android.keepass.R; import com.keepassdroid.Database; import com.keepassdroid.GroupBaseActivity; -import com.keepassdroid.GroupEmptyView; -import com.keepassdroid.GroupViewOnlyView; import com.keepassdroid.ProgressTask; import com.keepassdroid.PwListAdapter; import com.keepassdroid.app.App; import com.keepassdroid.database.edit.BuildIndex; import com.keepassdroid.database.edit.OnFinish; +import com.keepassdroid.view.GroupEmptyView; +import com.keepassdroid.view.GroupViewOnlyView; public class SearchResults extends GroupBaseActivity { diff --git a/src/com/keepassdroid/GroupAddEntryView.java b/src/com/keepassdroid/view/GroupAddEntryView.java similarity index 97% rename from src/com/keepassdroid/GroupAddEntryView.java rename to src/com/keepassdroid/view/GroupAddEntryView.java index 5d71f85e3..307d3465d 100644 --- a/src/com/keepassdroid/GroupAddEntryView.java +++ b/src/com/keepassdroid/view/GroupAddEntryView.java @@ -17,7 +17,7 @@ * along with KeePassDroid. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.view; import android.content.Context; import android.util.AttributeSet; diff --git a/src/com/keepassdroid/GroupEmptyView.java b/src/com/keepassdroid/view/GroupEmptyView.java similarity index 97% rename from src/com/keepassdroid/GroupEmptyView.java rename to src/com/keepassdroid/view/GroupEmptyView.java index 30e276cf5..0e9fe25cd 100644 --- a/src/com/keepassdroid/GroupEmptyView.java +++ b/src/com/keepassdroid/view/GroupEmptyView.java @@ -17,7 +17,7 @@ * along with KeePassDroid. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.view; import android.content.Context; import android.util.AttributeSet; diff --git a/src/com/keepassdroid/GroupHeaderView.java b/src/com/keepassdroid/view/GroupHeaderView.java similarity index 97% rename from src/com/keepassdroid/GroupHeaderView.java rename to src/com/keepassdroid/view/GroupHeaderView.java index 6fc232456..bf41c7b8c 100644 --- a/src/com/keepassdroid/GroupHeaderView.java +++ b/src/com/keepassdroid/view/GroupHeaderView.java @@ -17,7 +17,7 @@ * along with KeePassDroid. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.view; import android.content.Context; import android.util.AttributeSet; diff --git a/src/com/keepassdroid/GroupRootView.java b/src/com/keepassdroid/view/GroupRootView.java similarity index 97% rename from src/com/keepassdroid/GroupRootView.java rename to src/com/keepassdroid/view/GroupRootView.java index 052c0117b..517705f53 100644 --- a/src/com/keepassdroid/GroupRootView.java +++ b/src/com/keepassdroid/view/GroupRootView.java @@ -17,7 +17,7 @@ * along with KeePassDroid. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.view; import android.content.Context; import android.util.AttributeSet; diff --git a/src/com/keepassdroid/GroupViewOnlyView.java b/src/com/keepassdroid/view/GroupViewOnlyView.java similarity index 97% rename from src/com/keepassdroid/GroupViewOnlyView.java rename to src/com/keepassdroid/view/GroupViewOnlyView.java index 8d4bfa724..671002b6c 100644 --- a/src/com/keepassdroid/GroupViewOnlyView.java +++ b/src/com/keepassdroid/view/GroupViewOnlyView.java @@ -17,7 +17,7 @@ * along with KeePassDroid. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.view; import android.content.Context; import android.util.AttributeSet;