diff options
| author | Andrew Lee <anwlee@google.com> | 2015-10-20 14:14:37 -0700 |
|---|---|---|
| committer | Andrew Lee <anwlee@google.com> | 2015-10-20 17:06:57 -0700 |
| commit | 5632aa9ef16186ee9976fbf669e0f629f0f62520 (patch) | |
| tree | 6c691660047861fc9cb3e08ab47df4359163ccc2 /res/layout | |
| parent | b2ae1410907a622c59175f821d07d3c936b2882c (diff) | |
Delete voicemails from blocked users.
+ Delete voicemail when the notification is received if the number
is blocked and the "hide" setting is set to true.
+ Changed utility to take time into account; only block voicemail
notifications and delete voicemails if the voicemails are from
after the time when the number was blocked.
Bug: 24134270
Change-Id: I2f3b24d6291a6cec4a7d8530b00dd5a4656ab024
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/blocked_number_fragment.xml | 42 | ||||
| -rw-r--r-- | res/layout/blocked_number_header.xml | 9 |
2 files changed, 24 insertions, 27 deletions
diff --git a/res/layout/blocked_number_fragment.xml b/res/layout/blocked_number_fragment.xml index 906e8a10c..c5760da3a 100644 --- a/res/layout/blocked_number_fragment.xml +++ b/res/layout/blocked_number_fragment.xml @@ -52,36 +52,28 @@ </android.support.v7.widget.CardView> - <android.support.v7.widget.CardView + + <LinearLayout + android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - card_view:cardCornerRadius="0dp"> + android:background="@color/background_dialer_white"> - <LinearLayout - android:orientation="vertical" + <ListView android:id="@+id/blocked_numbers_list" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/background_dialer_white"> - - <include layout="@layout/blocked_number_header" /> + android:layout_height="match_parent" + android:layout_weight="1" + android:drawSelectorOnTop="false" + android:headerDividersEnabled="false" /> - <ListView android:id="@id/android:list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_weight="1" - android:drawSelectorOnTop="false" - android:headerDividersEnabled="false" /> - - <TextView android:id="@android:id/empty" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingStart="@dimen/blocked_number_horizontal_margin" - android:paddingTop="@dimen/blocked_number_top_margin" - android:paddingBottom="@dimen/blocked_number_bottom_margin" - android:text="@string/listNoBlockedNumbers" /> - - </LinearLayout> + <TextView android:id="@android:id/empty" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingStart="@dimen/blocked_number_horizontal_margin" + android:paddingTop="@dimen/blocked_number_top_margin" + android:paddingBottom="@dimen/blocked_number_bottom_margin" + android:text="@string/listNoBlockedNumbers" /> - </android.support.v7.widget.CardView> + </LinearLayout> </LinearLayout> diff --git a/res/layout/blocked_number_header.xml b/res/layout/blocked_number_header.xml index e16efbcf4..0c8c086e4 100644 --- a/res/layout/blocked_number_header.xml +++ b/res/layout/blocked_number_header.xml @@ -13,7 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<merge xmlns:android="http://schemas.android.com/apk/res/android"> +<android.support.v7.widget.CardView + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:card_view="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content" + card_view:cardCornerRadius="0dp"> <TextView android:id="@+id/textView" android:layout_width="wrap_content" @@ -72,4 +77,4 @@ android:layout_marginTop="8dp" android:text="@string/blockNumber" /> -</merge> +</android.support.v7.widget.CardView> |