Yuichi Araki bc759d80fe Merge "Fix BottomSheet over ScrollView" into mnc-ub-dev am: 129ef23221 ...

am: 23848059a9

* commit '23848059a9a6265fe9c6db056e7e0d9b5f193f45':
  Fix BottomSheet over ScrollView

GitOrigin-RevId=7dfefd41cc64cc46d41d9906526e013d92ef745f

PiperOrigin-RevId: 140559487

2016-12-12 15:46:01 -08:00

api

Merge "Fix AppBarLayout layout issues" into mnc-ub-dev am: 25ce9fa091

2016-12-12 15:45:28 -08:00

base/android/support/design/widget

Add compat padding to FloatingActionButton ala CardView am: 6d7a9a0276

2016-12-12 15:42:52 -08:00

eclair-mr1/android/support/design/widget

Add compat padding to FloatingActionButton ala CardView am: 6d7a9a0276

2016-12-12 15:42:52 -08:00

honeycomb/android/support/design/widget

resolved conflicts for merge of 73a0c3c7 to master

2016-12-09 18:13:19 -08:00

honeycomb-mr1/android/support/design/widget

am 5a3a72a9: am 9ec922c2: Fix FAB using ICS APIs on Honeycomb

2016-12-12 15:41:15 -08:00

ics/android/support/design/widget

Respect a FloatingActionButton\'s visibility when anchored am: fc780bab91

2016-12-12 15:41:35 -08:00

lollipop/android/support/design/widget

Add compat padding to FloatingActionButton ala CardView am: 6d7a9a0276

2016-12-12 15:42:52 -08:00

res

Merge "Fix BottomSheet over ScrollView" into mnc-ub-dev am: 129ef23221

2016-12-12 15:46:01 -08:00

res-public/values

Merge "BottomSheetDialog and BottomSheetDialogFragment" into mnc-ub-dev am: 623321eab7

2016-12-12 15:45:04 -08:00

src

Merge "Fix BottomSheet over ScrollView" into mnc-ub-dev am: 129ef23221

2016-12-12 15:46:01 -08:00

tests

Suppress Javadocs generation in design/tests am: 40b6e9cdd8

2016-12-12 15:45:57 -08:00

Android.mk

Merge "Initial test setup and simple TabLayout test in design lib" into mnc-ub-dev am: 6f15897288

2016-12-12 15:45:16 -08:00

AndroidManifest.xml

Merge "Design support library skeleton"

2016-12-09 17:54:54 -08:00

build.gradle

Merge "Initial test setup and simple TabLayout test in design lib" into mnc-ub-dev am: 6f15897288

2016-12-12 15:45:16 -08:00

LICENSE

Merge "Design support library skeleton"

2016-12-09 17:54:54 -08:00

proguard-rules.pro

Merge "Revert "Tweak design proguard config"" into mnc-ub-dev am: 981309e1e7

2016-12-12 15:44:36 -08:00

Description

Modular and customizable Material Design UI components for Android

androidmaterial-componentsmaterial-design

Apache-2.0 191 MiB

Languages

Java 99.9%

Kotlin 0.1%