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/SetupCustomizationSample | |
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/SetupCustomizationSample')
3 files changed, 61 insertions, 1 deletions
diff --git a/apps/tv/SetupCustomizationSample/app/src/main/AndroidManifest.xml b/apps/tv/SetupCustomizationSample/app/src/main/AndroidManifest.xml index 30f0c86..274f199 100644 --- a/apps/tv/SetupCustomizationSample/app/src/main/AndroidManifest.xml +++ b/apps/tv/SetupCustomizationSample/app/src/main/AndroidManifest.xml @@ -83,6 +83,20 @@ </intent-filter> </activity> + + <!-- Implements the delegate-network-to-partner action. --> + <activity + android:name=".NetworkDelegationActivity" + android:screenOrientation="landscape" + android:label="Network Delegation" + > + <intent-filter> + <action android:name="com.android.net.GET_CONNECTED" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + + </application> </manifest> diff --git a/apps/tv/SetupCustomizationSample/app/src/main/java/com/google/android/tv/setup/customizationsample/HookBegin2Activity.java b/apps/tv/SetupCustomizationSample/app/src/main/java/com/google/android/tv/setup/customizationsample/HookBegin2Activity.java index 532e50a..e4af2ab 100644 --- a/apps/tv/SetupCustomizationSample/app/src/main/java/com/google/android/tv/setup/customizationsample/HookBegin2Activity.java +++ b/apps/tv/SetupCustomizationSample/app/src/main/java/com/google/android/tv/setup/customizationsample/HookBegin2Activity.java @@ -8,7 +8,7 @@ import android.content.Intent; public class HookBegin2Activity extends HookActivity { private static final String EXTRA_PARTNER_HANDLED_NETWORK = "partner_handled_network"; - private static final String EXTRA_PARTNER_HANDLED_NETWORK_USER_SKIPPED = "partner_handled_network_user_skipped"; + private static final String EXTRA_PARTNER_HANDLED_NETWORK_USER_SKIPPED = "user_skipped_network_setup"; @Override protected void onAboutToFinish() { diff --git a/apps/tv/SetupCustomizationSample/app/src/main/java/com/google/android/tv/setup/customizationsample/NetworkDelegationActivity.java b/apps/tv/SetupCustomizationSample/app/src/main/java/com/google/android/tv/setup/customizationsample/NetworkDelegationActivity.java new file mode 100644 index 0000000..a90c58c --- /dev/null +++ b/apps/tv/SetupCustomizationSample/app/src/main/java/com/google/android/tv/setup/customizationsample/NetworkDelegationActivity.java @@ -0,0 +1,46 @@ +package com.google.android.tv.setup.customizationsample; + +import android.app.Activity; +import android.content.Intent; +import android.os.Bundle; +import android.view.KeyEvent; + +/** + * A network delegation Activity, which simulates presenting a get-me-connected user interface. + */ +public class NetworkDelegationActivity extends BaseActivity { + + public static final int RESULT_CODE_USER_SKIPPED = 3; + boolean mHeardKey; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + tv1.setText("Press CENTER to pretend we just set up the network; press RIGHT to skip; press BACK to back out"); + } + + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + if (!mHeardKey && keyCode == KeyEvent.KEYCODE_DPAD_CENTER) { + mHeardKey = true; + setResult(Activity.RESULT_OK); + finish(); + return true; + } + if (!mHeardKey && keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) { + mHeardKey = true; + setResult(RESULT_CODE_USER_SKIPPED); + finish(); + return true; + } + return super.onKeyUp(keyCode, event); + } + + @Override + public void onBackPressed() { + setResult(Activity.RESULT_CANCELED, new Intent().putExtra("user_initiated", true)); + finish(); + } +} + + |