From 8498436a9613c806d4e1085074aea22f1a78675a Mon Sep 17 00:00:00 2001 From: "manabu, shimoda" Date: Wed, 8 Nov 2017 11:32:31 +0900 Subject: [PATCH] Base implementation of WFC disclaimer UI Test: manual - Check that no error occurred when changing the wifi calling settings to turn on. Test: auto - Passed WifiCallingSettingsForSubTest, WifiCallingDisclaimerFragmentTest and DisclaimerItemListAdapterTest. Bug: 67872298 Change-Id: I789f530d3e16baa6e56feaa4269f6696976f747e Merged-In: I789f530d3e16baa6e56feaa4269f6696976f747e --- AndroidManifest.xml | 11 ++ res/layout/wfc_disclaimer_fragment.xml | 67 +++++++ res/layout/wfc_simple_disclaimer_item.xml | 36 ++++ res/values/strings.xml | 9 + res/values/styles.xml | 12 ++ src/com/android/settings/Settings.java | 1 + .../settings/wifi/calling/DisclaimerItem.java | 137 +++++++++++++ .../wifi/calling/DisclaimerItemFactory.java | 57 ++++++ .../calling/DisclaimerItemListAdapter.java | 78 ++++++++ .../WifiCallingDisclaimerFragment.java | 148 ++++++++++++++ .../calling/WifiCallingSettingsForSub.java | 61 ++++-- .../shadow/ShadowDisclaimerItemFactory.java | 41 ++++ .../DisclaimerItemListAdapterTest.java | 126 ++++++++++++ .../WifiCallingDisclaimerFragmentTest.java | 180 ++++++++++++++++++ .../WifiCallingSettingsForSubTest.java | 75 +++++++- 15 files changed, 1023 insertions(+), 16 deletions(-) create mode 100644 res/layout/wfc_disclaimer_fragment.xml create mode 100644 res/layout/wfc_simple_disclaimer_item.xml create mode 100644 src/com/android/settings/wifi/calling/DisclaimerItem.java create mode 100644 src/com/android/settings/wifi/calling/DisclaimerItemFactory.java create mode 100644 src/com/android/settings/wifi/calling/DisclaimerItemListAdapter.java create mode 100644 src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragment.java create mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowDisclaimerItemFactory.java create mode 100644 tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java create mode 100644 tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ef8b3c042a4..5c0256b614c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -3341,6 +3341,17 @@ + + + + + + + diff --git a/res/layout/wfc_disclaimer_fragment.xml b/res/layout/wfc_disclaimer_fragment.xml new file mode 100644 index 00000000000..00baae5f671 --- /dev/null +++ b/res/layout/wfc_disclaimer_fragment.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + +