diff options
author | Andrew Lee <anwlee@google.com> | 2015-10-04 01:31:28 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2015-10-07 15:39:57 -0700 |
commit | 3663afe2e1afb109e117e5b707e8ed9547ed2103 (patch) | |
tree | 0442bd232e46d006912366ff169142aa961d0c16 /res | |
parent | 41bf2e4c8c9793d2f218ce1d1835bfa957ba53e4 (diff) |
Combine blocked number fragments into Activity.
Mocks indicate that after adding, the user should be returned to
the management UI and the snackbar should be shown there. This is
kind of pain to do across fragments in different activities. To
help address this, make one Activity the parent of both the blocked
number manage and add/search UI. This also makes sense in terms of
logical organization.
Bug: 24134038
Change-Id: I682342a73c964a5d4eb90469f10d6584b85400f1
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/blocked_number_fragment.xml | 9 | ||||
-rw-r--r-- | res/layout/blocked_numbers_activity.xml (renamed from res/layout/search_activity.xml) | 4 | ||||
-rw-r--r-- | res/values/dimens.xml | 2 | ||||
-rw-r--r-- | res/values/strings.xml | 4 | ||||
-rw-r--r-- | res/values/styles.xml | 15 |
5 files changed, 25 insertions, 9 deletions
diff --git a/res/layout/blocked_number_fragment.xml b/res/layout/blocked_number_fragment.xml index bbface6de..e86ccb596 100644 --- a/res/layout/blocked_number_fragment.xml +++ b/res/layout/blocked_number_fragment.xml @@ -16,10 +16,11 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:card_view="http://schemas.android.com/apk/res-auto" android:id="@+id/blocked_number_fragment" - android:orientation="vertical" - android:background="@color/blocked_number_background" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingTop="?android:attr/actionBarSize" + android:background="@color/blocked_number_background"> <android.support.v7.widget.CardView android:layout_width="match_parent" @@ -54,4 +55,4 @@ </android.support.v7.widget.CardView> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/search_activity.xml b/res/layout/blocked_numbers_activity.xml index 8feeac20d..b5810b7fa 100644 --- a/res/layout/search_activity.xml +++ b/res/layout/blocked_numbers_activity.xml @@ -15,7 +15,7 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/search_activity_container" + android:id="@+id/blocked_numbers_activity_container" android:layout_width="match_parent" android:layout_height="match_parent"> -</FrameLayout>
\ No newline at end of file +</FrameLayout> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 38e4d0e6e..b38994b64 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -81,7 +81,7 @@ room to the search box--> <dimen name="action_bar_height">56dp</dimen> <dimen name="action_bar_height_large">64dp</dimen> - <dimen name="action_bar_elevation">2dp</dimen> + <dimen name="action_bar_elevation">3dp</dimen> <dimen name="tab_height">43dp</dimen> <!-- actionbar height + tab height --> <dimen name="actionbar_and_tab_height">107dp</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index 3f4b9e2a6..a4b64a94d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -830,8 +830,8 @@ <!-- Label for the call settings section [CHAR LIMIT=30] --> <string name="call_settings_label">Calls</string> - <!-- Label for the blocked calls settings section [CHAR LIMIT=30] --> - <string name="blocked_calls_settings_label">Spam and blocked calls</string> + <!-- Label for the blocked numbers settings section [CHAR LIMIT=30] --> + <string name="manage_blocked_numbers_label">Blocked numbers</string> <!-- Text informing the user they have previously marked contacts to be sent to voicemail. This will be followed by two buttons, 1) to view who is marked to be sent to voicemail diff --git a/res/values/styles.xml b/res/values/styles.xml index 005fd4587..f21d62f80 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -241,6 +241,21 @@ <item name="android:textColorLink">@color/dialtacts_theme_color</item> </style> + <style name="ManageBlockedNumbersStyle" parent="SettingsStyle"> + <!-- Styles that require AppCompat compatibility, remember to update both sets --> + <item name="android:windowActionBarOverlay">true</item> + <item name="windowActionBarOverlay">true</item> + <item name="android:actionBarStyle">@style/ManageBlockedNumbersActionBarStyle</item> + <item name="actionBarStyle">@style/ManageBlockedNumbersActionBarStyle</item> + <item name="android:fastScrollTrackDrawable">@null</item> + </style> + + <style name="ManageBlockedNumbersActionBarStyle" parent="DialtactsActionBarWithoutTitleStyle"> + <!-- Styles that require AppCompat compatibility, remember to update both sets --> + <item name="android:height">@dimen/action_bar_height</item> + <item name="height">@dimen/action_bar_height</item> + </style> + <!-- Inherit from Theme.Material.Light.Dialog instead of Theme.Material.Light.Dialog.Alert since the Alert dialog is private. They are identical anyway. --> <style name="AlertDialogTheme" parent="@android:style/Theme.Material.Light.Dialog"> |