diff options
author | Andrew Lee <anwlee@google.com> | 2015-10-21 00:16:37 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2015-10-21 13:39:49 -0700 |
commit | 7844b1d11b6f8715ff2782cd3d01a3d1c397f052 (patch) | |
tree | 19fc0265d0051bac31730dd50abdf804c7238e05 /res/layout | |
parent | d625d28ec6cf22c128d0ef0b8e64a9fff4b64aec (diff) |
Disable call blocking after emergency call.
Will be disabled for 48 hours after an emergency call.
+ Add utility for noting last time of an emergency call.
+ Add utility for comparing current time to last time of an
emergency call.
+ If current time is within 48 hours of emergency call, display
text in settings explaining why call blocking is disabled.
Bug: 24418319
Change-Id: I6824340f04fae17b73f17843a9f6ef991afa0327
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/blocked_number_fragment.xml | 8 | ||||
-rw-r--r-- | res/layout/blocked_number_header.xml | 25 |
2 files changed, 25 insertions, 8 deletions
diff --git a/res/layout/blocked_number_fragment.xml b/res/layout/blocked_number_fragment.xml index b98b58fc5..7aff06ec7 100644 --- a/res/layout/blocked_number_fragment.xml +++ b/res/layout/blocked_number_fragment.xml @@ -27,12 +27,4 @@ android:divider="@null" 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> diff --git a/res/layout/blocked_number_header.xml b/res/layout/blocked_number_header.xml index 3fcdf398b..ce1d4feab 100644 --- a/res/layout/blocked_number_header.xml +++ b/res/layout/blocked_number_header.xml @@ -19,6 +19,31 @@ android:layout_height="wrap_content" android:orientation="vertical"> + <LinearLayout android:id="@+id/blocked_numbers_disabled_for_emergency" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:layout_marginBottom="8dp" + android:padding="16dp" + android:visibility="gone"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/blocked_numbers_disabled_emergency_header_label" + android:textStyle="bold" + android:textColor="@color/blocked_number_disabled_emergency_header_color" + style="@style/BlockedNumbersDescriptionTextStyle" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/blocked_numbers_disabled_emergency_desc" + style="@style/BlockedNumbersDescriptionTextStyle" /> + + </LinearLayout> + + <android.support.v7.widget.CardView android:id="@+id/hide_blocked_calls_setting" android:layout_width="match_parent" |