diff options
Diffstat (limited to 'res')
17 files changed, 593 insertions, 4 deletions
diff --git a/res/anim/enrollment_fingerprint_isolated_ridge_1_path_animation.xml b/res/anim/enrollment_fingerprint_isolated_ridge_1_path_animation.xml new file mode 100644 index 000000000..333271537 --- /dev/null +++ b/res/anim/enrollment_fingerprint_isolated_ridge_1_path_animation.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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 + --> +<set + xmlns:android="http://schemas.android.com/apk/res/android" > + <set + android:ordering="sequentially" > + <objectAnimator + android:duration="233" + android:propertyName="trimPathEnd" + android:valueFrom="0.0" + android:valueTo="0.0" + android:valueType="floatType" + android:interpolator="@android:interpolator/linear" /> + <objectAnimator + android:duration="566" + android:propertyName="trimPathEnd" + android:valueFrom="0.0" + android:valueTo="1.0" + android:valueType="floatType" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + </set> + <set + android:ordering="sequentially" > + <objectAnimator + android:duration="700" + android:propertyName="trimPathStart" + android:valueFrom="0.0" + android:valueTo="0.0" + android:valueType="floatType" + android:interpolator="@android:interpolator/linear" /> + <objectAnimator + android:duration="433" + android:propertyName="trimPathStart" + android:valueFrom="0.0" + android:valueTo="1.0" + android:valueType="floatType" + android:interpolator="@interpolator/enrollment_fingerprint_isolated_animation_interpolator_1" /> + </set> +</set> diff --git a/res/anim/enrollment_fingerprint_isolated_ridge_2_path_animation.xml b/res/anim/enrollment_fingerprint_isolated_ridge_2_path_animation.xml new file mode 100644 index 000000000..928512206 --- /dev/null +++ b/res/anim/enrollment_fingerprint_isolated_ridge_2_path_animation.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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 + --> +<set + xmlns:android="http://schemas.android.com/apk/res/android" > + <set + android:ordering="sequentially" > + <objectAnimator + android:duration="733" + android:propertyName="trimPathEnd" + android:valueFrom="1.0" + android:valueTo="1.0" + android:valueType="floatType" + android:interpolator="@android:interpolator/linear" /> + <objectAnimator + android:duration="533" + android:propertyName="trimPathEnd" + android:valueFrom="1.0" + android:valueTo="0.0" + android:valueType="floatType" + android:interpolator="@interpolator/enrollment_fingerprint_isolated_animation_interpolator_2" /> + </set> + <set + android:ordering="sequentially" > + <objectAnimator + android:duration="366" + android:propertyName="trimPathStart" + android:valueFrom="1.0" + android:valueTo="1.0" + android:valueType="floatType" + android:interpolator="@android:interpolator/linear" /> + <objectAnimator + android:duration="633" + android:propertyName="trimPathStart" + android:valueFrom="1.0" + android:valueTo="0.0" + android:valueType="floatType" + android:interpolator="@interpolator/enrollment_fingerprint_isolated_animation_interpolator_2" /> + </set> +</set> diff --git a/res/anim/enrollment_fingerprint_isolated_ridge_5_path_animation.xml b/res/anim/enrollment_fingerprint_isolated_ridge_5_path_animation.xml new file mode 100644 index 000000000..1329b7bf9 --- /dev/null +++ b/res/anim/enrollment_fingerprint_isolated_ridge_5_path_animation.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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 + --> +<set + xmlns:android="http://schemas.android.com/apk/res/android" > + <set + android:ordering="sequentially" > + <objectAnimator + android:duration="166" + android:propertyName="trimPathEnd" + android:valueFrom="0.0" + android:valueTo="0.0" + android:valueType="floatType" + android:interpolator="@android:interpolator/linear" /> + <objectAnimator + android:duration="900" + android:propertyName="trimPathEnd" + android:valueFrom="0.0" + android:valueTo="1.0" + android:valueType="floatType" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + </set> + <set + android:ordering="sequentially" > + <objectAnimator + android:duration="600" + android:propertyName="trimPathStart" + android:valueFrom="0.0" + android:valueTo="0.0" + android:valueType="floatType" + android:interpolator="@android:interpolator/linear" /> + <objectAnimator + android:duration="833" + android:propertyName="trimPathStart" + android:valueFrom="0.0" + android:valueTo="1.0" + android:valueType="floatType" + android:interpolator="@interpolator/enrollment_fingerprint_isolated_animation_interpolator_1" /> + </set> +</set> diff --git a/res/anim/enrollment_fingerprint_isolated_ridge_6_path_animation.xml b/res/anim/enrollment_fingerprint_isolated_ridge_6_path_animation.xml new file mode 100644 index 000000000..eeb96818a --- /dev/null +++ b/res/anim/enrollment_fingerprint_isolated_ridge_6_path_animation.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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 + --> +<set + xmlns:android="http://schemas.android.com/apk/res/android" > + <set + android:ordering="sequentially" > + <objectAnimator + android:duration="400" + android:propertyName="trimPathEnd" + android:valueFrom="1.0" + android:valueTo="1.0" + android:valueType="floatType" + android:interpolator="@android:interpolator/linear" /> + <objectAnimator + android:duration="900" + android:propertyName="trimPathEnd" + android:valueFrom="1.0" + android:valueTo="0.0" + android:valueType="floatType" + android:interpolator="@interpolator/enrollment_fingerprint_isolated_animation_interpolator_0" /> + </set> + <objectAnimator + android:duration="866" + android:propertyName="trimPathStart" + android:valueFrom="1.0" + android:valueTo="0.0" + android:valueType="floatType" + android:interpolator="@interpolator/enrollment_fingerprint_isolated_animation_interpolator_2" /> +</set> diff --git a/res/anim/enrollment_fingerprint_isolated_ridge_7_path_animation.xml b/res/anim/enrollment_fingerprint_isolated_ridge_7_path_animation.xml new file mode 100644 index 000000000..69acef6c4 --- /dev/null +++ b/res/anim/enrollment_fingerprint_isolated_ridge_7_path_animation.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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 + --> +<set + xmlns:android="http://schemas.android.com/apk/res/android" > + <set + android:ordering="sequentially" > + <objectAnimator + android:duration="100" + android:propertyName="trimPathEnd" + android:valueFrom="0.0" + android:valueTo="0.0" + android:valueType="floatType" + android:interpolator="@android:interpolator/linear" /> + <objectAnimator + android:duration="966" + android:propertyName="trimPathEnd" + android:valueFrom="0.0" + android:valueTo="1.0" + android:valueType="floatType" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + </set> + <set + android:ordering="sequentially" > + <objectAnimator + android:duration="533" + android:propertyName="trimPathStart" + android:valueFrom="0.0" + android:valueTo="0.0" + android:valueType="floatType" + android:interpolator="@android:interpolator/linear" /> + <objectAnimator + android:duration="900" + android:propertyName="trimPathStart" + android:valueFrom="0.0" + android:valueTo="1.0" + android:valueType="floatType" + android:interpolator="@interpolator/enrollment_fingerprint_isolated_animation_interpolator_1" /> + </set> +</set> diff --git a/res/drawable/enrollment_fingerprint_isolated.xml b/res/drawable/enrollment_fingerprint_isolated.xml new file mode 100644 index 000000000..2f1db7a60 --- /dev/null +++ b/res/drawable/enrollment_fingerprint_isolated.xml @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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 + --> +<vector + xmlns:android="http://schemas.android.com/apk/res/android" + android:name="enrollment_fingerprint_isolated" + android:width="75dp" + android:viewportWidth="75" + android:height="88dp" + android:viewportHeight="88" > + <group + android:name="fingerprint_ridges_2" + android:translateX="37.5835" + android:translateY="43.66685" > + <group + android:name="ridge_5" > + <path + android:name="ridge_5_path" + android:pathData="M 24.9488677979,32.3508300781 c -1.81059265137,0.338500976562 -3.58520507812,0.447387695312 -4.62879943848,0.447387695312 c -4.12730407715,0.0 -8.05894470215,-0.96842956543 -11.5207061768,-3.45275878906 c -5.33699035645,-3.830078125 -8.56369018555,-10.0885009766 -8.56369018555,-17.1589355469" + android:strokeColor="#10000000" + android:strokeWidth="5" + android:strokeLineCap="round" + android:trimPathEnd="0" /> + </group> + <group + android:name="ridge_4" > + <path + android:name="ridge_7_path" + android:pathData="M -9.23379516602,40.8356933594 c -3.24549865723,-3.46032714844 -5.1540222168,-5.77195739746 -7.87710571289,-10.9068603516 c -2.76379394531,-5.21166992188 -4.04838562012,-11.3482666016 -4.04838562012,-17.6915283203 c 0.0,-11.6563720703 9.44940185547,-21.1059570312 21.1058959961,-21.1059570312 c 11.6564941406,0.0 21.1058959961,9.44958496094 21.1058959961,21.1059570312" + android:strokeColor="#10000000" + android:strokeWidth="5" + android:strokeLineCap="round" + android:trimPathEnd="0" /> + </group> + <group + android:name="ridge_3" > + <path + android:name="ridge_6_path" + android:pathData="M -28.8249053955,28.5169677734 c -2.41259765625,-6.82202148438 -2.85319519043,-12.3121337891 -2.85319519043,-16.3226318359 c 0.0,-4.64868164062 0.792999267578,-9.06323242188 2.59269714355,-13.0396728516 c 4.96929931641,-10.9801025391 16.0211029053,-18.619140625 28.857208252,-18.619140625 c 17.4846954346,0.0 31.6587982178,14.1740722656 31.6587982178,31.6588134766 c 0.0,5.82824707031 -4.72470092773,10.5529785156 -10.5529022217,10.5529785156 c -5.82820129395,0.0 -10.5529937744,-4.72473144531 -10.5529937744,-10.5529785156 c 0.0,-5.82824707031 -4.72470092773,-10.5529785156 -10.5529022217,-10.5529785156 c -5.82820129395,0.0 -10.5529022217,4.72473144531 -10.5529022217,10.5529785156 c 0.0,8.17932128906 3.10879516602,15.5925292969 8.25030517578,21.0004882812 c 3.88919067383,4.09069824219 7.77758789062,6.64123535156 14.2838897705,8.52136230469" + android:strokeColor="#10000000" + android:strokeWidth="5" + android:strokeLineCap="round" + android:trimPathStart="1" /> + </group> + <group + android:name="ridge_2" > + <path + android:name="ridge_2_path" + android:pathData="M -34.4861907959,-11.6943359375 c 3.78790283203,-5.64636230469 8.36389160156,-9.94665527344 14.3594970703,-13.2164306641 c 5.99560546875,-3.26977539062 12.8716125488,-5.1279296875 20.1817016602,-5.1279296875 c 7.27980041504,0.0 14.129196167,1.84289550781 20.1071014404,5.08740234375 c 5.97790527344,3.24450683594 10.7957000732,7.759765625 14.5897064209,13.3666992188" + android:strokeColor="#10000000" + android:strokeWidth="5" + android:strokeLineCap="round" + android:trimPathStart="1" /> + </group> + <group + android:name="ridge_1" + android:translateX="-97.5" + android:translateY="-142.5" > + <path + android:name="ridge_1_path" + android:pathData="M 121.472564697,107.859741211 c -7.39790344238,-4.03979492188 -15.2462921143,-6.34167480469 -24.3116912842,-6.34167480469 c -9.06539916992,0.0 -16.2951049805,2.40405273438 -23.12550354,6.34167480469" + android:strokeColor="#10000000" + android:strokeWidth="5" + android:strokeLineCap="round" + android:trimPathEnd="0" /> + </group> + </group> +</vector> diff --git a/res/drawable/enrollment_fingerprint_isolated_animation.xml b/res/drawable/enrollment_fingerprint_isolated_animation.xml new file mode 100644 index 000000000..39c27f053 --- /dev/null +++ b/res/drawable/enrollment_fingerprint_isolated_animation.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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 + --> +<animated-vector + xmlns:android="http://schemas.android.com/apk/res/android" + android:drawable="@drawable/enrollment_fingerprint_isolated" > + <target + android:name="ridge_5_path" + android:animation="@anim/enrollment_fingerprint_isolated_ridge_5_path_animation" /> + <target + android:name="ridge_7_path" + android:animation="@anim/enrollment_fingerprint_isolated_ridge_7_path_animation" /> + <target + android:name="ridge_6_path" + android:animation="@anim/enrollment_fingerprint_isolated_ridge_6_path_animation" /> + <target + android:name="ridge_2_path" + android:animation="@anim/enrollment_fingerprint_isolated_ridge_2_path_animation" /> + <target + android:name="ridge_1_path" + android:animation="@anim/enrollment_fingerprint_isolated_ridge_1_path_animation" /> +</animated-vector> diff --git a/res/interpolator/enrollment_fingerprint_isolated_animation_interpolator_0.xml b/res/interpolator/enrollment_fingerprint_isolated_animation_interpolator_0.xml new file mode 100644 index 000000000..7f442ee5a --- /dev/null +++ b/res/interpolator/enrollment_fingerprint_isolated_animation_interpolator_0.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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 + --> +<pathInterpolator + xmlns:android="http://schemas.android.com/apk/res/android" + android:pathData="M 0.0,0.0 c 0.4,0.0 0.5,1.0 1.0,1.0" /> diff --git a/res/interpolator/enrollment_fingerprint_isolated_animation_interpolator_1.xml b/res/interpolator/enrollment_fingerprint_isolated_animation_interpolator_1.xml new file mode 100644 index 000000000..e10db01ac --- /dev/null +++ b/res/interpolator/enrollment_fingerprint_isolated_animation_interpolator_1.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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 + --> +<pathInterpolator + xmlns:android="http://schemas.android.com/apk/res/android" + android:pathData="M 0.0,0.0 c 0.8,0.0 0.5,1.0 1.0,1.0" /> diff --git a/res/interpolator/enrollment_fingerprint_isolated_animation_interpolator_2.xml b/res/interpolator/enrollment_fingerprint_isolated_animation_interpolator_2.xml new file mode 100644 index 000000000..736eac68f --- /dev/null +++ b/res/interpolator/enrollment_fingerprint_isolated_animation_interpolator_2.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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 + --> +<pathInterpolator + xmlns:android="http://schemas.android.com/apk/res/android" + android:pathData="M 0.0,0.0 c 0.4,0.0 0.6,1.0 1.0,1.0" /> diff --git a/res/layout/delete_managed_profile_dialog.xml b/res/layout/delete_managed_profile_dialog.xml new file mode 100644 index 000000000..da763c9c1 --- /dev/null +++ b/res/layout/delete_managed_profile_dialog.xml @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/** + * Copyright (C) 2015 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. + */ +--> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingTop="@dimen/delete_profile_dialog_padding_top" + android:paddingLeft="@dimen/delete_profile_dialog_padding_left_right" + android:paddingRight="@dimen/delete_profile_dialog_padding_left_right" + android:fadeScrollbars="false" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <TextView + android:id="@+id/delete_managed_profile_opening_paragraph" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/opening_paragraph_delete_profile_unknown_company" + style="@style/TextAppearance.RemoveDialogContent" /> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="@dimen/mdm_app_info_height" + android:layout_alignParentLeft="true" + android:layout_centerInParent="true" + android:layout_gravity="center_vertical" + android:orientation="horizontal" + android:paddingBottom="@dimen/mdm_app_info_padding_top_bottom" + android:paddingTop="@dimen/mdm_app_info_padding_top_bottom" > + + <ImageView + android:id="@+id/delete_managed_profile_mdm_icon_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:scaleType="centerInside" + android:gravity="center_vertical" /> + + <TextView + android:id="@+id/delete_managed_profile_device_manager_name" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:paddingLeft="@dimen/mdm_app_name_padding_left" + style="@style/TextAppearance.RemoveDialogContent" /> + </LinearLayout> + + <TextView + android:id="@+id/delete_managed_profile_closing_paragraph" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/work_profile_confirm_remove_message" + style="@style/TextAppearance.RemoveDialogContent" /> + </LinearLayout> + +</ScrollView>
\ No newline at end of file diff --git a/res/layout/fingerprint_enroll_enrolling_content.xml b/res/layout/fingerprint_enroll_enrolling_content.xml index 6da744e53..9fa503b40 100644 --- a/res/layout/fingerprint_enroll_enrolling_content.xml +++ b/res/layout/fingerprint_enroll_enrolling_content.xml @@ -23,12 +23,18 @@ android:layout_gravity="center_horizontal"> <ImageView - android:id="@+id/fingerprint_animator" android:layout_width="88dp" android:layout_height="88dp" android:layout_centerInParent="true" android:src="@drawable/fingerprint_indicator" /> + <ImageView + android:id="@+id/fingerprint_animator" + android:layout_width="88dp" + android:layout_height="88dp" + android:layout_centerInParent="true" + android:src="@drawable/enrollment_fingerprint_isolated_animation" /> + <ProgressBar android:id="@+id/fingerprint_progress_bar" android:layout_width="192dp" diff --git a/res/layout/storage_internal_forget.xml b/res/layout/storage_internal_forget.xml new file mode 100644 index 000000000..cb47d3ba8 --- /dev/null +++ b/res/layout/storage_internal_forget.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"> + <TextView + android:id="@+id/body" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="@dimen/suw_description_margin_top" + android:paddingBottom="@dimen/suw_description_margin_bottom" + android:paddingStart="@dimen/suw_layout_margin_sides" + android:paddingEnd="@dimen/suw_layout_margin_sides" + android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" + android:textAppearance="@android:style/TextAppearance.Material.Body1" + android:textColor="?android:attr/textColorPrimary" /> + </ScrollView> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="4dp"> + <Button + android:id="@+id/confirm" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/storage_menu_forget" /> + </FrameLayout> + +</LinearLayout> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 30be6e867..e4e925588 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -232,4 +232,11 @@ <dimen name="fab_margin">16dp</dimen> <dimen name="fab_elevation">12dp</dimen> <dimen name="fab_press_translation_z">9dp</dimen> + + <!-- Delete managed profile dialog --> + <dimen name="delete_profile_dialog_padding_top">16dp</dimen> + <dimen name="delete_profile_dialog_padding_left_right">24dp</dimen> + <dimen name="mdm_app_info_height">72dp</dimen> + <dimen name="mdm_app_info_padding_top_bottom">8dp</dimen> + <dimen name="mdm_app_name_padding_left">16dp</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index c1f7dc331..682786719 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2287,6 +2287,8 @@ <string name="storage_menu_format_internal">Erase & format as internal storage</string> <!-- Storage setting. Menu option for USB transfer settings [CHAR LIMIT=30]--> <string name="storage_menu_usb">USB computer connection</string> + <!-- Storage setting. Menu option for forgetting a storage device [CHAR LIMIT=30]--> + <string name="storage_menu_forget">Forget</string> <!-- Storage setting. Title for USB transfer settings [CHAR LIMIT=30]--> <string name="storage_title_usb">USB computer connection</string> @@ -2346,6 +2348,12 @@ <string name="storage_internal_unmount_details"><b>When you eject this <xliff:g id="name" example="SD card">^1</xliff:g>, apps stored on it will stop working, and media files stored on it will not be available until it is reinserted.</b> \n\nThis <xliff:g id="name" example="SD card">^1</xliff:g> is formatted to work on this device only. It won\'t work on any others.</string> + <!-- Body of dialog informing user about consequences of forgetting an internal storage device [CHAR LIMIT=NONE]--> + <string name="storage_internal_forget_details">To use the apps, photos, or data this <xliff:g id="name" example="SD card">^1</xliff:g> contains, reinsert it. +\n\nAlternatively, you can choose to forget this storage if the device isn\'t available. +\n\nIf you choose to forget, all the data the device contains will be lost forever. +\n\nYou can reinstall the apps later, but their data stored on this device will be lost.</string> + <!-- Title of wizard step prompting user to setup a storage device [CHAR LIMIT=32] --> <string name="storage_wizard_init_title">Set up your <xliff:g id="name" example="SD card">^1</xliff:g></string> <!-- Title of wizard choice to use storage device as external storage [CHAR LIMIT=64] --> @@ -2364,6 +2372,14 @@ \n\nAfter formatting, this <xliff:g id="name" example="SD card">^1</xliff:g> will only work in this device. \n\n<b>Formatting erases all data currently stored on the <xliff:g id="name" example="SD card">^1</xliff:g>.</b> To avoid losing the data, consider backing it up. </string> + + <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] --> + <string name="storage_wizard_format_confirm_public_title">Format as portable storage</string> + <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] --> + <string name="storage_wizard_format_confirm_public_body">This requires the <xliff:g id="name" example="SD card">^1</xliff:g> to be formatted. +\n\n<b>Formatting erases all data currently stored on the <xliff:g id="name" example="SD card">^1</xliff:g>.</b> To avoid losing the data, consider backing it up. + </string> + <!-- Next button text of wizard step prompting user to format a storage device [CHAR LIMIT=32] --> <string name="storage_wizard_format_confirm_next">Erase & format</string> @@ -5443,7 +5459,7 @@ <!-- User removal confirmation message [CHAR LIMIT=none] --> <string name="user_confirm_remove_message">All apps and data will be deleted.</string> <!-- Work profile removal confirmation message [CHAR LIMIT=none] --> - <string name="work_profile_confirm_remove_message">All apps and data in this profile will be deleted.</string> + <string name="work_profile_confirm_remove_message">All apps and data in this profile will be deleted if you continue.</string> <!-- User profile removal confirmation message [CHAR LIMIT=none] --> <string name="user_profile_confirm_remove_message">All apps and data will be deleted.</string> <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] --> @@ -6286,6 +6302,8 @@ <!-- Title for a work profile. [CHAR LIMIT=25] --> <string name="managed_user_title">Work profile</string> + <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] --> + <string name="opening_paragraph_delete_profile_unknown_company">This profile is managed by:</string> <!-- Summary Title for saying that the preference is experimental and will evolve over time due to User feedback. [CHAR LIMIT=NONE] --> <string name="experimental_preference">(Experimental)</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index 7a917a962..d0d2ead32 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -327,4 +327,9 @@ <item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textStyle">normal</item> </style> -</resources> + + <style name="TextAppearance.RemoveDialogContent" parent="@android:style/TextAppearance.Material"> + <item name="android:textSize">16sp</item> + <item name="android:textColor">?android:attr/textColorPrimary</item> + </style> +</resources>
\ No newline at end of file diff --git a/res/xml/timezones.xml b/res/xml/timezones.xml index b6f1f1d88..4426495b0 100644 --- a/res/xml/timezones.xml +++ b/res/xml/timezones.xml @@ -1,5 +1,4 @@ <timezones> - <timezone id="Pacific/Majuro"></timezone> <timezone id="Pacific/Midway"></timezone> <timezone id="Pacific/Honolulu"></timezone> <timezone id="America/Anchorage"></timezone> @@ -84,6 +83,8 @@ <timezone id="Asia/Vladivostok"></timezone> <timezone id="Pacific/Guam"></timezone> <timezone id="Asia/Magadan"></timezone> + <timezone id="Pacific/Noumea"></timezone> + <timezone id="Pacific/Majuro"></timezone> <timezone id="Pacific/Auckland"></timezone> <timezone id="Pacific/Fiji"></timezone> <timezone id="Pacific/Tongatapu"></timezone> |