diff options
author | Adam Cohen <adamcohen@google.com> | 2014-12-06 00:22:42 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-06 00:22:43 +0000 |
commit | 30914ad14d16cfdc731b044ecd6d881fb0d44fd5 (patch) | |
tree | 8e0daad1ed10d79c8af4c5ed0b4b523a871a5894 /res | |
parent | 396628876da3df23ecc545ca474da8fe8e3a2cb8 (diff) | |
parent | 5940042d39b576553c2499bcf3d0641281e6ad52 (diff) | |
download | android_packages_apps_Trebuchet-30914ad14d16cfdc731b044ecd6d881fb0d44fd5.tar.gz android_packages_apps_Trebuchet-30914ad14d16cfdc731b044ecd6d881fb0d44fd5.tar.bz2 android_packages_apps_Trebuchet-30914ad14d16cfdc731b044ecd6d881fb0d44fd5.zip |
Merge "Supporting custom widgets provided by launcher" into ub-now-master
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/dummy_widget.xml | 35 | ||||
-rw-r--r-- | res/values/dimens.xml | 2 |
2 files changed, 37 insertions, 0 deletions
diff --git a/res/layout/dummy_widget.xml b/res/layout/dummy_widget.xml new file mode 100644 index 000000000..a0fa8fc3e --- /dev/null +++ b/res/layout/dummy_widget.xml @@ -0,0 +1,35 @@ +<?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:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="horizontal"> + + <FrameLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:background="#ffff0000" /> + + <FrameLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:background="#ff00ff00" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/values/dimens.xml b/res/values/dimens.xml index f12cb57ba..54689ec25 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -28,6 +28,8 @@ <dimen name="dynamic_grid_overview_bar_item_width">80dp</dimen> <dimen name="dynamic_grid_overview_bar_spacer_width">20dp</dimen> + <dimen name="default_widget_padding">8dp</dimen> + <!-- Cling --> <dimen name="cling_migration_logo_height">240dp</dimen> <dimen name="cling_migration_logo_width">165dp</dimen> |