Chris Banes 638d6ab685 Merge "Don\'t call requestDisallowInterceptTouchEvent(false)" into mnc-ub-dev ...

am: bed7de3

* commit 'bed7de3603499da7577e50ae70c2369dca9d2a55':
  Don't call requestDisallowInterceptTouchEvent(false)

GitOrigin-RevId=65a1c00240675067047b3ef23d5c1ecca1a6ab22

PiperOrigin-RevId: 140560416

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

api

Merge "Make FAB react to window size" into nyc-dev

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

base/android/support/design/widget

Merge "Fix FloatingActionButton.setBackgroundTint* not working" into mnc-ub-dev

2016-12-12 15:50:43 -08:00

eclair-mr1/android/support/design/widget

Add test for snapping behavior of AppBarLayout

2016-12-12 15:50:59 -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 "Make FAB react to window size" into nyc-dev

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

res-public/values

Merge "Revert "Add default style attrs for design components"" into nyc-dev

2016-12-12 15:49:53 -08:00

src

Merge "Don\'t call requestDisallowInterceptTouchEvent(false)" into mnc-ub-dev

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

tests

Merge "Make FAB react to window size" into nyc-dev

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

Android.mk

Merge "Revert "Revert AppCompat's use of VDC" for v24 preview #2" into nyc-dev

2016-12-12 15:51:38 -08:00

AndroidManifest.xml

Merge "Design support library skeleton"

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

build.gradle

Merge "Revert "Revert AppCompat's use of VDC" for v24 preview #2" into nyc-dev

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