Chris Banes 23bd862323 Merge "Fix CollapsingToolbarLayout not drawing a title" into mnc-ub-dev am: af862ffe2a ...

am: b66d81e110

* commit 'b66d81e110b9056c448a094e3a21734333d665f1':
  Fix CollapsingToolbarLayout not drawing a title

GitOrigin-RevId=070c7139ee671e10e2197d9cad4015b797cd0e9a

PiperOrigin-RevId: 140559540

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

api

Merge "Add TextInputEditText to accompany TextInputLayout" into mnc-ub-dev am: 180941a683

2016-12-12 15:46:19 -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 CollapsingToolbarLayout not drawing a title" into mnc-ub-dev am: af862ffe2a

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

tests

Merge "Fix Snackbar tests when animations are enabled" into mnc-ub-dev am: 5b5ab38cdf

2016-12-12 15:46:27 -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 "Update test dependencies in AppCompat + design" into mnc-ub-dev am: 3872d0b805

2016-12-12 15:46:15 -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%