fold ".views.hiding" into ".panic", it is only use there

This commit is contained in:
Hans-Christoph Steiner 2019-06-17 11:03:21 +02:00
parent ef90fd2dfd
commit 842db03d8a
12 changed files with 11 additions and 15 deletions

View File

@ -17,7 +17,7 @@
* MA 02110-1301, USA. * MA 02110-1301, USA.
*/ */
package org.fdroid.fdroid.views.hiding; package org.fdroid.fdroid.panic;
import android.content.Context; import android.content.Context;

View File

@ -124,7 +124,7 @@
android:name=".panic.ExitActivity" android:name=".panic.ExitActivity"
android:theme="@android:style/Theme.NoDisplay"/> android:theme="@android:style/Theme.NoDisplay"/>
<activity <activity
android:name=".views.hiding.CalculatorActivity" android:name=".panic.CalculatorActivity"
android:enabled="false" android:enabled="false"
android:icon="@mipmap/ic_calculator_launcher" android:icon="@mipmap/ic_calculator_launcher"
android:label="@string/hiding_calculator" android:label="@string/hiding_calculator"

View File

@ -1,4 +1,4 @@
package org.fdroid.fdroid.views.hiding; package org.fdroid.fdroid.panic;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
@ -8,7 +8,6 @@ import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -28,7 +27,8 @@ public class CalculatorActivity extends AppCompatActivity {
// unary operators // unary operators
private static final String PERCENT = "%"; private static final String PERCENT = "%";
private @Nullable String lastOp; @Nullable
private String lastOp;
// views // views
private TextView textView; private TextView textView;

View File

@ -1,10 +1,9 @@
package org.fdroid.fdroid.panic; package org.fdroid.fdroid.panic;
import android.support.v7.app.AppCompatActivity;
import android.content.Intent; import android.content.Intent;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
public class ExitActivity extends AppCompatActivity { public class ExitActivity extends AppCompatActivity {

View File

@ -1,4 +1,4 @@
package org.fdroid.fdroid.views.hiding; package org.fdroid.fdroid.panic;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;

View File

@ -5,7 +5,6 @@ import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.view.MenuItem; import android.view.MenuItem;
import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.FDroidApp;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;

View File

@ -29,7 +29,6 @@ import info.guardianproject.panic.PanicResponder;
import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
import org.fdroid.fdroid.installer.PrivilegedInstaller; import org.fdroid.fdroid.installer.PrivilegedInstaller;
import org.fdroid.fdroid.views.hiding.HidingManager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Set; import java.util.Set;

View File

@ -23,7 +23,6 @@ import org.fdroid.fdroid.data.Schema;
import org.fdroid.fdroid.installer.Installer; import org.fdroid.fdroid.installer.Installer;
import org.fdroid.fdroid.installer.InstallerService; import org.fdroid.fdroid.installer.InstallerService;
import org.fdroid.fdroid.installer.PrivilegedInstaller; import org.fdroid.fdroid.installer.PrivilegedInstaller;
import org.fdroid.fdroid.views.hiding.HidingManager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

View File

@ -24,7 +24,7 @@ import org.fdroid.fdroid.data.Schema;
import org.fdroid.fdroid.views.apps.AppListActivity; import org.fdroid.fdroid.views.apps.AppListActivity;
import org.fdroid.fdroid.views.categories.CategoryAdapter; import org.fdroid.fdroid.views.categories.CategoryAdapter;
import org.fdroid.fdroid.views.categories.CategoryController; import org.fdroid.fdroid.views.categories.CategoryController;
import org.fdroid.fdroid.views.hiding.HidingManager; import org.fdroid.fdroid.panic.HidingManager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

View File

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".views.hiding.CalculatorActivity"> tools:context=".panic.CalculatorActivity">
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"

View File

@ -76,7 +76,7 @@ import org.fdroid.fdroid.net.Downloader;
import org.fdroid.fdroid.net.HttpDownloader; import org.fdroid.fdroid.net.HttpDownloader;
import org.fdroid.fdroid.net.ImageLoaderForUIL; import org.fdroid.fdroid.net.ImageLoaderForUIL;
import org.fdroid.fdroid.nearby.WifiStateChangeService; import org.fdroid.fdroid.nearby.WifiStateChangeService;
import org.fdroid.fdroid.views.hiding.HidingManager; import org.fdroid.fdroid.panic.HidingManager;
import javax.microedition.khronos.opengles.GL10; import javax.microedition.khronos.opengles.GL10;
import java.io.IOException; import java.io.IOException;

View File

@ -25,7 +25,7 @@ import org.fdroid.fdroid.data.AppProvider;
import org.fdroid.fdroid.data.RepoProvider; import org.fdroid.fdroid.data.RepoProvider;
import org.fdroid.fdroid.data.Schema.AppMetadataTable; import org.fdroid.fdroid.data.Schema.AppMetadataTable;
import org.fdroid.fdroid.views.apps.AppListActivity; import org.fdroid.fdroid.views.apps.AppListActivity;
import org.fdroid.fdroid.views.hiding.HidingManager; import org.fdroid.fdroid.panic.HidingManager;
import org.fdroid.fdroid.views.whatsnew.WhatsNewAdapter; import org.fdroid.fdroid.views.whatsnew.WhatsNewAdapter;
import java.util.Date; import java.util.Date;