Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ConfigAddActivity: Rename to AddActivity

Browse Source 
Not everything needs to start with Config

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Samuel Holland 2017-08-22 01:27:29 -05:00
parent 90cd59c866
commit 5d04714eea
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -20,7 +20,7 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".ConfigAddActivity" android:name=".AddActivity"
android:label="@string/edit_activity_title" /> android:label="@string/edit_activity_title" />
<activity <activity
android:name=".SettingsActivity" android:name=".SettingsActivity"

4
app/src/main/java/com/wireguard/android/ConfigAddActivity.java → app/src/main/java/com/wireguard/android/AddActivity.java
View File

@ -10,11 +10,11 @@ import com.wireguard.config.Config;
* Standalone activity for creating configurations. * Standalone activity for creating configurations.
*/ */
public class ConfigAddActivity extends BaseConfigActivity { public class AddActivity extends BaseConfigActivity {
@Override @Override
public void onCreate(final Bundle savedInstanceState) { public void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.config_add_activity); setContentView(R.layout.add_activity);
} }
@Override @Override

2
app/src/main/java/com/wireguard/android/ConfigActivity.java
View File

@ -169,7 +169,7 @@ public class ConfigActivity extends BaseConfigActivity {
onBackPressed(); onBackPressed();
return true; return true;
case R.id.menu_action_add: case R.id.menu_action_add:
startActivity(new Intent(this, ConfigAddActivity.class)); startActivity(new Intent(this, AddActivity.class));
return true; return true;
case R.id.menu_action_edit: case R.id.menu_action_edit:
// Try to make the editing fragment visible. // Try to make the editing fragment visible.

4
app/src/main/res/layout/config_add_activity.xml → app/src/main/res/layout/add_activity.xml
View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/master_fragment" android:id="@+id/master_fragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent"
tools:ignore="MergeRootFrame" />