diff options
author | Joseph Johnson <simplex@google.com> | 2018-08-10 14:48:32 -0700 |
---|---|---|
committer | Joseph Johnson <simplex@google.com> | 2018-08-13 02:19:51 +0000 |
commit | a4c72629e00ca1c5671868407e3fd2c46a3bd709 (patch) | |
tree | 27d5ce9df313b16c8b61c3ab42675de012083726 /apps/tv/SetupValidation/app/src | |
parent | ff03d9d532fc08456941f44cc9fbf08e55cd8095 (diff) | |
download | sample-a4c72629e00ca1c5671868407e3fd2c46a3bd709.tar.gz |
Add NetworkDelegationActivity into customizationsample app
Also set user_initiated boolean if user backs out of any Activities.
Test: manual
Change-Id: I45d09f84e8d73c5cf3c3d44547e70a215d68ead1
Diffstat (limited to 'apps/tv/SetupValidation/app/src')
-rw-r--r-- | apps/tv/SetupValidation/app/src/main/java/com/google/android/tv/setup/BaseActivity.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/tv/SetupValidation/app/src/main/java/com/google/android/tv/setup/BaseActivity.java b/apps/tv/SetupValidation/app/src/main/java/com/google/android/tv/setup/BaseActivity.java index d369192..f1e95df 100644 --- a/apps/tv/SetupValidation/app/src/main/java/com/google/android/tv/setup/BaseActivity.java +++ b/apps/tv/SetupValidation/app/src/main/java/com/google/android/tv/setup/BaseActivity.java @@ -1,6 +1,7 @@ package com.google.android.tv.setup; import android.app.Activity; +import android.content.Intent; import android.os.Bundle; import android.util.Log; import android.widget.Button; @@ -47,4 +48,10 @@ public abstract class BaseActivity extends Activity { protected void log(String message) { Log.d(getPackageName(), message); } + + @Override + public void onBackPressed() { + setResult(RESULT_CANCELED, new Intent().putExtra("user_initiated", true)); + super.onBackPressed(); + } } |