diff options
author | Cole Faust <colefaust@google.com> | 2019-06-21 18:05:30 -0700 |
---|---|---|
committer | Cole Faust <colefaust@google.com> | 2019-06-21 18:05:30 -0700 |
commit | 0d71eb384f8890d1f6aa294711b1f36f0ddb3111 (patch) | |
tree | 12459033c9a71fd123f918fad4ed90fe185efd89 | |
parent | 2ecfbc7d041ac8b8b8c612b348432ff3a55497cd (diff) | |
parent | 60416701453226d662b77951545828cc48933887 (diff) | |
download | Dialer-0d71eb384f8890d1f6aa294711b1f36f0ddb3111.tar.gz |
Resolve merge conflicts of 60416701453226d662b77951545828cc48933887 to qt-dev-plus-aosp
Deleted all the language files, as they're not in the aosp branch.
Bug: None
Test: Compiling
Change-Id: I79992c4eeb3a5334749df150d4d74b7d310fc57a
-rw-r--r-- | PREUPLOAD.cfg | 1 | ||||
-rw-r--r-- | res/anim/telecom_fade_in.xml | 23 | ||||
-rw-r--r-- | res/anim/telecom_fade_out.xml | 23 | ||||
-rw-r--r-- | res/anim/telecom_slide_in.xml | 22 | ||||
-rw-r--r-- | res/anim/telecom_slide_in_with_delay.xml | 23 | ||||
-rw-r--r-- | res/anim/telecom_slide_out.xml | 22 | ||||
-rw-r--r-- | res/animator/fade_in.xml | 23 | ||||
-rw-r--r-- | res/animator/fade_out.xml | 23 | ||||
-rw-r--r-- | res/drawable/ic_arrow_down.xml | 24 | ||||
-rw-r--r-- | res/drawable/ic_avatar_bg.xml | 16 | ||||
-rw-r--r-- | res/drawable/ic_cancel.xml | 24 | ||||
-rw-r--r-- | res/drawable/ic_down_outlined.xml | 24 | ||||
-rw-r--r-- | res/drawable/ic_play.xml | 22 | ||||
-rw-r--r-- | res/values-h1200dp/bools.xml | 1 | ||||
-rw-r--r-- | res/values-h610dp/bools.xml | 1 | ||||
-rw-r--r-- | res/values-night/colors.xml | 10 | ||||
-rw-r--r-- | res/values-w1280dp/dimens.xml | 25 | ||||
-rw-r--r-- | res/values-w1920dp/dimens.xml | 25 | ||||
-rw-r--r-- | res/values-w690dp/dimens.xml | 21 | ||||
-rw-r--r-- | res/values/bools.xml | 1 | ||||
-rw-r--r-- | res/values/colors.xml | 32 | ||||
-rw-r--r-- | res/values/dimens.xml | 29 | ||||
-rw-r--r-- | res/values/strings.xml | 21 | ||||
-rwxr-xr-x | tests/checkresources.py | 22 |
24 files changed, 23 insertions, 435 deletions
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg index 38f98003..0ef19c57 100644 --- a/PREUPLOAD.cfg +++ b/PREUPLOAD.cfg @@ -1,6 +1,7 @@ [Hook Scripts] checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT} ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py -f ${PREUPLOAD_FILES} +resources_hook = ${REPO_ROOT}/packages/apps/Car/Dialer/tests/checkresources.py ${REPO_ROOT}/packages/apps/Car/Dialer [Builtin Hooks] commit_msg_changeid_field = true diff --git a/res/anim/telecom_fade_in.xml b/res/anim/telecom_fade_in.xml deleted file mode 100644 index e7d2e143..00000000 --- a/res/anim/telecom_fade_in.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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"> - <alpha - android:fromAlpha="0" - android:toAlpha="1" - android:duration="600" - android:startOffset="0" - android:interpolator="@android:interpolator/linear_out_slow_in" /> -</set>
\ No newline at end of file diff --git a/res/anim/telecom_fade_out.xml b/res/anim/telecom_fade_out.xml deleted file mode 100644 index 069fd69a..00000000 --- a/res/anim/telecom_fade_out.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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"> - <alpha - android:fromAlpha="1" - android:toAlpha="0" - android:duration="600" - android:startOffset="0" - android:interpolator="@android:interpolator/fast_out_linear_in" /> -</set>
\ No newline at end of file diff --git a/res/anim/telecom_slide_in.xml b/res/anim/telecom_slide_in.xml deleted file mode 100644 index 5e52da4e..00000000 --- a/res/anim/telecom_slide_in.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?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"> - <translate - android:fromYDelta="100%p" - android:toYDelta="0%p" - android:interpolator="@android:interpolator/accelerate_decelerate" - android:duration="300" /> -</set> diff --git a/res/anim/telecom_slide_in_with_delay.xml b/res/anim/telecom_slide_in_with_delay.xml deleted file mode 100644 index 475389c9..00000000 --- a/res/anim/telecom_slide_in_with_delay.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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"> - <translate - android:fromYDelta="100%p" - android:toYDelta="0%p" - android:interpolator="@android:interpolator/accelerate_decelerate" - android:startOffset="200" - android:duration="500" /> -</set>
\ No newline at end of file diff --git a/res/anim/telecom_slide_out.xml b/res/anim/telecom_slide_out.xml deleted file mode 100644 index 4856ac6a..00000000 --- a/res/anim/telecom_slide_out.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?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"> - <translate - android:fromYDelta="0%p" - android:toYDelta="100%p" - android:interpolator="@android:interpolator/accelerate_decelerate" - android:duration="300" /> -</set> diff --git a/res/animator/fade_in.xml b/res/animator/fade_in.xml deleted file mode 100644 index 14001946..00000000 --- a/res/animator/fade_in.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2017 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"> - <objectAnimator - android:propertyName="alpha" - android:valueFrom="0.0" - android:valueTo="1.0" - android:duration="600" - android:interpolator="@android:interpolator/linear_out_slow_in" /> -</set> diff --git a/res/animator/fade_out.xml b/res/animator/fade_out.xml deleted file mode 100644 index 14f1372c..00000000 --- a/res/animator/fade_out.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2017 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"> - <objectAnimator - android:propertyName="alpha" - android:valueFrom="1.0" - android:valueTo="0.0" - android:duration="600" - android:interpolator="@android:interpolator/linear_out_slow_in" /> -</set> diff --git a/res/drawable/ic_arrow_down.xml b/res/drawable/ic_arrow_down.xml deleted file mode 100644 index 95db4bf9..00000000 --- a/res/drawable/ic_arrow_down.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2018 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:viewportWidth="24" - android:viewportHeight="24" - android:width="@dimen/primary_icon_size" - android:height="@dimen/primary_icon_size"> - <path - android:pathData="M7 10l5 5 5 -5z" - android:fillColor="#000000" /> -</vector>
\ No newline at end of file diff --git a/res/drawable/ic_avatar_bg.xml b/res/drawable/ic_avatar_bg.xml deleted file mode 100644 index 258e8789..00000000 --- a/res/drawable/ic_avatar_bg.xml +++ /dev/null @@ -1,16 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="336dp" - android:height="480dp" - android:viewportWidth="336.0" - android:viewportHeight="480.0"> - <path - android:pathData="M277.9,54.4C277.9,-5.8 227.4,-56 166.9,-56C106.4,-56 56,-5.8 56,54.4C56,114.7 106.4,164.8 166.9,164.8C227.4,164.8 277.9,114.7 277.9,54.4Z" - android:strokeColor="@android:color/white" - android:fillColor="@android:color/white" - android:strokeWidth="1"/> - <path - android:pathData="M168,228C33.6,228 -74,291.6 -74,351.8L-74,482.3L410,482.3L410,351.8C410,294.9 302.5,228 168,228L168,228Z" - android:strokeColor="@android:color/white" - android:fillColor="@android:color/white" - android:strokeWidth="1"/> -</vector> diff --git a/res/drawable/ic_cancel.xml b/res/drawable/ic_cancel.xml deleted file mode 100644 index dc0b8654..00000000 --- a/res/drawable/ic_cancel.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2017 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:width="@dimen/primary_icon_size" - android:height="@dimen/primary_icon_size" - android:viewportWidth="48.0" - android:viewportHeight="48.0"> - <path - android:pathData="M24,4C12.95,4 4,12.95 4,24s8.95,20 20,20 20,-8.95 20,-20S35.05,4 24,4zM34,31.17L31.17,34 24,26.83 16.83,34 14,31.17 21.17,24 14,16.83 16.83,14 24,21.17 31.17,14 34,16.83 26.83,24 34,31.17z" - android:fillColor="#000000"/> -</vector> diff --git a/res/drawable/ic_down_outlined.xml b/res/drawable/ic_down_outlined.xml deleted file mode 100644 index c59c62ca..00000000 --- a/res/drawable/ic_down_outlined.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?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:width="@dimen/primary_icon_size" - android:height="@dimen/primary_icon_size" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:pathData="M11.909,19C11.449,19 11.02,18.726 10.761,18.267L4.201,6.852C3.892,6.308 3.996,5.851 4.138,5.6C4.451,5.044 5.053,5 5.309,5L18.439,5C18.743,5 19.308,5.044 19.615,5.585C19.754,5.831 19.855,6.258 19.554,6.795L12.987,18.322C12.752,18.739 12.348,19 11.909,19L11.909,19ZM6.471,7.098L11.89,16.528L17.268,7.098L6.471,7.098Z" - android:fillColor="#000000"/> -</vector> diff --git a/res/drawable/ic_play.xml b/res/drawable/ic_play.xml deleted file mode 100644 index 058fc252..00000000 --- a/res/drawable/ic_play.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2018 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:width="@dimen/primary_icon_size" - android:height="@dimen/primary_icon_size" - android:viewportHeight="48.0" - android:viewportWidth="48.0"> - <path android:fillColor="#000000" android:pathData="M16,10v28l22,-14z"/> -</vector> diff --git a/res/values-h1200dp/bools.xml b/res/values-h1200dp/bools.xml index dc293b20..b737bbca 100644 --- a/res/values-h1200dp/bools.xml +++ b/res/values-h1200dp/bools.xml @@ -16,6 +16,5 @@ --> <resources> - <bool name="screen_size_standard_height">false</bool> <bool name="screen_size_tall">true</bool> </resources> diff --git a/res/values-h610dp/bools.xml b/res/values-h610dp/bools.xml index 5ca1ae3d..ab691bc8 100644 --- a/res/values-h610dp/bools.xml +++ b/res/values-h610dp/bools.xml @@ -17,5 +17,4 @@ <resources> <bool name="screen_size_short">false</bool> - <bool name="screen_size_standard_height">true</bool> </resources> diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml index 797bf65a..c5f70536 100644 --- a/res/values-night/colors.xml +++ b/res/values-night/colors.xml @@ -14,16 +14,6 @@ limitations under the License. --> <resources> - <color name="phone_theme">@color/phone_theme_dark</color> - <color name="phone_theme_secondary">@color/phone_theme_secondary_dark</color> - - <color name="telecom_display_scrim">@color/telecom_display_scrim_dark</color> - <color name="search_container_controls_tint">@color/search_container_controls_tint_dark</color> - <color name="search_container_text_hint">@color/search_container_text_hint_dark</color> - - <!-- TextAppearances --> - <color name="car_caption">@color/car_caption_light</color> - <color name="car_key1">@color/car_key1_light</color> <color name="car_key2">@color/car_key2_light</color> <!-- Components --> diff --git a/res/values-w1280dp/dimens.xml b/res/values-w1280dp/dimens.xml deleted file mode 100644 index 99593797..00000000 --- a/res/values-w1280dp/dimens.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2019 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. - --> - -<resources> - <!-- Card view margins--> - <dimen name="dialer_card_margin_x">326dp</dimen> - - <!-- Toolbar --> - <!-- Half of the difference between car_margin and touch_target_size--> - <dimen name="menu_item_margin_x">36dp</dimen> -</resources> diff --git a/res/values-w1920dp/dimens.xml b/res/values-w1920dp/dimens.xml deleted file mode 100644 index fc4c8be5..00000000 --- a/res/values-w1920dp/dimens.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2019 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. - --> - -<resources> - <!-- Card view margins--> - <dimen name="dialer_card_margin_x">422dp</dimen> - - <!-- Toolbar --> - <!-- Half of the difference between car_margin and touch_target_size--> - <dimen name="menu_item_margin_x">48dp</dimen> -</resources> diff --git a/res/values-w690dp/dimens.xml b/res/values-w690dp/dimens.xml deleted file mode 100644 index a488e1d9..00000000 --- a/res/values-w690dp/dimens.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2019 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. - --> - -<resources> - <!-- Card view margins--> - <dimen name="dialer_card_margin_x">132dp</dimen> -</resources>
\ No newline at end of file diff --git a/res/values/bools.xml b/res/values/bools.xml index e7162710..6cc068da 100644 --- a/res/values/bools.xml +++ b/res/values/bools.xml @@ -16,6 +16,5 @@ <resources> <bool name="screen_size_short">true</bool> - <bool name="screen_size_standard_height">false</bool> <bool name="screen_size_tall">false</bool> </resources>
\ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index 4305fbbf..74d067d7 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -14,48 +14,16 @@ limitations under the License. --> <resources> - <!-- rail --> - <color name="phone_theme">@color/phone_theme_light</color> - <color name="phone_theme_light">@*android:color/car_grey_50</color> - <color name="phone_theme_dark">@*android:color/car_dark_blue_grey_700</color> - - <color name="phone_theme_secondary">@color/phone_theme_secondary_light</color> - <color name="phone_theme_secondary_light">@*android:color/car_grey_200</color> - <color name="phone_theme_secondary_dark">@*android:color/car_dark_blue_grey_800</color> - <!-- InCall page --> <color name="phone_call">@*android:color/car_green_700</color> <color name="phone_end_call">@*android:color/car_red_500a</color> <!-- Dialpad page --> <color name="call_button_outline">@*android:color/car_green_500</color> - - <!-- A scrim that covers the background of activities and darkens them for night mode. --> - <color name="telecom_display_scrim">@color/telecom_display_scrim_light</color> - <color name="telecom_display_scrim_light">@*android:color/transparent</color> - <color name="telecom_display_scrim_dark">#52000000</color> - - <!-- Search components. --> - <color name="search_container_controls_tint">@color/search_container_controls_tint_light</color> - <color name="search_container_controls_tint_light">@*android:color/car_grey_800</color> - <color name="search_container_controls_tint_dark">@*android:color/car_grey_100</color> - <color name="search_container_text_hint">@color/search_container_text_hint_light</color> - <color name="search_container_text_hint_light">@*android:color/car_grey_400</color> - <color name="search_container_text_hint_dark">@*android:color/car_grey_700</color> - <color name="search_back_tint">@color/primary_icon_color</color> <!--Contact details--> <color name="contact_details_icon_tint">@color/primary_icon_color</color> - <!-- TextAppearances --> - <color name="car_caption">@color/car_caption_dark</color> - <color name="car_caption_light">@*android:color/car_grey_400</color> - <color name="car_caption_dark">@*android:color/car_grey_700</color> - - <color name="car_key1">@color/car_key1_dark</color> - <color name="car_key1_light">@*android:color/car_grey_100</color> - <color name="car_key1_dark">@*android:color/car_light_blue_700</color> - <color name="car_key2">@color/car_key2_dark</color> <color name="car_key2_light">@*android:color/car_grey_400</color> <color name="car_key2_dark">@*android:color/car_grey_700</color> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index e636c586..1e5ab955 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -20,8 +20,6 @@ <!-- Audio route dimentions --> <dimen name="audio_route_height">@dimen/control_bar_height</dimen> <dimen name="audio_route_content_padding">@dimen/list_item_padding</dimen> - <dimen name="audio_route_corner_radius">@*android:dimen/car_radius_3</dimen> - <dimen name="audio_route_card_elevation">@dimen/control_bar_elevation</dimen> <dimen name="audio_route_icon_size">@dimen/primary_icon_size</dimen> <dimen name="audio_route_constraint_guide_begin">@dimen/list_item_guideline</dimen> @@ -30,8 +28,6 @@ <dimen name="call_history_item_padding">@dimen/list_item_padding</dimen> <dimen name="call_history_guideline_begin">@dimen/list_item_guideline_begin</dimen> <dimen name="call_history_guideline_end">@dimen/list_item_guideline_end</dimen> - <dimen name="call_history_avatar_size">@dimen/avatar_icon_size</dimen> - <dimen name="call_history_action_button_size">@dimen/touch_target_size</dimen> <dimen name="call_history_text_margin_end">@dimen/list_item_text_margin_end</dimen> <dimen name="call_history_icons_margin">@*android:dimen/car_padding_1</dimen> <dimen name="call_log_icon_margin">4dp</dimen> @@ -46,8 +42,6 @@ <dimen name="contact_details_number_padding_start">@*android:dimen/car_keyline_1</dimen> <dimen name="contact_details_number_padding_end">@*android:dimen/car_padding_2</dimen> <dimen name="contact_details_text_button_guideline">@*android:dimen/car_keyline_3</dimen> - <dimen name="contact_details_text_button_image_size">@dimen/primary_icon_size</dimen> - <dimen name="contact_details_text_button_touchtarget">@*android:dimen/car_touch_target_size</dimen> <dimen name="contact_details_action_bar_name_margin">@*android:dimen/car_padding_2</dimen> <!-- Contact list dimensions --> @@ -64,10 +58,8 @@ <!-- In-call dimensions --> <dimen name="in_call_controller_bar_height">@dimen/control_bar_height</dimen> - <dimen name="in_call_card_elevation">12dp</dimen> <dimen name="in_call_controller_bar_margin">@*android:dimen/car_padding_5</dimen> <dimen name="in_call_controller_bar_margin_bottom">@*android:dimen/car_padding_2</dimen> - <dimen name="in_call_controller_secondary_icon_size">@*android:dimen/car_secondary_icon_size</dimen> <dimen name="in_call_avatar_icon_size">196dp</dimen> <dimen name="in_call_phone_number_margin_top">@*android:dimen/car_padding_2</dimen> <dimen name="in_call_state_margin_top">@*android:dimen/car_padding_2</dimen> @@ -78,20 +70,11 @@ <dimen name="ringing_call_button_touch_target_size">@dimen/touch_target_size</dimen> <dimen name="ringing_call_text_margin">@*android:dimen/car_padding_4</dimen> - <!-- Touch Keyboard --> - <dimen name="keyboard_key_letter_height">26dp</dimen> - - <dimen name="apps_max_content_width">748dp</dimen> - <!-- Dialpad dimensions --> <dimen name="dialpad_line_divider_height">@dimen/vertical_divider_width</dimen> - <dimen name="dialpad_info_padding_size">@*android:dimen/car_keyline_1</dimen> - <dimen name="dialpad_fragment_info_padding_size">@*android:dimen/car_keyline_1</dimen> <dimen name="dialpad_info_title_padding_size">@*android:dimen/car_padding_4</dimen> <dimen name="dialpad_info_edge_padding_size">@*android:dimen/car_padding_2</dimen> - <dimen name="dialpad_fragment_margin">@*android:dimen/car_margin</dimen> <dimen name="dialpad_info_guideline">@dimen/touch_target_size</dimen> - <dimen name="dialpad_info_guideline_in_call" format="float">0.5</dimen> <dimen name="display_name_padding">@*android:dimen/car_padding_3</dimen> <dimen name="call_state_padding">@*android:dimen/car_padding_3</dimen> @@ -115,9 +98,6 @@ <dimen name="in_call_button_size">@dimen/touch_target_size</dimen> - <dimen name="user_profile_title_padding_top">@*android:dimen/car_padding_3</dimen> - <dimen name="user_profile_body_padding_top">@*android:dimen/car_padding_3</dimen> - <dimen name="car_key1_size">32sp</dimen> <dimen name="car_key2_size">18sp</dimen> @@ -129,10 +109,6 @@ <dimen name="connect_bluetooth_button_min_width">@dimen/touch_target_width</dimen> <dimen name="emergency_button_bottom_margin">@*android:dimen/car_padding_4</dimen> - <dimen name="telecom_activity_padding">@*android:dimen/car_app_bar_height</dimen> - - <dimen name="user_profile_text_padding">@*android:dimen/car_padding_3</dimen> - <dimen name="list_top_padding">@*android:dimen/car_padding_2</dimen> <!-- Components --> <dimen name="list_item_height">@*android:dimen/car_single_line_list_item_height</dimen> @@ -156,11 +132,6 @@ <dimen name="contact_avatar_corner_radius_percent" format="float">0.5</dimen> <dimen name="touch_target_width">156dp</dimen> - <!-- Card view margins--> - <dimen name="contact_card_margin_x">@*android:dimen/car_margin</dimen> - <dimen name="search_card_margin_x">@dimen/dialer_card_margin_x</dimen> - <dimen name="dialer_card_margin_x">72dp</dimen> - <!-- Toolbar --> <!-- Half of the difference between car_margin and touch_target_size--> <dimen name="menu_item_margin_x">18dp</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index a4c3335c..f6823d8f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -24,12 +24,6 @@ <string name="bluetooth_disabled">To make or receive calls, turn Bluetooth on.</string> <!-- Error text shown on the dialer facet for when bluetooth is not paired --> <string name="bluetooth_unpaired">To make or receive calls, pair your phone with the car.</string> - <!-- Toast text when a call failed because the network isn't available [CHAR LIMIT=40] --> - <string name="error_network_not_available">Network not available.</string> - <!-- Toast text when a call failed because the phone is in airplane mode [CHAR LIMIT=40] --> - <string name="error_airplane_mode">Phone is in airplane mode.</string> - <!-- Toast text when a call failed because bluetooth hfp is not available [CHAR LIMIT=40] --> - <string name="error_no_hfp">Bluetooth is not connected.</string> <!-- Toast text when sending a text failed because there is no app to compose texts [CHAR LIMIT=80] --> <string name="error_no_text_intent_handler">To send texts, you will need to install a messaging app.</string> <!-- Button text for connecting to Bluetooth [CHAR LIMIT=40] --> @@ -42,10 +36,6 @@ <string name="error_contact_deleted">This contact might have been deleted.</string> <!-- Toast text when user has inputted an invalid phone number [CHAR LIMIT=NONE] --> <string name="error_invalid_phone_number">Can\'t dial this number. Check it and try again.</string> - <!-- Text displayed when the call log is empty. [CHAR LIMIT=40] --> - <string name="recent_calls_empty">Your call log is empty.</string> - <!-- Text displayed when the speed dial is empty. [CHAR LIMIT=100] --> - <string name="speed_dial_empty">Speed Dial provides one-touch dialing for favorites and numbers you call often</string> <!-- Decline an in coming call [CHAR LIMIT=20] --> <string name="decline_call">Decline</string> @@ -53,11 +43,6 @@ <string name="answer_call">Answer</string> <!-- Call back a missed call [CHAR LIMIT=20] --> <string name="call_back">Call back</string> - <!-- Send a message to a missed call [CHAR LIMIT=20] --> - <string name="message">Message</string> - - <!-- Label for when a call is a conference call [CHAR LIMIT=30] --> - <string name="conference_call">Conference call</string> <!-- Audio route --> <!-- Label for routing phone audio to the vehicle [CHAR LIMIT=30] --> @@ -81,8 +66,6 @@ <string name="dialpad_title">Dialpad</string> <!-- Toolbar title for tabbed pages --> <string name="default_toolbar_title" translatable="false"></string> - <!-- Toolbar title for contact details page [CHAR LIMIT=40] --> - <string name="toolbar_title_contact_details">Contact details</string> <!-- Button to quickly call a number. The string is the label of the phone. [CHAR LIMIT=30] --> <string name="contact_details_call_number_button_with_label">Call <xliff:g id="label" example="Mobile">%1$s</xliff:g></string> @@ -128,11 +111,7 @@ <string name="search_title">Search contacts</string> <string name="search_hint">Search contacts</string> - <string name="type_home">Home</string> - <string name="type_work">Work</string> - <string name="type_mobile">Mobile</string> <string name="type_multiple">Multiple</string> - <string name="type_other">Other</string> <!-- Title for choose a phone number dialog to make a call or send sms [CHAR LIMIT=60] --> <string name="select_number_dialog_title">Choose a phone number</string> diff --git a/tests/checkresources.py b/tests/checkresources.py new file mode 100755 index 00000000..27ad701e --- /dev/null +++ b/tests/checkresources.py @@ -0,0 +1,22 @@ +#!/usr/bin/python3 +import subprocess +import sys + +process = subprocess.Popen(['lint', '--check', 'UnusedResources', sys.argv[1]], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + +stdout, stderr = process.communicate() +stdout = stdout.decode('utf-8') + +results = [] +for line in stdout.split('\n'): + if '[UnusedResources]' in line: + results.append(line) + +if len(results) > 0: + print('\n'.join(results)) + sys.exit(1) +else: + sys.exit(0) + |