58 Commits

Author SHA1 Message Date
Chris Banes
ff6063c1db Fix SDK int check in TextInputLayout
am: bdb210a

* commit 'bdb210a52ce1966368f534253822f15a8591a74f':
  Fix SDK int check in TextInputLayout

Change-Id: I9a59cb7994f422c838a44ed4311da459d0f75203

GitOrigin-RevId=ebb9b8cfda9e643d77e3bf15ed10efd2ae55227e

PiperOrigin-RevId: 140560726
2016-12-12 15:53:51 -08:00
Adam Lesinski
ac75324568 Merge "Build support libs with AAPT2" into nyc-dev
GitOrigin-RevId=cb461c15a1f928b54db6e3972cfabbf559e8b22d

PiperOrigin-RevId: 140560554
2016-12-12 15:53:22 -08:00
Adam Lesinski
893c70e715 Merge "Revert "Build support libs with AAPT2"" into nyc-dev
GitOrigin-RevId=bba78041485f18297695b1b4d3f1245453f8b30c

PiperOrigin-RevId: 140560522
2016-12-12 15:53:14 -08:00
Adam Lesinski
9bbeff1507 Merge "Build support libs with AAPT2" into nyc-dev
GitOrigin-RevId=920dacfbd0a6d9ca0195439d9baa750aee3230b9

PiperOrigin-RevId: 140560512
2016-12-12 15:53:09 -08:00
Adam Lesinski
dbc997a218 Revert "Build support libs with AAPT2"
This reverts commit 0dac8d82e2a249d7c9c42ab259389e11cac15400.

Change-Id: I830fb18162b6eea8dde9e38f9dc39b02449ec846

GitOrigin-RevId=4ac91fa3f14db2f25345595fb921497c11d4e5c0

PiperOrigin-RevId: 140560479
2016-12-12 15:52:52 -08:00
Adam Lesinski
ecc159f2e4 Build support libs with AAPT2
Use AAPT2 to build the framework support libraries. Apps built with AAPT2 can more efficiently
link against these libraries by specifying their module name in LOCAL_STATIC_ANDROID_LIBRARIES.

Ex:

LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v7-appcompat android-support-v4

Apps built with AAPT2 do not need to specify --auto-add-overlay or --extra-packages, as these
are automatically added as needed by the build system.

This change will not affect any apps that currently depend on the support libraries.
This is because they import the resources directly.

We use LOCAL_JAR_EXCLUDE_FILES := none only to support javac when building javadoc.
Jack builds are correct because the build system passes in the latest generated R.java
ahead of any previous ones packaged in classes.jack. This means we can dynamically reference
a support lib module, correctly seeing non-final R.java. Then at app package time, we only
include the final R.java generated by the AAPT2 packaging step.

Bug:25958912
Change-Id: I71bff080ff2694aa3df1c8a67d933e2daab0f245

GitOrigin-RevId=0dac8d82e2a249d7c9c42ab259389e11cac15400

PiperOrigin-RevId: 140560475
2016-12-12 15:52:48 -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
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
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
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
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
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
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
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
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
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
Chris Banes
d344f52414 Merge "Fix error colours in design lib" into mnc-ub-dev am: c37d0d5de3
am: ef445d0c1b

* commit 'ef445d0c1bed0992dcabfada1f96fea1b131b5bf':
  Fix error colours in design lib

GitOrigin-RevId=325ee6357c68ff444db3a9f8f0cbc3cf6ecdee82

PiperOrigin-RevId: 140559810
2016-12-12 15:48:26 -08:00
Chris Banes
b3cb50eed9 Merge "Add TextInputEditText to accompany TextInputLayout" into mnc-ub-dev am: 180941a683
am: af72dfa539

* commit 'af72dfa53964090135feb55d5d53d4eecb6bb0a8':
  Add TextInputEditText to accompany TextInputLayout

GitOrigin-RevId=52aa1ed4e3fb95efd29d8006a6dac1740aa79abe

PiperOrigin-RevId: 140559521
2016-12-12 15:46:19 -08:00
Chris Banes
8e009c85c7 Merge "Don\'t update hint color when error is shown" into mnc-ub-dev am: 78714f9ddc
am: 8fbdbc71af

* commit '8fbdbc71af44387ffb51dd224e8e0ba1c0c943e2':
  Don't update hint color when error is shown

GitOrigin-RevId=4d3d15fe0c07bfdb12c9f575f48a273f9955a6e1

PiperOrigin-RevId: 140559299
2016-12-12 15:44:20 -08:00
Aurimas Liutikas
0719b6ab15 Merge "Revert "Fix build.""
GitOrigin-RevId=085f30f971b173fe61d0051f0cdfd99204e6ac0d

PiperOrigin-RevId: 140551454
2016-12-12 15:43:52 -08:00
Aurimas Liutikas
09c07fa619 Merge "Remove unused private method in TextInputLayout." into mnc-ub-dev
am: e880f08818

* commit 'e880f0881830661ad651452661800f0a10da4795':
  Remove unused private method in TextInputLayout.

GitOrigin-RevId=88626418f023a5239a3d6a22f38d24fefe0c32bc

PiperOrigin-RevId: 140551449
2016-12-12 15:43:48 -08:00
Rakesh Iyer
da973f73d2 Fix build.
Change-Id: I851e17f04b5abc6a42f8d80abe1c222bae775396

GitOrigin-RevId=35e628bed4884c70e63d3d963812999090539000

PiperOrigin-RevId: 140551442
2016-12-12 15:43:44 -08:00
Aurimas Liutikas
932bf722a7 Merge "Start saving TextInputLayout error state."
GitOrigin-RevId=00938ab5050d4b16f3448ff731c467c27de1cb63

PiperOrigin-RevId: 140551436
2016-12-12 15:43:40 -08:00
Chris Banes
ac99efc3d2 Merge "Refactor the error state" into mnc-ub-dev
am: ae72ad4680

* commit 'ae72ad46806851173c83faf1d053d508b84a6370':
  Refactor the error state

GitOrigin-RevId=85f9fd6866aa5503d7919e709b4230ef13a7ff61

PiperOrigin-RevId: 140551418
2016-12-12 15:43:36 -08:00
Chris Banes
2702850fee Merge "Don\'t animate TIL error if we\'ve been given the same error" into mnc-ub-dev am: 23746a567d
am: ba8b9946e9

* commit 'ba8b9946e9f9973575adae7e8eb601ccbce5850d':
  Don't animate TIL error if we've been given the same error

GitOrigin-RevId=a454cd7eeb61bf0584823aaa626cb091a5bac32e

PiperOrigin-RevId: 140551407
2016-12-12 15:43:32 -08:00
Chris Banes
51c46cea02 Merge "Ensure that the indicator area is set to GONE" into mnc-ub-dev
am: 2d8ab49700

* commit '2d8ab49700e81b075f7e1a421aad9f2380549675':
  Ensure that the indicator area is set to GONE

GitOrigin-RevId=dce94a73f4492051683faa1416d7dd78c636af99

PiperOrigin-RevId: 140551375
2016-12-12 15:43:15 -08:00
Chris Banes
a366c0ffad Merge "Workaround TextInputLayout state changes becoming permanent" into mnc-ub-dev am: 459155dd30
am: 810efa6b4f

* commit '810efa6b4ffc687db1cfe717f690afe0612920d1':
  Workaround TextInputLayout state changes becoming permanent

GitOrigin-RevId=962f72d4691edb762f658a92fb971bc559ba18e6

PiperOrigin-RevId: 140551357
2016-12-12 15:43:08 -08:00
Chris Banes
5f7a9cadc6 Merge "Add setHintEnabled to TextInputLayout" into mnc-ub-dev am: f6b1b744cf
am: 9e5374f5c6

* commit '9e5374f5c6f1761f0b52f5031d9ebdd89ebc53db':
  Add setHintEnabled to TextInputLayout

GitOrigin-RevId=8c32bb6c5e95cb6bf4ccd98c7872ea7b87f805e3

PiperOrigin-RevId: 140551315
2016-12-12 15:42:48 -08:00
Chris Banes
a1e975c846 resolve merge conflicts of fcd014d478 to master.
Change-Id: I58e8f555a0fa0374b11705417f8f325eb1b245a4

GitOrigin-RevId=85124975351edf106f8c9320af338ca14e28e192

PiperOrigin-RevId: 140551243
2016-12-12 15:42:20 -08:00
Chris Banes
d2162a238b Merge "Fixes for TextInputLayout" into mnc-ub-dev am: 5db2eb25a6
am: 1111ad31e6

* commit '1111ad31e6cefffd8a14d7fa4724a14d47112a92':
  Fixes for TextInputLayout

GitOrigin-RevId=ae8119e4d4d6afe1ec07819715f31c0a57a71e4a

PiperOrigin-RevId: 140551230
2016-12-12 15:42:16 -08:00
Yuichi Araki
bd85058f70 Merge "Add isCounterEnabled to TextInputLayout" into mnc-ub-dev am: f521aa09cc
am: cbcc10866a

* commit 'cbcc10866a22e70d6ea4f6b46fa1fb0bd1badd77':
  Add isCounterEnabled to TextInputLayout

GitOrigin-RevId=e93b67d84d6390d9ed1e718ec65f1d05f1a00c0a

PiperOrigin-RevId: 140551216
2016-12-12 15:42:12 -08:00
Chris Banes
27c2380c36 am d86d82fc: am dce72ecc: Merge "Add @attr links to TextInputLayout" into mnc-ub-dev
* commit 'd86d82fc05cbb3ade2fa77e2640fe2c64ef5cb61':
  Add @attr links to TextInputLayout

GitOrigin-RevId=f5fbe0a00d33b2fd1239b00fa4e690b9b4884c44

PiperOrigin-RevId: 140551067
2016-12-12 15:40:50 -08:00
Chris Banes
dfae41da7d am f1f9e992: am 08ce6ecd: Merge "Add AppCompatDrawableManager" into mnc-ub-dev
* commit 'f1f9e992e3d6c330d12b6b1afa13e87f8b5728d5':
  Add AppCompatDrawableManager

GitOrigin-RevId=b69b2623e94d82f3073379e3e4d5cd2968b68970

PiperOrigin-RevId: 140550505
2016-12-12 15:40:38 -08:00
Chris Banes
b693c62b6e am c6fccd68: am e667a567: Merge "Use the correct interpolators in the design lib" into mnc-ub-dev
* commit 'c6fccd6842d28bdedea425ab1e0c947e2e1a41bc':
  Use the correct interpolators in the design lib

GitOrigin-RevId=eda4412df4b985c54913b1ba9dff1ce4d4883cf5

PiperOrigin-RevId: 140550492
2016-12-12 15:40:34 -08:00
Chris Banes
7262492bcc am 7e8afaf9: am e25a0992: Merge "Accessibility improvements for design lib" into mnc-ub-dev
* commit '7e8afaf9471d2ae988ae82b0d4093a4f82abf4ea':
  Accessibility improvements for design lib

GitOrigin-RevId=347536e8c751179028aa926e48e3e55d038fd37d

PiperOrigin-RevId: 140550280
2016-12-12 15:39:48 -08:00
Chris Banes
c3c75f7277 am f2093cd5: am 99e52876: Merge "Improve typeface support in the collapsing text widgets" into mnc-ub-dev
* commit 'f2093cd5774b9cda59ff146c85cbeb792db65945':
  Improve typeface support in the collapsing text widgets

GitOrigin-RevId=1ff4d4f7470a44dff84f6848d3e2678a7919f594

PiperOrigin-RevId: 140550119
2016-12-12 15:38:59 -08:00
Yuichi Araki
6e3b920cc1 am c14d808e: am 0e245015: Merge "Add support for character counter" into mnc-ub-dev
* commit 'c14d808e6c599ea34990583359ef1d4c4c1640b0':
  Add support for character counter

GitOrigin-RevId=7a91a5d0a7de9fc24d0ca45dfdad96761a2f0200

PiperOrigin-RevId: 140550112
2016-12-12 15:38:55 -08:00
Chris Banes
cfffaeecb6 am 83e60f1b: am bca00ffa: Merge "Make sure that we reset the EditText backgroud tint" into mnc-ub-dev
* commit '83e60f1bbb345b753d49613687ef4bb3976dcd84':
  Make sure that we reset the EditText backgroud tint

GitOrigin-RevId=b3140f0b62e15e7d4f548e9efe1538907d0a1194

PiperOrigin-RevId: 140550025
2016-12-12 15:38:39 -08:00
Chris Banes
a3a1436360 am 196d47bb: am f13ba46d: Merge "Make TextInputLayout\'s error handling spec compliant" into mnc-ub-dev
* commit '196d47bb101ff476c3f8fd565152bfa80408b0a3':
  Make TextInputLayout's error handling spec compliant

GitOrigin-RevId=4366f8a0eecbf1e90ea06d94e7c09b57ea1c1f6c

PiperOrigin-RevId: 140549772
2016-12-12 15:38:16 -08:00
Chris Banes
d647bf661d am 06b2a856: am 2fe4d11a: am fe624405: am a1579263: am 51252b97: Merge "Fix TextInputLayout not displaying RTL hint correctly" into mnc-dev
* commit '06b2a856e5ad3f7502254326b364a5d5a70e7081':
  Fix TextInputLayout not displaying RTL hint correctly

GitOrigin-RevId=056d2a8b39db63e7c2cd8c2d69e05525b280f5c6

PiperOrigin-RevId: 140549563
2016-12-12 15:37:12 -08:00
Chris Banes
d907dd4deb am 2dd67ac0: am 8c6f2081: Merge "Add more helpful exception to design components" into mnc-ub-dev
* commit '2dd67ac062eb7f7a9a83e4f864eb27b15f416f48':
  Add more helpful exception to design components

GitOrigin-RevId=65fb4571ce472e3ea5d654f51025bb84925f5b22

PiperOrigin-RevId: 140549518
2016-12-12 15:37:04 -08:00
Chris Banes
8d07f5e32a am 0aea210f: am 9c217b58: Merge "Actually use the hint provided from attrs" into mnc-ub-dev
* commit '0aea210fd6897076813d10451ffdef4437b9ed4d':
  Actually use the hint provided from attrs

GitOrigin-RevId=5f4791e3d581a759c7df1495e73832eb48dbbb74

PiperOrigin-RevId: 140549476
2016-12-12 15:36:52 -08:00
Chris Banes
8fc15e7365 am b01f3277: am 44cdbbe5: am ac806a0d: am 763ba64f: am ca560df9: Merge "Some fixes for TextInputLayout" into mnc-dev
* commit 'b01f32778faaf695307f0a1400587726a31c860e':
  Some fixes for TextInputLayout

GitOrigin-RevId=fc129d8cd5a2b65e94592e4db2fdc9ddc6666c7c

PiperOrigin-RevId: 140549457
2016-12-12 15:36:44 -08:00
Chris Banes
6d12b2df86 am 17c194e2: am 07f75828: am 45049689: am f72ee1a4: am 1bb61e03: am eb344aa3: Merge "TextInputLayout fixes" into lmp-mr1-ub-dev
* commit '17c194e278b4468cdd715f1969685711e39a6d50':
  TextInputLayout fixes

GitOrigin-RevId=b56067e8de4c981094c776cd3b395e3bb2091dd5

PiperOrigin-RevId: 140549343
2016-12-12 15:35:55 -08:00
Chris Banes
c79b3efec5 am f15a504d: am d7054941: am 7755e9f2: am 0086f850: am 6b824bec: Merge "Expand TextInputLayout\'s API with more getters/setters" into lmp-mr1-ub-dev
* commit 'f15a504d49dd667ef721daf8a7b6b9a6f853f809':
  Expand TextInputLayout's API with more getters/setters

GitOrigin-RevId=0dfcf4cab30e1a401a3c19deaac4cb464655dd32

PiperOrigin-RevId: 140549261
2016-12-12 15:35:39 -08:00
Chris Banes
b4ee70dbe0 am ae664fb2: am 07ef8d70: am 96bc327c: am 09afab5f: am dbd769d8: Merge "Remove the need for using a OnFocusChangeListener" into lmp-mr1-ub-dev
* commit 'ae664fb2a3fba18a6146cb85f11b120995530094':
  Remove the need for using a OnFocusChangeListener

GitOrigin-RevId=a69abfd455e01f6134a9bd5739c8e3ddb988248b

PiperOrigin-RevId: 140549221
2016-12-12 15:35:19 -08:00
Chris Banes
2101353fe0 am f2d26678: am da411a43: am ddd03148: am b9c88620: Merge "Setters for CollapsingToolbarLayout title gravity" into lmp-mr1-ub-dev
* commit 'f2d266785d6d29a1655b15d0aa8b41a565c1fc65':
  Setters for CollapsingToolbarLayout title gravity

GitOrigin-RevId=c75300f13b396cdc6f9b181442f67ec471e2c2a5

PiperOrigin-RevId: 140549140
2016-12-09 18:21:33 -08:00
Chris Banes
4767cc6703 am 4ca9b32e: am 3a1cecba: am 75ad9350: am 1832f6e4: Fix TextInputLayout setErrorEnabled() NPE
* commit '4ca9b32eed404090112f8879abcaa4901c6f1712':
  Fix TextInputLayout setErrorEnabled() NPE

GitOrigin-RevId=79e5e5a3ee00d2b8f6499e8b5dde91e0670e4703

PiperOrigin-RevId: 140549060
2016-12-09 18:21:10 -08:00
Chris Banes
da424be914 am b71d35cd: am 5baf672a: am 1f9bc6c1: am ca21b5bb: Merge "Drag in the EditText\'s hint colors in TextInputLayout" into lmp-mr1-ub-dev
* commit 'b71d35cd7ae512b5d218babb5c3599cb24b069ca':
  Drag in the EditText's hint colors in TextInputLayout

GitOrigin-RevId=a30ec1e2eb23acbdb3ca3691eb6287aa0427334c

PiperOrigin-RevId: 140548957
2016-12-09 18:20:03 -08:00