diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-07-25 20:33:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-25 20:33:55 +0000 |
| commit | 32be845ce37960054d5a928d37bd23a788f646d9 (patch) | |
| tree | 65749bfffe0a46c3427fa5075157596ca3837679 | |
| parent | 4a2a4eebf40bfa1c9aeac384b22f2dff3fed2e14 (diff) | |
| parent | 5468a6fc65741e3f186338e44159a31932d87002 (diff) | |
| download | android_packages_apps_Dialer-32be845ce37960054d5a928d37bd23a788f646d9.tar.gz android_packages_apps_Dialer-32be845ce37960054d5a928d37bd23a788f646d9.tar.bz2 android_packages_apps_Dialer-32be845ce37960054d5a928d37bd23a788f646d9.zip | |
am 5468a6fc: am 6ee1cd11: Merge "Add preview layout for lockscreen phone affordance" into lmp-dev
* commit '5468a6fc65741e3f186338e44159a31932d87002':
Add preview layout for lockscreen phone affordance
| -rw-r--r-- | AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | res/layout/keyguard_preview.xml | 34 |
2 files changed, 37 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9b398445d..7532763de 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -120,6 +120,9 @@ <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.TAB" /> </intent-filter> + <meta-data + android:name="com.android.keyguard.layout" + android:resource="@layout/keyguard_preview" /> </activity> <activity android:name="com.android.dialer.settings.DialerSettingsActivity" diff --git a/res/layout/keyguard_preview.xml b/res/layout/keyguard_preview.xml new file mode 100644 index 000000000..0a552687e --- /dev/null +++ b/res/layout/keyguard_preview.xml @@ -0,0 +1,34 @@ +<?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 + --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_height="match_parent" + android:layout_width="match_parent"> + <View + android:layout_width="match_parent" + android:layout_height="25dp" + android:background="@color/dialer_theme_color_dark" /> + <View + android:layout_width="match_parent" + android:layout_height="@dimen/actionbar_and_tab_height" + android:background="@color/dialer_theme_color" /> + <View + android:layout_width="match_parent" + android:layout_weight="1" + android:layout_height="0dp" + android:background="#ffffff" /> +</LinearLayout> |