29 Commits

Author SHA1 Message Date
Aurimas Liutikas
510a95e760 Back... TO THE FUTURE!
am: b4586e1ac0

Change-Id: I402cd4135dbbf4d5d4fb0714bc3ba707612f18fb

GitOrigin-RevId=c2b100f3e28e9e478b67b1cd74daecbbf63bb692

PiperOrigin-RevId: 140561156
2016-12-12 15:55:31 -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
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
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
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
c693b45391 Merge "Update support lib to use correct current SDK"
GitOrigin-RevId=6e1afc8f262ff2f1494e07051a058a8427d67952

PiperOrigin-RevId: 140559658
2016-12-12 15:47:33 -08:00
Kirill Grouchnikov
af5540b63a Merge "Initial test setup and simple TabLayout test in design lib" into mnc-ub-dev am: 6f15897288
am: 4d810ce4e3

* commit '4d810ce4e33047ec8f602f10134e673c2ff70736':
  Initial test setup and simple TabLayout test in design lib

GitOrigin-RevId=50e02b9aeae54e15e9278116863688a6623dde27

PiperOrigin-RevId: 140559421
2016-12-12 15:45:16 -08:00
Chris Banes
28ca42bd08 Merge "Fix multi source folder API checking" into mnc-ub-dev am: 4daf2f0ac0
am: 89d70ae8d8

* commit '89d70ae8d8e1238d0bb575be8391752f3c98fb77':
  Fix multi source folder API checking

GitOrigin-RevId=6b2dec972c8e40773bdfa4dee4b038d94852962e

PiperOrigin-RevId: 140551147
2016-12-12 15:41:23 -08:00
Chris Banes
c4b471640f am 5a3a72a9: am 9ec922c2: Fix FAB using ICS APIs on Honeycomb
* commit '5a3a72a99b5d87b3f4d4530ca8d2b0d108eee719':
  Fix FAB using ICS APIs on Honeycomb

GitOrigin-RevId=893cdffb7a013529dd9fde8dcb74b8df1d1fe9f6

PiperOrigin-RevId: 140551128
2016-12-12 15:41:15 -08:00
Yuichi Araki
ba00002ac7 am d61aeb86: am 0a9a4969: Merge "Revert "Revert "Use RecyclerView for NavigationView""" into mnc-ub-dev
* commit 'd61aeb862e2b28885707764c7cc0d40b6f0afd73':
  Revert "Revert "Use RecyclerView for NavigationView""

GitOrigin-RevId=4fd88c3c412d4ce7c34a2a295eeac2cf50825e43

PiperOrigin-RevId: 140550012
2016-12-12 15:38:35 -08:00
Chris Banes
e2d3b46143 am 00699e50: am 3af3cd8e: Merge "Revert "Use RecyclerView for NavigationView"" into mnc-ub-dev
* commit '00699e5067877bb3bbd7bb14986cf406b5b9af34':
  Revert "Use RecyclerView for NavigationView"

GitOrigin-RevId=8ac0be0819063395f63b14956cea678fbcc93815

PiperOrigin-RevId: 140549987
2016-12-12 15:38:31 -08:00
Yuichi Araki
72d44a5a70 am a51925c0: am c7850385: Merge "Use RecyclerView for NavigationView" into mnc-ub-dev
* commit 'a51925c0e9094179d91ceef757d98a6fc9eb3fff':
  Use RecyclerView for NavigationView

GitOrigin-RevId=87f9c127ea653d0865131cef284e468228bd2262

PiperOrigin-RevId: 140549964
2016-12-12 15:38:20 -08:00
Chris Banes
dc3f90a382 am ab2f1834: am da94c144: Merge "Use doclava\'s new stubpackages wildcard support" into mnc-dev
* commit 'ab2f1834be120d4bf00a7861a1e9a57d592c559e':
  Use doclava's new stubpackages wildcard support

GitOrigin-RevId=645600060c3de16ba4fc68dbf1fa7403cd145fcb

PiperOrigin-RevId: 140548355
2016-12-09 18:14:35 -08:00
Chris Banes
d45d59df81 am a196f6c5: Merge "AppBarLayout improvements" into lmp-mr1-ub-dev
* commit 'a196f6c585e08dd962cb14b659790931a6e92e40':
  AppBarLayout improvements

GitOrigin-RevId=0afaaf631e3c992dc4af9d628444f1eee06758a8

PiperOrigin-RevId: 140545874
2016-12-09 18:13:51 -08:00
Chris Banes
b3ddedfa67 am 6eb7c159: Revert "Disable the design lib for the 22.1 release"
* commit '6eb7c159042d9ad2b3150d0af9b3584c961dcca9':
  Revert "Disable the design lib for the 22.1 release"

GitOrigin-RevId=ce00c06a528480f81f06931e361102d3f879d40f

PiperOrigin-RevId: 140545730
2016-12-09 18:13:13 -08:00
Chris Banes
de5bf5cbd5 am d89acaf5: Disable the design lib for the 22.1 release
* commit 'd89acaf5b125a7ef30825151cbee924e7d5c1505':
  Disable the design lib for the 22.1 release

GitOrigin-RevId=0053075bc4a6cc03e8a05bd8cb74f3b9d5922ae0

PiperOrigin-RevId: 140545717
2016-12-09 18:13:08 -08:00
Chris Banes
5b658b047d am f168bfe8: Revert "Disable the design lib for the 22.1 release"
* commit 'f168bfe8ce43395c7a112100312d528f9a27ab55':
  Revert "Disable the design lib for the 22.1 release"

GitOrigin-RevId=c7ea1d498982d3c766631dbafb6bff9031670600

PiperOrigin-RevId: 140545696
2016-12-09 18:12:57 -08:00
Chris Banes
9b75a2eba9 am 81108913: Disable the design lib for the 22.1 release
* commit '81108913ea139c26abfbaac5f559de9e32dc844b':
  Disable the design lib for the 22.1 release

GitOrigin-RevId=4e1c41b66d83672955a69bfe9bb450e37942fed7

PiperOrigin-RevId: 140545691
2016-12-09 18:12:51 -08:00
Chris Banes
e262f4b6fb am 27238d14: Update and check design lib API files
* commit '27238d142f178f9dc071f4bd8e1e7195231b5957':
  Update and check design lib API files

GitOrigin-RevId=9a3a7fad2dab316092746022b0e8d7833df984bd

PiperOrigin-RevId: 140545653
2016-12-09 18:12:46 -08:00
Adam Powell
edcd873a36 am 37803f10: am 69f431ff: am a966c6cd: CoordinatorLayout
* commit '37803f1030d6f02e0194b00ab08df27b7e62f4b1':
  CoordinatorLayout

GitOrigin-RevId=38d11eb0946c89652edf9eafc8cf55a8ac962a2e

PiperOrigin-RevId: 140545349
2016-12-09 18:11:41 -08:00
Chris Banes
5363ad4ee6 am 12b07f88: am 19b2eeaf: Re-add fixed design lib Makefile
* commit '12b07f885f35ceb7add42131362a71f91249eb68':
  Re-add fixed design lib Makefile

GitOrigin-RevId=123689642921b16bc823112f68ff0377116c179f

PiperOrigin-RevId: 140544863
2016-12-09 18:04:36 -08:00
Chris Banes
8eeca004b9 am 48f2d008: am 1be2c4ce: Remove design makefile
* commit '48f2d008b4ab452a4d8c9271afe49c512cbe477a':
  Remove design makefile

GitOrigin-RevId=777ae25208cb878a1138c3f7573b60dbd20112fc

PiperOrigin-RevId: 140544628
2016-12-09 18:03:53 -08:00
Chris Banes
e114b06a07 am 2ccb1350: am ec957eb4: Merge "Floating Action Button" into lmp-mr1-ub-dev
* commit '2ccb1350393621eaac6e179e7c6a8c92372f5eb9':
  Floating Action Button

GitOrigin-RevId=a3f7514a6dc54845de30cbee0253279e76fb72c4

PiperOrigin-RevId: 140544624
2016-12-09 17:56:20 -08:00
chrisbanes
123afae518 Remove design lib makefile
Not needed yet anyway

Change-Id: I74592dba735f79e46b4a660461fc9070ae436133

GitOrigin-RevId=e9edb27d3dc105776f52c35acf0d2a23b5ac80ec

PiperOrigin-RevId: 140542551
2016-12-09 17:55:50 -08:00
chrisbanes
0fa35d17d0 Merge "Design support library skeleton"
GitOrigin-RevId=5b25e71db1d9e5f527cb603b58711d0f8d7a1a60

PiperOrigin-RevId: 140542547
2016-12-09 17:54:54 -08:00