Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c29d849d authored by linyuh's avatar linyuh Committed by android-build-merger
Browse files

Merge "Remove "contacts/common" from the dependency list of package... 

Merge "Remove "contacts/common" from the dependency list of package "dialer/widget"." am: ab661fe0 am: 6e82c38b
am: 20a13a1c

Change-Id: I136618f7b6ac7f6c852b3e7dfc200f3a6d849a17
parents b1b04cd3 20a13a1c

java/com/android/dialer/widget/FloatingActionButtonController.java

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.support.design.widget.FloatingActionButton.OnVisibilityChangedLis 
import android.view.View;

import android.view.animation.AnimationUtils;

import android.view.animation.Interpolator;

import com.android.contacts.common.R;

import com.android.dialer.common.Assert;



/** Controls the movement and appearance of the FAB (Floating Action Button). */

java/com/android/dialer/widget/res/drawable/item_background_material_light.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2014 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

  -->



<!-- Based on the Theme.Material's default selectableItemBackground -->

<ripple xmlns:android="http://schemas.android.com/apk/res/android"

  android:color="@color/dialer_ripple_material_light">

  <item android:id="@android:id/mask">

    <color android:color="@android:color/white"/>

  </item>

</ripple>
 
 No newline at end of file

java/com/android/dialer/widget/res/drawable/searchedittext_custom_cursor.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2014 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

  -->



<shape xmlns:android="http://schemas.android.com/apk/res/android">

  <size android:width="2dp"/>

  <solid android:color="@color/dialtacts_theme_color"/>

</shape>
 
 No newline at end of file

java/com/android/dialer/widget/res/values/animation_constants.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2014 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>

  <integer name="floating_action_button_animation_duration">250</integer>

</resources>

java/com/android/dialer/widget/res/values/colors.xml

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
  ~ limitations under the License

  -->

<resources>



  <!-- Color of ripples used for views with light backgrounds -->

  <color name="dialer_ripple_material_light">#30000000</color>



  <color name="empty_list_text_color">#b2b2b2</color>

  <color name="empty_voicemail_icon_tint_color">#E1E1E1</color>

</resources>
 
 No newline at end of file