fold ".views.hiding" into ".panic", it is only use there
This commit is contained in:
		
							parent
							
								
									ef90fd2dfd
								
							
						
					
					
						commit
						842db03d8a
					
				@ -17,7 +17,7 @@
 | 
			
		||||
 * MA 02110-1301, USA.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
package org.fdroid.fdroid.views.hiding;
 | 
			
		||||
package org.fdroid.fdroid.panic;
 | 
			
		||||
 | 
			
		||||
import android.content.Context;
 | 
			
		||||
 | 
			
		||||
@ -124,7 +124,7 @@
 | 
			
		||||
                android:name=".panic.ExitActivity"
 | 
			
		||||
                android:theme="@android:style/Theme.NoDisplay"/>
 | 
			
		||||
        <activity
 | 
			
		||||
                android:name=".views.hiding.CalculatorActivity"
 | 
			
		||||
                android:name=".panic.CalculatorActivity"
 | 
			
		||||
                android:enabled="false"
 | 
			
		||||
                android:icon="@mipmap/ic_calculator_launcher"
 | 
			
		||||
                android:label="@string/hiding_calculator"
 | 
			
		||||
 | 
			
		||||
@ -1,4 +1,4 @@
 | 
			
		||||
package org.fdroid.fdroid.views.hiding;
 | 
			
		||||
package org.fdroid.fdroid.panic;
 | 
			
		||||
 | 
			
		||||
import android.os.Bundle;
 | 
			
		||||
import android.support.annotation.Nullable;
 | 
			
		||||
@ -8,7 +8,6 @@ import android.view.View;
 | 
			
		||||
import android.widget.Button;
 | 
			
		||||
import android.widget.TextView;
 | 
			
		||||
import android.widget.Toast;
 | 
			
		||||
 | 
			
		||||
import org.fdroid.fdroid.R;
 | 
			
		||||
 | 
			
		||||
import java.util.regex.Pattern;
 | 
			
		||||
@ -28,7 +27,8 @@ public class CalculatorActivity extends AppCompatActivity {
 | 
			
		||||
    // unary operators
 | 
			
		||||
    private static final String PERCENT = "%";
 | 
			
		||||
 | 
			
		||||
    private @Nullable String lastOp;
 | 
			
		||||
    @Nullable
 | 
			
		||||
    private String lastOp;
 | 
			
		||||
 | 
			
		||||
    // views
 | 
			
		||||
    private TextView textView;
 | 
			
		||||
@ -1,10 +1,9 @@
 | 
			
		||||
package org.fdroid.fdroid.panic;
 | 
			
		||||
 | 
			
		||||
import android.support.v7.app.AppCompatActivity;
 | 
			
		||||
 | 
			
		||||
import android.content.Intent;
 | 
			
		||||
import android.os.Build;
 | 
			
		||||
import android.os.Bundle;
 | 
			
		||||
import android.support.v7.app.AppCompatActivity;
 | 
			
		||||
 | 
			
		||||
public class ExitActivity extends AppCompatActivity {
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1,4 +1,4 @@
 | 
			
		||||
package org.fdroid.fdroid.views.hiding;
 | 
			
		||||
package org.fdroid.fdroid.panic;
 | 
			
		||||
 | 
			
		||||
import android.content.ComponentName;
 | 
			
		||||
import android.content.Context;
 | 
			
		||||
@ -5,7 +5,6 @@ import android.support.v7.app.ActionBar;
 | 
			
		||||
import android.support.v7.app.AppCompatActivity;
 | 
			
		||||
import android.support.v7.widget.Toolbar;
 | 
			
		||||
import android.view.MenuItem;
 | 
			
		||||
 | 
			
		||||
import org.fdroid.fdroid.FDroidApp;
 | 
			
		||||
import org.fdroid.fdroid.R;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -29,7 +29,6 @@ import info.guardianproject.panic.PanicResponder;
 | 
			
		||||
import org.fdroid.fdroid.Preferences;
 | 
			
		||||
import org.fdroid.fdroid.R;
 | 
			
		||||
import org.fdroid.fdroid.installer.PrivilegedInstaller;
 | 
			
		||||
import org.fdroid.fdroid.views.hiding.HidingManager;
 | 
			
		||||
 | 
			
		||||
import java.util.ArrayList;
 | 
			
		||||
import java.util.Set;
 | 
			
		||||
 | 
			
		||||
@ -23,7 +23,6 @@ import org.fdroid.fdroid.data.Schema;
 | 
			
		||||
import org.fdroid.fdroid.installer.Installer;
 | 
			
		||||
import org.fdroid.fdroid.installer.InstallerService;
 | 
			
		||||
import org.fdroid.fdroid.installer.PrivilegedInstaller;
 | 
			
		||||
import org.fdroid.fdroid.views.hiding.HidingManager;
 | 
			
		||||
 | 
			
		||||
import java.util.ArrayList;
 | 
			
		||||
import java.util.Collections;
 | 
			
		||||
 | 
			
		||||
@ -24,7 +24,7 @@ import org.fdroid.fdroid.data.Schema;
 | 
			
		||||
import org.fdroid.fdroid.views.apps.AppListActivity;
 | 
			
		||||
import org.fdroid.fdroid.views.categories.CategoryAdapter;
 | 
			
		||||
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.Collections;
 | 
			
		||||
 | 
			
		||||
@ -4,7 +4,7 @@
 | 
			
		||||
    xmlns:tools="http://schemas.android.com/tools"
 | 
			
		||||
    android:layout_width="match_parent"
 | 
			
		||||
    android:layout_height="match_parent"
 | 
			
		||||
    tools:context=".views.hiding.CalculatorActivity">
 | 
			
		||||
    tools:context=".panic.CalculatorActivity">
 | 
			
		||||
 | 
			
		||||
    <android.support.v7.widget.Toolbar
 | 
			
		||||
        android:id="@+id/toolbar"
 | 
			
		||||
 | 
			
		||||
@ -76,7 +76,7 @@ import org.fdroid.fdroid.net.Downloader;
 | 
			
		||||
import org.fdroid.fdroid.net.HttpDownloader;
 | 
			
		||||
import org.fdroid.fdroid.net.ImageLoaderForUIL;
 | 
			
		||||
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 java.io.IOException;
 | 
			
		||||
 | 
			
		||||
@ -25,7 +25,7 @@ import org.fdroid.fdroid.data.AppProvider;
 | 
			
		||||
import org.fdroid.fdroid.data.RepoProvider;
 | 
			
		||||
import org.fdroid.fdroid.data.Schema.AppMetadataTable;
 | 
			
		||||
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 java.util.Date;
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user