From 4deaebc5a988eb83440693721f1ab28b180d8779 Mon Sep 17 00:00:00 2001
From: uabdullah <uabdullah@google.com>
Date: Mon, 22 Jan 2018 18:19:07 -0800
Subject: Move legacy voicemail/error to nui voicemail/listui/error

All packages relating to NUI voicemail should be under third_party/java_src/android_app/dialer/java/com/android/dialer/voicemail/listui. Since there is a chance that during NUI development the legacy third_party/java_src/android_app/dialer/java/com/android/dialer/app/voicemail/error might undergo changes, it makes sense to move this package to the nui, so that no changes in the legacy code are missed for nui. This refactoring would also allow us to ensure that the strings do not need to be translated and that most of the code can be re-used for nui by hooking up the fragment and adapter to voicemail/listui/error.

Bug: 71700117
Test: Unit tests
PiperOrigin-RevId: 182868896
Change-Id: I23329654df5ce2bf612101708ed001ca308ae1ac
---
 .../layout/voicemail_error_message_fragment.xml    | 112 ---------------------
 .../error/res/layout/voicemail_tos_fragment.xml    |  97 ------------------
 2 files changed, 209 deletions(-)
 delete mode 100644 java/com/android/dialer/app/voicemail/error/res/layout/voicemail_error_message_fragment.xml
 delete mode 100644 java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml

(limited to 'java/com/android/dialer/app/voicemail/error/res/layout')

diff --git a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_error_message_fragment.xml b/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_error_message_fragment.xml
deleted file mode 100644
index 4bea8b152..000000000
--- a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_error_message_fragment.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<android.support.v7.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/error_card"
-    style="@style/CallLogCardStyle"
-    android:gravity="center_vertical"
-    android:orientation="vertical">
-
-  <LinearLayout
-      android:id="@+id/error_card_content"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/alert_main_padding"
-        android:paddingBottom="@dimen/alert_main_padding"
-        android:paddingStart="@dimen/alert_main_padding"
-        android:paddingEnd="@dimen/alert_main_padding"
-        android:gravity="top"
-        android:orientation="horizontal">
-
-      <ImageView
-          android:id="@+id/voicemail_promo_card_icon"
-          android:layout_width="@dimen/voicemail_promo_card_icon_size"
-          android:layout_height="@dimen/voicemail_promo_card_icon_size"
-          android:layout_gravity="top"
-          android:src="@drawable/ic_voicemail_error_24px"/>
-
-      <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginStart="@dimen/voicemail_promo_card_main_padding"
-          android:gravity="center_vertical"
-          android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/error_card_header"
-            android:textStyle="bold"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/voicemail_promo_card_title_padding"
-            android:layout_gravity="center_vertical"
-            android:singleLine="false"
-            android:textSize="@dimen/voicemail_promo_card_title_text_size"/>
-
-        <TextView
-            android:id="@+id/error_card_details"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:lineSpacingExtra="@dimen/voicemail_promo_card_line_spacing"
-            android:singleLine="false"
-            android:textSize="@dimen/voicemail_promo_card_message_size"/>
-      </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/voicemail_promo_card_action_vertical_padding"
-        android:paddingBottom="@dimen/voicemail_promo_card_action_vertical_padding"
-        android:paddingEnd="@dimen/voicemail_promo_card_action_end_padding"
-        android:gravity="end"
-        android:orientation="horizontal">
-
-      <TextView
-          android:id="@+id/secondary_action_raised"
-          style="@style/RaisedErrorActionStyle"
-          android:paddingEnd="@dimen/alert_action_between_padding"
-          android:layout_marginEnd="8dp"
-          android:nextFocusForward="@+id/secondary_action"
-          android:clickable="true"/>
-
-      <TextView
-          android:id="@+id/secondary_action"
-          style="@style/ErrorActionStyle"
-          android:paddingEnd="@dimen/voicemail_promo_card_action_between_padding"
-          android:background="?android:attr/selectableItemBackground"
-          android:nextFocusForward="@+id/primary_action"/>
-
-      <TextView
-          android:id="@+id/primary_action"
-          style="@style/ErrorActionStyle"
-          android:background="?android:attr/selectableItemBackground"
-          android:nextFocusForward="@+id/primary_action_raised"/>
-
-      <TextView
-          android:id="@+id/primary_action_raised"
-          style="@style/RaisedErrorActionStyle"
-          android:nextFocusForward="@+id/promo_card"
-          android:clickable="true"
-          />
-
-    </LinearLayout>
-  </LinearLayout>
-</android.support.v7.widget.CardView>
diff --git a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml b/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml
deleted file mode 100644
index 4e143a59a..000000000
--- a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:orientation="vertical">
-
-  <ScrollView
-    android:id="@+id/voicemail_tos_message"
-    android:layout_width="match_parent"
-    android:layout_height="0dp"
-    android:layout_weight="1"
-    android:orientation="vertical">
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:paddingLeft="16dp"
-      android:paddingRight="16dp"
-      android:paddingTop="32dp"
-      android:orientation="vertical">
-      <ImageView
-        android:id="@+id/voicemail_image"
-        android:layout_width="@dimen/voicemail_tos_image_size"
-        android:layout_height="@dimen/voicemail_tos_image_size"
-        android:layout_gravity="center"
-        android:paddingBottom="32dp"
-        android:importantForAccessibility="no"/>
-      <TextView
-        android:id="@+id/tos_message_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal|top"
-        android:minHeight="20sp"
-        android:text="@string/verizon_terms_and_conditions_title"
-        style="@style/TosTitleStyle"/>
-      <TextView
-        android:id="@+id/tos_message_details"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp"
-        android:text="@string/verizon_terms_and_conditions_1.1_english"
-        style="@style/TosTextStyle"/>
-    </LinearLayout>
-  </ScrollView>
-
-  <View
-    android:layout_width="match_parent"
-    android:layout_height="0.5dp"
-    android:elevation="1dp"
-    android:background="@drawable/shadow"/>
-
-  <LinearLayout
-    android:id="@+id/voicemail_tos_button"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:minHeight="56dp"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
-    android:paddingTop="10dp"
-    android:paddingBottom="10dp"
-    android:background="#ffffffff"
-    android:orientation="horizontal">
-    <TextView
-      android:id="@+id/voicemail_tos_button_decline"
-      style="@style/ErrorActionDeclineStyle"
-      android:background="?android:attr/selectableItemBackground"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="@string/verizon_terms_and_conditions_decline_english"/>
-    <android.support.v4.widget.Space
-      android:layout_width="8dp"
-      android:layout_height="match_parent"
-      android:layout_weight="1"/>
-    <TextView
-      android:id="@+id/voicemail_tos_button_accept"
-      style="@style/ErrorActionStyle"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="@string/verizon_terms_and_conditions_accept_english"/>
-  </LinearLayout>
-
-</LinearLayout>
-- 
cgit v1.2.3