Update Setup Wizard redaction interstitial styles
Adhere to the setup wizard design guidelines for the redaction
interstitial shown during setup wizard.
Bug: 21561511
Change-Id: Id6c4f0d4b0075b0cbbbb4f8ab77db6f00ea72b70
diff --git a/res/layout/setup_redaction_interstitial.xml b/res/layout/setup_redaction_interstitial.xml
new file mode 100644
index 0000000..2844828
--- /dev/null
+++ b/res/layout/setup_redaction_interstitial.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License
+-->
+
+<com.android.setupwizardlib.SetupWizardLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ settings:suwBackgroundTile="@drawable/setup_illustration_tile"
+ settings:suwHeaderText="@string/notification_section_header"
+ settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
+ settings:suwIllustrationImage="@drawable/setup_illustration_lock_screen">
+
+ <LinearLayout
+ style="@style/SuwContentFrame"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingStart="?attr/side_margin"
+ android:paddingEnd="?attr/side_margin">
+
+ <TextView
+ style="@style/SuwDescription"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+ android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:text="@string/lock_screen_notifications_interstitial_message" />
+
+ <RadioGroup
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/redaction_vertical_margins"
+ android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+ android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:checkedButton="@+id/redact_sensitive">
+
+ <RadioButton
+ android:id="@+id/show_all"
+ style="@style/SuwRadioButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/lock_screen_notifications_summary_show" />
+
+ <RadioButton
+ android:id="@+id/redact_sensitive"
+ style="@style/SuwRadioButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/lock_screen_notifications_summary_hide" />
+
+ <RadioButton
+ android:id="@+id/hide_all"
+ style="@style/SuwRadioButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/lock_screen_notifications_summary_disable" />
+
+ </RadioGroup>
+
+ </LinearLayout>
+
+</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java
index d3d841e..590788b 100644
--- a/src/com/android/settings/SetupRedactionInterstitial.java
+++ b/src/com/android/settings/SetupRedactionInterstitial.java
@@ -16,10 +16,6 @@
package com.android.settings;
-import com.android.settings.notification.RedactionInterstitial;
-import com.android.setupwizardlib.SetupWizardLayout;
-import com.android.setupwizardlib.view.NavigationBar;
-
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
@@ -28,7 +24,10 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.Button;
+
+import com.android.settings.notification.RedactionInterstitial;
+import com.android.setupwizardlib.SetupWizardLayout;
+import com.android.setupwizardlib.view.NavigationBar;
/**
* Setup Wizard's version of RedactionInterstitial screen. It inherits the logic and basic structure
@@ -72,21 +71,19 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- final SetupWizardLayout layout = new SetupWizardLayout(inflater.getContext());
- layout.setIllustration(R.drawable.setup_illustration_lock_screen,
- R.drawable.setup_illustration_horizontal_tile);
- layout.setBackgroundTile(R.drawable.setup_illustration_tile);
- layout.setHeaderText(R.string.notification_section_header);
+ return inflater.inflate(R.layout.setup_redaction_interstitial, container, false);
+ }
- View content = super.onCreateView(inflater, layout, savedInstanceState);
- layout.addView(content);
+ @Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ final SetupWizardLayout layout =
+ (SetupWizardLayout) view.findViewById(R.id.setup_wizard_layout);
final NavigationBar navigationBar = layout.getNavigationBar();
navigationBar.setNavigationBarListener(this);
- final Button backButton = navigationBar.getBackButton();
- backButton.setVisibility(View.GONE);
+ navigationBar.getBackButton().setVisibility(View.GONE);
SetupWizardUtils.setImmersiveMode(getActivity());
- return layout;
}
@Override
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index a6df6ec..16ee3b5 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -67,7 +67,12 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.redaction_interstitial, container, false);
+ return inflater.inflate(R.layout.redaction_interstitial, container, false);
+ }
+
+ @Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
mShowAllButton = (RadioButton) view.findViewById(R.id.show_all);
mRedactSensitiveButton = (RadioButton) view.findViewById(R.id.redact_sensitive);
mHideAllButton = (RadioButton) view.findViewById(R.id.hide_all);
@@ -75,7 +80,6 @@
mShowAllButton.setOnClickListener(this);
mRedactSensitiveButton.setOnClickListener(this);
mHideAllButton.setOnClickListener(this);
- return view;
}
@Override