Yuichi Araki 974bff077b am 5d774a17: am 1243f6f3: am 762955b3: am af016cf1: Merge "Fix for menu XML ending with a sub menu" into lmp-mr1-ub-dev ...

* commit '5d774a17320f94d75b360f572a562d00c78e5911':
  Fix for menu XML ending with a sub menu

GitOrigin-RevId=245d1e14c05a695e45c7f887a1ac1d03cfae2d7a

PiperOrigin-RevId: 140548800

2016-12-09 18:18:35 -08:00

api

am de947589: am f6e9a17c: am 7afe341e: am 6a93c2eb: Merge "Add typeface support to TextInputLayout" into lmp-mr1-ub-dev

2016-12-09 18:18:29 -08:00

base/android/support/design/widget

am 4ae83371: am cc29b5d7: am 302adaa3: Merge "Improve FloatingActionButton border implementation" into lmp-mr1-ub-dev

2016-12-09 18:16:10 -08:00

eclair-mr1/android/support/design/widget

am b7611f33: am 4deeeddf: am 523bcc06: am 380851fd: Merge "Fix setRippleColor on FloatingActionButton" into lmp-mr1-ub-dev

2016-12-09 18:18:18 -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 a196f6c5: Merge "AppBarLayout improvements" into lmp-mr1-ub-dev

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

lollipop/android/support/design/widget

am b7611f33: am 4deeeddf: am 523bcc06: am 380851fd: Merge "Fix setRippleColor on FloatingActionButton" into lmp-mr1-ub-dev

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

res

am ca92a70a: am 6ccc92a3: am c13c14c1: am 39dcb8e6: Merge "Fix NavigationView\'s text appearance" into lmp-mr1-ub-dev

2016-12-09 18:17:33 -08:00

res-public/values

am 1b5d11f9: am 10597477: Merge "FloatingActionButton border" into mnc-dev

2016-12-09 18:15:53 -08:00

src

am 5d774a17: am 1243f6f3: am 762955b3: am af016cf1: Merge "Fix for menu XML ending with a sub menu" into lmp-mr1-ub-dev

2016-12-09 18:18:35 -08:00

Android.mk

am ab2f1834: am da94c144: Merge "Use doclava\'s new stubpackages wildcard support" into mnc-dev

2016-12-09 18:14:35 -08:00

AndroidManifest.xml

Merge "Design support library skeleton"

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

build.gradle

am 8d16ad81: am dae3fa20: Declare design-lib\'s public resources

2016-12-09 18:14:57 -08:00

LICENSE

Merge "Design support library skeleton"

2016-12-09 17:54:54 -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%