Yuichi Araki
e89eec227d
Merge "Fix layout when BottomSheet is moving" into nyc-dev
...
GitOrigin-RevId=1d321c85887197738dca2465b679c5258756b9a2
PiperOrigin-RevId: 140560468
2016-12-12 15:52:44 -08:00
Yuichi Araki
dce18cd5dc
Merge "Fix setState with the current state" into mnc-ub-dev
...
am: c5f5f85
* commit 'c5f5f85c1323787b2dc692af2dbd3efc804d5034':
Fix setState with the current state
Change-Id: Ifbbadcb2f888adcfe29b776a3ab363e88fbe6885
GitOrigin-RevId=4f0c8201b8c02def322843f180b86e0ea466e650
PiperOrigin-RevId: 140560466
2016-12-12 15:52:40 -08:00
Chris Banes
d26cc78b39
Merge "Use the EditText\'s gravity for TextInputLayout" into mnc-ub-dev
...
am: 0c098da
* commit '0c098da66d0c9c2566d5353fd4a38cd8a2d9a9d7':
Use the EditText's gravity for TextInputLayout
GitOrigin-RevId=2b84e6781ea06c6139bbeab062f1248d3819fcc7
PiperOrigin-RevId: 140560453
2016-12-12 15:52:36 -08:00
Yuichi Araki
7afa2a32d3
Merge "BottomSheetBehavior#setState before layout" into mnc-ub-dev
...
am: 9203384
* commit '9203384c85914e13350d72a0111d6eab1551aad0':
BottomSheetBehavior#setState before layout
GitOrigin-RevId=a5c4f9fb6b571c6694b2d996ccd89d9c9cf06cf0
PiperOrigin-RevId: 140560447
2016-12-12 15:52:32 -08:00
Taeho Kim
d9eccb5225
Merge "Fix NPE when calling setState() before onLayoutChild()" into mnc-ub-dev
...
am: 93978d0
* commit '93978d066bab7f16175573c1b58c5449284fad6d':
Fix NPE when calling setState() before onLayoutChild()
GitOrigin-RevId=2d72783642304f1397b9740359594d26c11ada3f
PiperOrigin-RevId: 140560442
2016-12-12 15:52:28 -08:00
Chris Banes
d09f67fab2
Fix FloatingActionButton doc build
...
Change-Id: Ia1becbc40d7dfac61fd88ea16da4fbe149fc8c68
GitOrigin-RevId=56f0ad8d4fa234d2801971042ff1d71aba960e37
PiperOrigin-RevId: 140560428
2016-12-12 15:52:24 -08:00
Chris Banes
0dd6fc7b1e
Merge "Fix TextInputLayout clearing the EditText tint" into mnc-ub-dev
...
am: 403e480
* commit '403e4802cae0b5354cac650f26e1a4f5e74b696c':
Fix TextInputLayout clearing the EditText tint
GitOrigin-RevId=5b52850af5eb41669b8b741518d316b40be9d676
PiperOrigin-RevId: 140560422
2016-12-12 15:52:20 -08:00
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
Chris Banes
78c20c89c0
Merge "Make FAB react to window size" into nyc-dev
...
GitOrigin-RevId=94cdf63dbb45423fdc219835e30ae02d39027409
PiperOrigin-RevId: 140560414
2016-12-12 15:52:12 -08:00
Yuichi Araki
3019804e6f
Merge "BottomSheetBehavior now handles fitsSystemWindows" into mnc-ub-dev
...
am: 29bbfda
* commit '29bbfdab23a202edb76fe87897f6e3b8a7c2d131':
BottomSheetBehavior now handles fitsSystemWindows
GitOrigin-RevId=2d42022740a6d622d6f7d1ccca7b91b90eb63d28
PiperOrigin-RevId: 140560406
2016-12-12 15:52:08 -08:00
Chris Banes
3d94665430
Merge "Fix AppBarLayout enterAlwaysCollapsed with inset window" into mnc-ub-dev
...
am: 6002db9
* commit '6002db956d178d96f755f70826b92f24405de65b':
Fix AppBarLayout enterAlwaysCollapsed with inset window
GitOrigin-RevId=18dee0438f1e5b61da88275e769376a68994d766
PiperOrigin-RevId: 140560263
2016-12-12 15:52:02 -08:00
Chris Banes
14425b5298
Merge "Disable Snackbar animations if necessary" into mnc-ub-dev
...
am: 3b591d5
* commit '3b591d566e2242881b149bc43d60dc4cbd374392':
Disable Snackbar animations if necessary
GitOrigin-RevId=12113fa03c02662190617538e3e11d7aaa705654
PiperOrigin-RevId: 140560260
2016-12-12 15:51:58 -08:00
Kirill Grouchnikov
b614838d8d
mutate() the background of TextInputLayout's editor on changes.
...
Otherwise the currently tinted background will be used for the next
inflated TextInputLayout.
Bug: 27694398
Change-Id: I6772ab9b58e98675f7b9535d54ef30001d8b3df4
GitOrigin-RevId=0f6a807ceaa96930e57e55826ddaae5eab692aa8
PiperOrigin-RevId: 140560259
2016-12-12 15:51:54 -08:00
Kirill Grouchnikov
55d5777625
Merge "Integration tests covering anchoring with margins in CoL." into nyc-dev
...
GitOrigin-RevId=b893459a2e916cc957e7a638e9afdb4a1aca3c78
PiperOrigin-RevId: 140560254
2016-12-12 15:51:50 -08:00
Kirill Grouchnikov
2d2074372d
Merge "Fix selection state for custom views on TabLayout" into nyc-dev
...
GitOrigin-RevId=5034e5a407b4b7014e1dc9b09accb99f8a5b0a8d
PiperOrigin-RevId: 140560244
2016-12-12 15:51:46 -08:00
Aurimas Liutikas
199bb6c5ed
Check for saved state type in onRestoreInstanceState.
...
am: bb58a82
* commit 'bb58a82daf11bf3c056d1cd5887aa26435d37b69':
Check for saved state type in onRestoreInstanceState.
GitOrigin-RevId=7541e4bfa0c9fff31bcb12fc5a94365565388715
PiperOrigin-RevId: 140560234
2016-12-12 15:51:42 -08:00
Alan Viverette
7a288326fd
Merge "Revert "Revert AppCompat's use of VDC" for v24 preview #2 " into nyc-dev
...
GitOrigin-RevId=a0dc834f6687dd7977c6924116b80c3d94f87666
PiperOrigin-RevId: 140560223
2016-12-12 15:51:38 -08:00
Yuichi Araki
582c6d2d0c
Merge "Fix BottomSheetBehavior drag condition" into mnc-ub-dev
...
am: 5eb3e45db9
* commit '5eb3e45db9cb0cdcd20dac450d9408f31ae375c2':
Fix BottomSheetBehavior drag condition
GitOrigin-RevId=c4b238e1a082c985d1354bdb232a657e60bc71f2
PiperOrigin-RevId: 140560219
2016-12-12 15:51:34 -08:00
Chris Banes
85690d34c1
Merge "Add overload for setupWithViewPager()" into nyc-dev
...
GitOrigin-RevId=6da2fc54652547d6bdba7ae1bed46177af2a268d
PiperOrigin-RevId: 140560215
2016-12-12 15:51:30 -08:00
Alan Viverette
5c2ec53dc5
Merge "Lazily create cancelEvent in CoordinatorLayout.performIntercept()" into nyc-dev
...
GitOrigin-RevId=7aaa878e2e8dd85576041f410cedb0e9dd162bfa
PiperOrigin-RevId: 140560198
2016-12-12 15:51:25 -08:00
Alan Viverette
791de068da
Merge "Unparcel TextInputLayout error using CHAR_SEQUENCE_CREATOR" into mnc-ub-dev
...
am: 72fe2e3b25
* commit '72fe2e3b256965c9a784cd91775e03706d9f393e':
Unparcel TextInputLayout error using CHAR_SEQUENCE_CREATOR
GitOrigin-RevId=219002589d8a45a7d034af08335c535228eaea0c
PiperOrigin-RevId: 140560184
2016-12-12 15:51:21 -08:00
Alan Viverette
a52c3beaab
Merge "Verify class of Parcelable in CoordinatorLayout restore state" into mnc-ub-dev
...
am: 742a876bb4
* commit '742a876bb42a13f152cd34987aa5c8b5bddd7ecf':
Verify class of Parcelable in CoordinatorLayout restore state
GitOrigin-RevId=0e80971eca90c8b1d470f3804bfb006803ec50fd
PiperOrigin-RevId: 140560175
2016-12-12 15:51:17 -08:00
Chris Banes
9d77b411ec
Revert AppCompat's use of VDC
...
It causes too many problems from a build perspective
for now. External developers can still use <vector>
drawables through AppCompat, it's just that the library
does not use them itself, and therefore force developers
to update their build config.
BUG: 27453786
Change-Id: Ie4ed9d213d9dcbcce622fe82c92808da19a78ed0
GitOrigin-RevId=000c3b61b4f8a8e96060aeef662eb728101b83b9
PiperOrigin-RevId: 140560162
2016-12-12 15:51:13 -08:00
Chris Banes
2154ff6d0a
Merge "Fix crash in TextInputLayout\'s counter view" into mnc-ub-dev
...
am: a36552183a
* commit 'a36552183a21899f5a4b09aec03931dae99bdc72':
Fix crash in TextInputLayout's counter view
GitOrigin-RevId=57e22e067f262010469adae2acfa029597c417b1
PiperOrigin-RevId: 140560144
2016-12-12 15:51:09 -08:00
Kirill Grouchnikov
03d235826f
Merge "Adding test scenario for parallax scrolling in AppBarLayout." into nyc-dev
...
GitOrigin-RevId=6f886fe6a4e9fc2d36f92d3542f0ff3a3208cfb9
PiperOrigin-RevId: 140560136
2016-12-12 15:51:05 -08:00
Kirill Grouchnikov
cd37c39b89
Add test for snapping behavior of AppBarLayout
...
Also fix bug for incomplete snapping on older devices.
Bug: 27408006
Change-Id: I47fda88c2d7f1bf5ba230e9f7937b2fd05e72282
GitOrigin-RevId=c530cc115fddab8e1d9645b322424dd45f9ecd0d
PiperOrigin-RevId: 140560121
2016-12-12 15:50:59 -08:00
Yuichi Araki
7ed2147249
Merge "Fix BottomSheetDialog when it is short" into mnc-ub-dev
...
am: 7cf2a13442
* commit '7cf2a134424e8d7a5095f0df1749bfe871dabb8a':
Fix BottomSheetDialog when it is short
GitOrigin-RevId=bec43dcc29fb7a3494139b470b0481106e1973a9
PiperOrigin-RevId: 140560111
2016-12-12 15:50:55 -08:00
Yuichi Araki
733adaaf09
Merge "Reduce talkback for the character counter" into mnc-ub-dev
...
am: ed26bb259a
* commit 'ed26bb259a74cbea495d38ca562ada0723f76551':
Reduce talkback for the character counter
GitOrigin-RevId=37b386a83b3f0ce00d0c734973594ac930466a1b
PiperOrigin-RevId: 140560106
2016-12-12 15:50:51 -08:00
Chris Banes
e56f48f9c2
Merge "Don't always use window insets in AppBarLayout" into nyc-dev
...
GitOrigin-RevId=35d2c3f6de240d5f154552dbe5c247d0e5607e61
PiperOrigin-RevId: 140560095
2016-12-12 15:50:47 -08:00
Chris Banes
3c6b9a2fed
Merge "Fix FloatingActionButton.setBackgroundTint* not working" into mnc-ub-dev
...
am: 0960724273
* commit '0960724273891c9f7a9e2f2f6397c0389747b36e':
Fix FloatingActionButton.setBackgroundTint* not working
GitOrigin-RevId=0f268e050ac69084f9e00bfb149735239704c101
PiperOrigin-RevId: 140560089
2016-12-12 15:50:43 -08:00
Yuichi Araki
19b779cce7
Merge "Fix idling resource in swipe test" into mnc-ub-dev
...
am: 1f09d40c1f
* commit '1f09d40c1f3acf471986affd6117857c719ec07a':
Fix idling resource in swipe test
GitOrigin-RevId=be4665eec16e9158dce5316f9d0a3a9e3cec8f05
PiperOrigin-RevId: 140560080
2016-12-12 15:50:38 -08:00
Chris Banes
19437b21ee
Merge "Revert "Use colorControlActivated for an active item"" into mnc-ub-dev
...
am: d0d6eb2423
* commit 'd0d6eb2423ee219f83738f335ed8be9b9153cc01':
Revert "Use colorControlActivated for an active item"
GitOrigin-RevId=430d86cbc4754c85aca378b0642f14c256e4f933
PiperOrigin-RevId: 140560077
2016-12-12 15:50:34 -08:00
Chris Banes
5129412ff2
Merge "Don\'t always use window insets in AppBarLayout" into mnc-ub-dev
...
am: 1dc40ada0a
* commit '1dc40ada0a0195df70cad1a3f1c8ebd43e75f5d6':
Don't always use window insets in AppBarLayout
GitOrigin-RevId=d16802005fe16fb8290dd514611b1554d0db6682
PiperOrigin-RevId: 140560074
2016-12-12 15:50:30 -08:00
Chris Banes
d0492a847d
Merge "Tidy up TextInputLayout.setError()" into nyc-dev
...
GitOrigin-RevId=a3f9d4d786427afc96bc48bebd9304c56d41a7c3
PiperOrigin-RevId: 140560069
2016-12-12 15:50:26 -08:00
Chris Banes
f0ab6a6c3a
Add add/remove methods for TabLayout's selection listener
...
Allows us to use an internal listener without fear of
an external developer wiping it out. Deprecated the
old set version.
BUG: 27351323
Change-Id: Iac693d1289327047d5529415e6f83f5c472a1499
GitOrigin-RevId=6f9a84a7424c822c628fd0d7ebfaf6abf1656155
PiperOrigin-RevId: 140560060
2016-12-12 15:50:22 -08:00
Chris Banes
6dad4607e8
resolve merge conflicts of c16e4c6eec to nyc-dev
...
Change-Id: Ic309b7bbeb3c89e4e73f09b5806b566d004e0250
GitOrigin-RevId=84549395ed3e2ec0453f7349716a12eab9901703
PiperOrigin-RevId: 140560055
2016-12-12 15:50:18 -08:00
Chris Banes
f79f52fd2a
Merge "Revert "Add add/remove methods for TabLayout's selection listener"" into nyc-dev
...
GitOrigin-RevId=989955e674e6cad59fdcf4c0e3cdf9510b2c49d0
PiperOrigin-RevId: 140560047
2016-12-12 15:50:14 -08:00
Chris Banes
ff66f415e3
Merge "Add add/remove methods for TabLayout's selection listener" into nyc-dev
...
GitOrigin-RevId=005faae5801a9b93a33b5810c001095cc24b983b
PiperOrigin-RevId: 140560040
2016-12-12 15:50:09 -08:00
Neil Fuller
34ebfeb5ea
Pin support libraries to Java 1.7 so they can be used with dx
...
The .jar artifacts must contain v51 class files to prevent them
being rejected by dx.
Bug: 26753820
Bug: 27353172
Bug: 27338966
Change-Id: I03a881a86bb6e3fcaa4ccb33e6c0615157ee363f
GitOrigin-RevId=e1cd5a1f80010eece43cb4608505fd39f4832c00
PiperOrigin-RevId: 140560035
2016-12-12 15:50:02 -08:00
Chris Banes
06d44377be
Fix FAB and background attrs again
...
am: d95e0bb027
* commit 'd95e0bb0271ae59387dd9d2ca402ad6f39d789d2':
Fix FAB and background attrs again
GitOrigin-RevId=ccfe45bc4d8090bc9283f3d8dcbfc5497da273e8
PiperOrigin-RevId: 140560026
2016-12-12 15:49:58 -08:00
Chris Banes
76f08c75ad
Merge "Revert "Add default style attrs for design components"" into nyc-dev
...
GitOrigin-RevId=67bad837194c39a022050c45379ef14f0ad074ff
PiperOrigin-RevId: 140560016
2016-12-12 15:49:53 -08:00
Chris Banes
298b9aee0f
Add default style attrs for design components
...
BUG: 27285523
Change-Id: Id19144f3fe58fe61ea132c2ca4fbf2cda5595277
GitOrigin-RevId=7e268c7de8bb10fc24ddda5d237d5cc5ce3b591b
PiperOrigin-RevId: 140560001
2016-12-12 15:49:49 -08:00
Chris Banes
0e1d9c47de
Merge "Make TabLayout scroll to the current ViewPager page" into nyc-dev
...
GitOrigin-RevId=b878a92b54fd2c0c05bbf2a7fe45592bfaaf02de
PiperOrigin-RevId: 140559984
2016-12-12 15:49:44 -08:00
Chris Banes
95fe9803b0
Merge "Nested scroll over clickable items on BottomSheet" into mnc-ub-dev
...
am: 8feab4189f
* commit '8feab4189ff169a7d954ceb77ca901760134a8fc':
Nested scroll over clickable items on BottomSheet
GitOrigin-RevId=f5b7c33391e9c8191bb4db7091be1c076a2fa7ea
PiperOrigin-RevId: 140559983
2016-12-12 15:49:40 -08:00
Chris Banes
8d6a29b66a
Merge "Update AppCompat + Design public declarations" into mnc-ub-dev
...
am: f2597e6bbd
* commit 'f2597e6bbd17bb3c0c44f4ef9aaffda66cb6d80f':
Update AppCompat + Design public declarations
GitOrigin-RevId=2e86d9dc7740c92362068d1e029bdb5ccbfa500e
PiperOrigin-RevId: 140559974
2016-12-12 15:49:36 -08:00
Chris Banes
986a3cfb5e
resolve merge conflicts of b928ccefb6 to nyc-dev
...
Change-Id: I966ee45aaa2f8150421d57d8464f03eca47c3c4c
GitOrigin-RevId=df23c413315751774dd83a1d930ae6e83bc21d55
PiperOrigin-RevId: 140559968
2016-12-12 15:49:32 -08:00
Chris Banes
2289e60d74
Merge "Fix crash on L+ when using TextInputLayout" into mnc-ub-dev
...
am: b786d9a334
* commit 'b786d9a33450b42bf937ca193041e35a11be7ca2':
Fix crash on L+ when using TextInputLayout
GitOrigin-RevId=0137c5c3b6a97a48403c3a8eb76919bdb47d27ee
PiperOrigin-RevId: 140559965
2016-12-12 15:49:27 -08:00
Kirill Grouchnikov
644452d2ce
Merge "Adding CoordinatorLayout tests for scrolling / pinning tabs." into nyc-dev
...
GitOrigin-RevId=ecad73bf7dfd67a3a78b9610d76719b794926010
PiperOrigin-RevId: 140559957
2016-12-12 15:49:24 -08:00
Chris Banes
19311ec2d4
Merge "fix clickable area of FAB on pre-Lollipop devices"
...
GitOrigin-RevId=d5d3213d80be767482a89bea6d073006582e2bcc
PiperOrigin-RevId: 140559951
2016-12-12 15:49:20 -08:00
Chris Banes
4c209943d2
Fix some rough edges in AppCompat + VDC
...
am: b0f719227b
* commit 'b0f719227b3fa5d5bb7683bd835f7df504fcc733':
Fix some rough edges in AppCompat + VDC
GitOrigin-RevId=9ed5a4831b5396af50687a5935c65cf0e7322577
PiperOrigin-RevId: 140559945
2016-12-12 15:49:15 -08:00