diff options
| author | Dan Pasanen <dan.pasanen@gmail.com> | 2017-04-05 07:26:34 -0500 |
|---|---|---|
| committer | Dan Pasanen <dan.pasanen@gmail.com> | 2017-04-05 07:26:34 -0500 |
| commit | 4f8e6f18ca8790d99ad6a961d40749bb85401dac (patch) | |
| tree | 82e25618e66133c4d5b7bcb92bb63318c32dfe80 /res/drawable-watch/action_positive_bg.xml | |
| parent | 0fc5fe15f2571c7b117e87737b633ad9cc2aaf08 (diff) | |
| parent | e1dbf0e2600ab6c7f5cc47621d85d0c38a27f5ff (diff) | |
| download | android_packages_apps_PackageInstaller-4f8e6f18ca8790d99ad6a961d40749bb85401dac.tar.gz android_packages_apps_PackageInstaller-4f8e6f18ca8790d99ad6a961d40749bb85401dac.tar.bz2 android_packages_apps_PackageInstaller-4f8e6f18ca8790d99ad6a961d40749bb85401dac.zip | |
Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2
Android 7.1.2 Release 2 (N2G47E)
# gpg: Signature made Mon 03 Apr 2017 01:41:50 AM CDT
# gpg: using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
Diffstat (limited to 'res/drawable-watch/action_positive_bg.xml')
| -rw-r--r-- | res/drawable-watch/action_positive_bg.xml | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/res/drawable-watch/action_positive_bg.xml b/res/drawable-watch/action_positive_bg.xml index f3457c1a..3e8590f2 100644 --- a/res/drawable-watch/action_positive_bg.xml +++ b/res/drawable-watch/action_positive_bg.xml @@ -13,23 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false"> - <shape android:shape="oval"> - <solid android:color="@color/circular_button_disabled"/> - <size android:width="40dp" android:height="40dp" /> - </shape> - </item> - <item android:state_pressed="true"> - <shape android:shape="oval"> - <solid android:color="#009688"/> - <size android:width="40dp" android:height="40dp" /> - </shape> - </item> +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="?android:colorControlHighlight"> <item> - <shape android:shape="oval"> - <solid android:color="#00BFA5"/> + <shape android:shape="oval" android:tint="@color/btn_colored_background_material"> + <solid android:color="@android:color/white" /> <size android:width="40dp" android:height="40dp" /> </shape> </item> -</selector> +</ripple> |