diff options
author | Ihab Awad <ihab@google.com> | 2013-11-21 12:06:41 -0800 |
---|---|---|
committer | Ihab Awad <ihab@google.com> | 2013-11-22 12:28:34 -0800 |
commit | df76f716297818cd87b927844b642e1a787e2e90 (patch) | |
tree | f2d8db408cfb1ea5e141ce788484be47168896d8 /res | |
parent | 4b4bd33d67023d5b4b0a25d638826eced3242051 (diff) |
Initial implementation of UI mocks for Wi-Fi calling option.
Change-Id: Id064a98c675527569e67f700b361b653c906d6eb
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/ic_phone_plus_wifi.png | bin | 0 -> 31655 bytes | |||
-rw-r--r-- | res/drawable/ic_wifi_call.png | bin | 0 -> 3468 bytes | |||
-rw-r--r-- | res/layout/wifi_call_enable_completion.xml | 55 | ||||
-rw-r--r-- | res/layout/wifi_call_enable_settings.xml | 135 | ||||
-rw-r--r-- | res/layout/wifi_call_enable_teaser.xml | 41 | ||||
-rw-r--r-- | res/values/colors.xml | 13 | ||||
-rw-r--r-- | res/values/strings.xml | 23 |
7 files changed, 267 insertions, 0 deletions
diff --git a/res/drawable/ic_phone_plus_wifi.png b/res/drawable/ic_phone_plus_wifi.png Binary files differnew file mode 100644 index 000000000..5cd75ab31 --- /dev/null +++ b/res/drawable/ic_phone_plus_wifi.png diff --git a/res/drawable/ic_wifi_call.png b/res/drawable/ic_wifi_call.png Binary files differnew file mode 100644 index 000000000..886cbd7bb --- /dev/null +++ b/res/drawable/ic_wifi_call.png diff --git a/res/layout/wifi_call_enable_completion.xml b/res/layout/wifi_call_enable_completion.xml new file mode 100644 index 000000000..dd63c3b98 --- /dev/null +++ b/res/layout/wifi_call_enable_completion.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout + android:orientation="vertical" + android:id="@+id/call_log_list_item" + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <ImageView + android:layout_width="192dp" + android:layout_height="128dp" + android:paddingTop="32dp" + android:paddingBottom="32dp" + android:layout_gravity="center_horizontal" + android:src="@drawable/ic_phone_plus_wifi"/> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="64dp" + android:paddingRight="64dp" + android:textSize="12dp" + android:textColor="@color/dialtacts_secondary_text_color" + android:text="@string/wifi_setup_completed"/> + + <LinearLayout + android:orientation="horizontal" + android:paddingTop="32dp" + android:paddingBottom="32dp" + android:layout_gravity="center_horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="16dp" + android:textSize="12dp" + android:textAllCaps="true" + android:textColor="@color/dialtacts_primary_text_color" + android:text="@string/wifi_setup_ok"/> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="16dp" + android:textSize="12dp" + android:textAllCaps="true" + android:textColor="@color/dialtacts_primary_text_color" + android:text="@string/wifi_setup_settings_shortcut"/> + + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/wifi_call_enable_settings.xml b/res/layout/wifi_call_enable_settings.xml new file mode 100644 index 000000000..565cb0115 --- /dev/null +++ b/res/layout/wifi_call_enable_settings.xml @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout + android:orientation="vertical" + android:id="@+id/call_log_list_item" + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="10dp" + android:textSize="16dp" + android:textColor="@color/foreground_wifi_highlight" + android:background="@color/background_wifi_highlight" + android:text="@string/wifi_when_connected_to_a_signal"/> + + <View + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="@color/wifi_dark_wifi_highlight"/> + + <LinearLayout + android:padding="10dp" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <!-- TODO(ihab): Do this layout without using layout_weight --> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:textSize="16dp" + android:textColor="@color/dialtacts_primary_text_color" + android:text="@string/wifi_always_use_wifi"/> + + <RadioButton + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/wifi_always_use_wifi"/> + + </LinearLayout> + + <View + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:background="@color/wifi_list_separator"/> + + <LinearLayout + android:padding="10dp" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <!-- TODO(ihab): Do this layout without using layout_weight --> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:textSize="16dp" + android:textColor="@color/dialtacts_primary_text_color" + android:text="@string/wifi_ask_use_wifi"/> + + <RadioButton + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/wifi_ask_use_wifi"/> + + </LinearLayout> + + <View + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:background="@color/wifi_list_separator"/> + + <LinearLayout + android:padding="10dp" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <!-- TODO(ihab): Do this layout without using layout_weight --> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:textSize="16dp" + android:textColor="@color/dialtacts_primary_text_color" + android:text="@string/wifi_never_use_wifi"/> + + <RadioButton + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:checked="true" + android:id="@+id/wifi_never_use_wifi"/> + + </LinearLayout> + + <View + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="@color/wifi_list_separator"/> + + <LinearLayout + android:padding="10dp" + android:orientation="horizontal" + android:gravity="end" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="16dp" + android:textColor="@color/dialtacts_primary_text_color" + android:text="@string/wifi_next_setup_screen"/> + + <ImageView + android:layout_width="32dp" + android:layout_height="32dp" + android:paddingStart="8dp" + android:src="@drawable/ic_wifi_call"/> + + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/wifi_call_enable_teaser.xml b/res/layout/wifi_call_enable_teaser.xml new file mode 100644 index 000000000..fd70619aa --- /dev/null +++ b/res/layout/wifi_call_enable_teaser.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout + android:orientation="horizontal" + android:id="@+id/call_log_list_item" + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <ImageView + android:layout_width="64dp" + android:layout_height="64dp" + android:padding="16dp" + android:src="@drawable/ic_wifi_call" + android:background="@color/background_wifi_highlight"/> + + <LinearLayout + android:orientation="vertical" + android:layout_width="0dp" + android:layout_weight="1" + android:gravity="center_vertical" + android:padding="8dp" + android:layout_height="match_parent"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="16dp" + android:textColor="@color/dialtacts_primary_text_color" + android:text="@string/wifi_no_signal_no_problem"/> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="12dp" + android:textColor="@color/dialtacts_secondary_text_color" + android:text="@string/wifi_enable_google_wifi_calling"/> + + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index a8ddf2be7..04e10b138 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -70,4 +70,17 @@ <!-- Text color for no favorites message --> <color name="nofavorite_text_color">#777777</color> + + <!-- Background color of wifi highlight items --> + <color name="background_wifi_highlight">#00ff00</color> + + <!-- Foreground color of wifi highlight items --> + <color name="foreground_wifi_highlight">#ffffff</color> + + <!-- Dark (e.g. border) regions of wifi highlight items --> + <color name="wifi_dark_wifi_highlight">#009900</color> + + <!-- Generic separator color for wifi list items --> + <color name="wifi_list_separator">#909090</color> + </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 55cdea4de..33d552725 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -635,4 +635,27 @@ <!-- Content description for dismiss button on badge. [CHAR LIMIT=NONE] --> <string name="description_dismiss">Dismiss</string> + + <string name="wifi_no_signal_no_problem">No Signal? No Problem.</string> + + <string name="wifi_enable_google_wifi_calling">Enable Google Wi-Fi Calling</string> + + <string name="wifi_when_connected_to_a_signal">When connected to a strong Wi-Fi signal:</string> + + <string name="wifi_always_use_wifi">Always use Wi-Fi to make calls</string> + + <string name="wifi_ask_use_wifi">Always ask</string> + + <string name="wifi_never_use_wifi">Never use Wi-Fi to make calls</string> + + <string name="wifi_next_setup_screen">Next</string> + + <string name="wifi_previous_setup_screen">Back</string> + + <string name="wifi_setup_completed">Boom. Wi-Fi calling is all set up. You can change your preferences or turn it off anytime in settings.</string> + + <string name="wifi_setup_ok">Ok, got it</string> + + <string name="wifi_setup_settings_shortcut">Call settings</string> + </resources> |