diff options
| author | Christine Chen <christinech@google.com> | 2013-10-17 18:47:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-17 18:47:35 +0000 |
| commit | ef74eb94659d155844339562f7378b7c3cc51dd7 (patch) | |
| tree | 7b6974baa3e71a798fa2798fa7f046cc0c24f10e /InCallUI/res/drawable | |
| parent | a7acd0c4bfcee184da3156425b48b0ef4956eb41 (diff) | |
| parent | 1bd21c5ffed9c85c78d6d63ce25afa779fab8e5a (diff) | |
Merge "Removes private resources from InCallUi" into klp-dev
Diffstat (limited to 'InCallUI/res/drawable')
| -rw-r--r-- | InCallUI/res/drawable/ic_in_call_touch_handle.xml | 2 | ||||
| -rw-r--r-- | InCallUI/res/drawable/ic_lockscreen_outerring.xml | 24 |
2 files changed, 25 insertions, 1 deletions
diff --git a/InCallUI/res/drawable/ic_in_call_touch_handle.xml b/InCallUI/res/drawable/ic_in_call_touch_handle.xml index e657e92ed..7e234b62b 100644 --- a/InCallUI/res/drawable/ic_in_call_touch_handle.xml +++ b/InCallUI/res/drawable/ic_in_call_touch_handle.xml @@ -28,6 +28,6 @@ android:state_enabled="true" android:state_active="true" android:state_focused="false" - android:drawable="@*android:drawable/ic_lockscreen_handle_pressed" /> + android:drawable="@drawable/ic_lockscreen_handle_pressed" /> </selector> diff --git a/InCallUI/res/drawable/ic_lockscreen_outerring.xml b/InCallUI/res/drawable/ic_lockscreen_outerring.xml new file mode 100644 index 000000000..d64825db0 --- /dev/null +++ b/InCallUI/res/drawable/ic_lockscreen_outerring.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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" + android:shape="oval" + > + <size android:height="@dimen/glowpadview_outerring_diameter" + android:width="@dimen/glowpadview_outerring_diameter" /> + <solid android:color="#00000000" /> + <stroke android:color="#1affffff" android:width="2dp" /> +</shape> |