kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Preference activity up & back behaviour. Especially when opened with 'Settings' dialog button

Browse source
This commit is contained in:
Matthew Wong 2015-08-13 21:16:10 -04:00
parent ec07e1eea6
commit ac533d83aa
3 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View file

@ -54,14 +54,14 @@
android:resource="@xml/autofill_config" /> android:resource="@xml/autofill_config" />
</service> </service>
<activity android:name=".autofill.AutofillActivity"> <activity android:name=".autofill.AutofillActivity"
android:parentActivityName=".PasswordStore"> android:parentActivityName=".PasswordStore">
<meta-data android:name="android.support.PARENT_ACTIVITY" <meta-data android:name="android.support.PARENT_ACTIVITY"
android:value="com.zeapo.pwdstore.PasswordStore" /> android:value="com.zeapo.pwdstore.PasswordStore" />
</activity> </activity>
<activity android:name=".autofill.AutofillPreferenceActivity"> <activity android:name=".autofill.AutofillPreferenceActivity"
android:parentActivityName=".PasswordStore"> android:parentActivityName=".PasswordStore">
<meta-data android:name="android.support.PARENT_ACTIVITY" <meta-data android:name="android.support.PARENT_ACTIVITY"

26
app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
View file

@ -5,6 +5,8 @@ import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.NavUtils;
import android.support.v4.app.TaskStackBuilder;
import android.support.v4.view.MenuItemCompat; import android.support.v4.view.MenuItemCompat;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
@ -26,11 +28,12 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
AutofillRecyclerAdapter recyclerAdapter; // let fragment have access AutofillRecyclerAdapter recyclerAdapter; // let fragment have access
private RecyclerView.LayoutManager layoutManager; private RecyclerView.LayoutManager layoutManager;
private boolean recreate;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
// otherwise if called from settings
setContentView(R.layout.autofill_recycler_view); setContentView(R.layout.autofill_recycler_view);
recyclerView = (RecyclerView) findViewById(R.id.autofill_recycler); recyclerView = (RecyclerView) findViewById(R.id.autofill_recycler);
@ -53,8 +56,10 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
setTitle("Autofill Apps"); setTitle("Autofill Apps");
recreate = false;
Bundle extras = getIntent().getExtras(); Bundle extras = getIntent().getExtras();
if (extras != null) { if (extras != null) {
recreate = true;
recyclerView.scrollToPosition(recyclerAdapter.getPosition(extras.getString("packageName"))); recyclerView.scrollToPosition(recyclerAdapter.getPosition(extras.getString("packageName")));
showDialog(extras.getString("packageName"), extras.getString("appName")); showDialog(extras.getString("packageName"), extras.getString("appName"));
} }
@ -94,6 +99,24 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
}); });
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
// in service, we CLEAR_TASK. then we set the recreate flag.
// something of a hack, but w/o CLEAR_TASK, behaviour was unpredictable
case android.R.id.home:
Intent upIntent = NavUtils.getParentActivityIntent(this);
if (recreate) {
TaskStackBuilder.create(this)
.addNextIntentWithParentStack(upIntent)
.startActivities();
} else {
NavUtils.navigateUpTo(this, upIntent);
}
return true;
}
return super.onOptionsItemSelected(item);
}
public void showDialog(String packageName, String appName) { public void showDialog(String packageName, String appName) {
DialogFragment df = new AutofillFragment(); DialogFragment df = new AutofillFragment();
@ -103,6 +126,5 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
args.putInt("position", recyclerAdapter.getPosition(packageName)); args.putInt("position", recyclerAdapter.getPosition(packageName));
df.setArguments(args); df.setArguments(args);
df.show(getFragmentManager(), "autofill_dialog"); df.show(getFragmentManager(), "autofill_dialog");
// TODO if called from dialog 'Settings' button, should activity finish at OK?
} }
} }

2
app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
View file

@ -158,7 +158,7 @@ public class AutofillService extends AccessibilityService {
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
// the user will have to return to the app themselves. // the user will have to return to the app themselves.
Intent intent = new Intent(AutofillService.this, AutofillPreferenceActivity.class); Intent intent = new Intent(AutofillService.this, AutofillPreferenceActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
intent.putExtra("packageName", info.getPackageName()); intent.putExtra("packageName", info.getPackageName());
intent.putExtra("appName", appName); intent.putExtra("appName", appName);
startActivity(intent); startActivity(intent);