48 Commits

Author SHA1 Message Date
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
a746839748 am 2d53b446: am 9c1a007d: Merge "TabLayout measure performance improvements" into mnc-ub-dev
* commit '2d53b446706991c880ab2ec840d191414b8bdd52':
  TabLayout measure performance improvements

GitOrigin-RevId=722de5c771c6451be50c7c552c115ef1a3b1afd0

PiperOrigin-RevId: 140549658
2016-12-12 15:37:45 -08:00
Chris Banes
aae3438182 am a568e389: am 3a132609: Merge "Update TabLayout to Material Spec" into mnc-ub-dev
* commit 'a568e3895cb632874723a4e9ad78e73741a1a191':
  Update TabLayout to Material Spec

GitOrigin-RevId=693502df34175a94caec214ca3cfcddbb6199201

PiperOrigin-RevId: 140549617
2016-12-12 15:37:24 -08:00
Yuichi Araki
9f71df46b7 am eda6efe0: am 36d347c0: NavigationView now supports app:actionLayout
* commit 'eda6efe09bd3a95af2c3a6b325a37a3826e6664f':
  NavigationView now supports app:actionLayout

GitOrigin-RevId=455e60bc481fc17a3120eae6dad0978210f92b60

PiperOrigin-RevId: 140549445
2016-12-12 15:36:36 -08:00
Chris Banes
af5765e0b3 am 5e600222: am 176c024e: am 97da9578: am 0c7d34bd: am 8ad23944: Merge "Allow CollapsingToolbarLayout\'s title is be disabled" into mnc-dev
* commit '5e600222dffc923d77c0a7114db6bd50bf832c3e':
  Allow CollapsingToolbarLayout's title is be disabled

GitOrigin-RevId=6581bc819804d2d4bfc59b9fbfa99607d2231439

PiperOrigin-RevId: 140549430
2016-12-12 15:36:28 -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
Yuichi Araki
b0d14d0720 am 25b769de: am da2e2715: am ee8e10f5: am 79df1163: am b955ee1e: Make NavigationView scrollbar visible
* commit '25b769de19eec577cd5294c78eda425bd565ec8f':
  Make NavigationView scrollbar visible

GitOrigin-RevId=6e56755278e8c03ffe6c30c077ac7501a54a4151

PiperOrigin-RevId: 140549245
2016-12-12 15:35:27 -08:00
Chris Banes
f1937fea78 am c73cabc2: am 86c36405: am 305057fe: am 8f419d93: am fc829ef7: Merge "Overlay custom TextAppearances rather than nuke" into lmp-mr1-ub-dev
* commit 'c73cabc21cde8a7f324d0faef2c63892ba17dc87':
  Overlay custom TextAppearances rather than nuke

GitOrigin-RevId=48c8ae17e3e809d3644fb969af1e46d7e34e75dd

PiperOrigin-RevId: 140549236
2016-12-12 15:35:23 -08:00
Chris Banes
84a7653c81 am cbb0b14c: am dace5eb5: am 3814cf37: am 80b7fc1f: Merge "Use Button for Snackbar\'s action" into lmp-mr1-ub-dev
* commit 'cbb0b14cdd0a9b7f4a3d6fa2d4ca7594af60e9a7':
  Use Button for Snackbar's action

GitOrigin-RevId=dc233a122241c88e5b26f15bbf55aac66860ef8f

PiperOrigin-RevId: 140549204
2016-12-12 15:35:07 -08:00
Chris Banes
873c901ff1 am 2af47f1e: am dbcb805d: am edc34919: am 92f49ee0: Merge "Update default elevation values to spec" into lmp-mr1-ub-dev
* commit '2af47f1ef1eaacad2c97182a48643151fefaee9c':
  Update default elevation values to spec

GitOrigin-RevId=68ff43f3c595e18ced8bd9862b8e971919734144

PiperOrigin-RevId: 140549192
2016-12-12 15:35:01 -08:00
Chris Banes
681bdb564f am c8661e9b: am 1ee83f7c: am 7944dd73: am bb829e3d: Merge "Add APIs to set AppBarLayout to be expanded or not" into lmp-mr1-ub-dev
* commit 'c8661e9b34d4eb8a6f96ffbd7d35dfed0ff40e2a':
  Add APIs to set AppBarLayout to be expanded or not

GitOrigin-RevId=1d1ab069503ab0a7f6ea86ccb15200ea0f0f0ebc

PiperOrigin-RevId: 140549152
2016-12-09 18:21:38 -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
b899270b48 am 1fddbd99: am fe71b8ba: am 025760e0: am 28193403: Merge "Prefix design lib resources to try and avoid conflicts" into lmp-mr1-ub-dev
* commit '1fddbd999c421df6b31108b8094f46b8008feb5b':
  Prefix design lib resources to try and avoid conflicts

GitOrigin-RevId=ee2beb07a131386685ed7dcbb006fd384bac5386

PiperOrigin-RevId: 140549114
2016-12-09 18:21:16 -08:00
Chris Banes
7f9d8779a7 am 660bffe7: am 9dc0278c: am 6f96f0e9: am ea61bdd2: Merge "Fix Snackbar sw600dp gravity" into lmp-mr1-ub-dev
* commit '660bffe70407ba022449a855cb7c711b104db44e':
  Fix Snackbar sw600dp gravity

GitOrigin-RevId=6cfae581f04218dca47aa0732e8613d64620b73e

PiperOrigin-RevId: 140548921
2016-12-09 18:19:42 -08:00
Chris Banes
a4fe57a79c am e5bbf858: am f79ce487: am bc44b866: am 6ca28414: Merge "Make TabLayout more customizable" into lmp-mr1-ub-dev
* commit 'e5bbf858ddc56dd5ce4637bb63db64590358db02':
  Make TabLayout more customizable

GitOrigin-RevId=df738a15738226f28bd8407c71a17fb6e222d6d4

PiperOrigin-RevId: 140548895
2016-12-09 18:19:31 -08:00
Chris Banes
c3c5e74e7a am 9a574b71: am 6dfb913f: am 55e77e6a: am 153fa9a0: Add method to change NavigationView text appearance
* commit '9a574b71a77818195b2ff808135002c7de867400':
  Add method to change NavigationView text appearance

GitOrigin-RevId=9d9ef01ea4c6511396b26f6f4d14cf42b62732df

PiperOrigin-RevId: 140548868
2016-12-09 18:19:14 -08:00
Chris Banes
dded5c795d am 75962f62: am 40202264: am 3de57119: am cc102ca5: Merge "Re-enable border sheen (aka border)" into lmp-mr1-ub-dev
* commit '75962f6207ea6f1404d44d0f75c48f7aa9c13adb':
  Re-enable border sheen (aka border)

GitOrigin-RevId=58ca0d90dbcd10a254eb17bed3dd57ab4d111bd2

PiperOrigin-RevId: 140548857
2016-12-09 18:19:09 -08:00
Chris Banes
8f02c50f98 am ca92a70a: am 6ccc92a3: am c13c14c1: am 39dcb8e6: Merge "Fix NavigationView\'s text appearance" into lmp-mr1-ub-dev
* commit 'ca92a70a1e01c4a856c957e0202785fcf60aac14':
  Fix NavigationView's text appearance

GitOrigin-RevId=21852106da03ab48e9694eb848968b720fd7d7c4

PiperOrigin-RevId: 140548704
2016-12-09 18:17:33 -08:00
Chris Banes
5121b1b672 am bdbc31e3: am 8ce4632e: am 65f10b7f: am 2c638f15: Disable the FAB\'s border for now
* commit 'bdbc31e3bcd6dc4c20e7093724f42b89c732d6ec':
  Disable the FAB's border for now

GitOrigin-RevId=0cc5d6621e79c9673ef0a785593b835a3a7fc1be

PiperOrigin-RevId: 140548692
2016-12-09 18:17:22 -08:00
Chris Banes
0a62378d9a am 9cfb0748: am 2967aa90: am f1dfc73b: am 9e810f95: CollapingToolbarLayout styling tweaks
* commit '9cfb0748f588cfaa13e8377668549dd0405458f6':
  CollapingToolbarLayout styling tweaks

GitOrigin-RevId=aa19bd32ea69c5d32825edec8619569eb6ec6d21

PiperOrigin-RevId: 140548678
2016-12-09 18:17:11 -08:00
Chris Banes
07e01a9c06 am 4ae83371: am cc29b5d7: am 302adaa3: Merge "Improve FloatingActionButton border implementation" into lmp-mr1-ub-dev
* commit '4ae83371c7e0c71a2d2c38999f43f6115b61f6cb':
  Improve FloatingActionButton border implementation

GitOrigin-RevId=02dd0be9fb45ba427988dea8d6d8d2b82e36387b

PiperOrigin-RevId: 140548583
2016-12-09 18:16:10 -08:00
Chris Banes
0b02fec15c am 1b5d11f9: am 10597477: Merge "FloatingActionButton border" into mnc-dev
* commit '1b5d11f9e55fa2e5930498d12593a129f6cb497d':
  FloatingActionButton border

GitOrigin-RevId=3154355964d210ce03756261e446bba5a739889c

PiperOrigin-RevId: 140548538
2016-12-09 18:15:53 -08:00
Chris Banes
17f0492030 am 00ede781: am e3b89521: am f42b51c8: Merge "Some fixes for CollapsingToolbarLayout" into lmp-mr1-ub-dev
* commit '00ede7811fb853bd5d14ad62cb52da4e9ddfe566':
  Some fixes for CollapsingToolbarLayout

GitOrigin-RevId=55af222b777efa2cfd8e2208ca98f19c3b1c30f3

PiperOrigin-RevId: 140548496
2016-12-09 18:15:36 -08:00
Chris Banes
e8435b7bbd am 5c3341f5: am 4c37ebd8: Merge "Window inset support for CoL + AppBarLayout" into mnc-dev
* commit '5c3341f5ab819b806ca8f63af6f9e27782e88401':
  Window inset support for CoL + AppBarLayout

GitOrigin-RevId=72659081a3301eeadd659c7a063555260decdb90

PiperOrigin-RevId: 140548433
2016-12-09 18:15:02 -08:00
Chris Banes
f97e509fd1 am 3e528269: am 81666c3d: am 60d5509d: Merge "Tidy up styling and tinting in NavigationView" into lmp-mr1-ub-dev
* commit '3e5282695431eecbca0121099e61eb1b7ee309a3':
  Tidy up styling and tinting in NavigationView

GitOrigin-RevId=8ed9cfc9a0546b167f530af37b94109505c2af07

PiperOrigin-RevId: 140548396
2016-12-09 18:14:51 -08:00
Chris Banes
214eb4cd26 am 645ee0b3: am 0a1e4545: am 9f97e0cc: Merge "Add app:headerLayout attribute to NavigationView" into lmp-mr1-ub-dev
* commit '645ee0b387c51db25ba97191e75ef6dc99b16059':
  Add app:headerLayout attribute to NavigationView

GitOrigin-RevId=e2244b4276dd1cc024d9af0f0a59e19855d8d6b1

PiperOrigin-RevId: 140548330
2016-12-09 18:14:24 -08:00
Chris Banes
1af29a268f am 4ac0c26b: am 209a3f06: Merge commit \'e45b270f\' into manualmerge
* commit '4ac0c26bf6d0fb5a329d29732fa073db8b6eab70':
  TabLayout text color handling improvements

GitOrigin-RevId=774c8e5043c5da467069d4a0f175478922d8d20a

PiperOrigin-RevId: 140548321
2016-12-09 18:14:19 -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
Yuichi Araki
89db87437c am c1cc9423: Merge "Fix crash of NavigationView on Gingerbread" into lmp-mr1-ub-dev
* commit 'c1cc9423564f0753d31e8c5826ac6e44e5b009a1':
  Fix crash of NavigationView on Gingerbread

GitOrigin-RevId=c5f875a4f738ddf69dda74cea21f713b68e4b1f6

PiperOrigin-RevId: 140545827
2016-12-09 18:13:35 -08:00
Chris Banes
ba057cf497 am 81520564: Set default background for AppBarLayout
* commit '81520564f3dd783136e025174021ba4eabd6ff3c':
  Set default background for AppBarLayout

GitOrigin-RevId=8b79edbc66759ce2af89ae8d4f1437393729f735

PiperOrigin-RevId: 140545799
2016-12-09 18:13:30 -08:00
Chris Banes
add53117f9 am 61c2d94f: Merge "AppBarLayout improvements" into lmp-mr1-ub-dev
* commit '61c2d94faeb79a7a96df402f201a226ed740694a':
  AppBarLayout improvements

GitOrigin-RevId=d836732a8800bb6eebf107696cff44ced8f14afb

PiperOrigin-RevId: 140545788
2016-12-09 18:13:24 -08:00
Chris Banes
83e56599cd resolved conflicts for merge of 73a0c3c7 to master
Change-Id: I1652150b1499db455f1eee8d8743d2f7f7bb6fcc

GitOrigin-RevId=c005695ca3e01efb3c3486f5cb6bf1e7fb21995c

PiperOrigin-RevId: 140545763
2016-12-09 18:13:19 -08:00
Yuichi Araki
2d1a0b3c08 am 60abdeb3: Fix paddings for separators in NavigationView
* commit '60abdeb39630c4c74a4c401e221f0c968caa26f5':
  Fix paddings for separators in NavigationView

GitOrigin-RevId=33f392c4af56954740eecc5f7d7fe25a1e71aacf

PiperOrigin-RevId: 140545706
2016-12-09 18:13:02 -08:00
Chris Banes
1746f3f4b9 am fb4d5402: Merge "Add app:menu attribute to NavigationView" into lmp-mr1-ub-dev
* commit 'fb4d54028db8f328d98edf641654e8e7a83fa89e':
  Add app:menu attribute to NavigationView

GitOrigin-RevId=de2325c02dd92b683db1ab3798353452c1a4a68a

PiperOrigin-RevId: 140545605
2016-12-09 18:12:35 -08:00
Chris Banes
df7f443339 am 911970bb: am 51c19d26: am b7f9224b: Snackbar
* commit '911970bb8a1337d240e1f87e8c9d969bb99cea90':
  Snackbar

GitOrigin-RevId=65ffbe2a9aad39871ca5a3c85db07be05ea3fc03

PiperOrigin-RevId: 140545521
2016-12-09 18:12:24 -08:00
Chris Banes
dd946bba2e am d972c3ba: am d421b2b3: am f4e0b1dd: Merge "TextInputLayout - a wrapper around EditText" into lmp-mr1-ub-dev
* commit 'd972c3ba1979b8d3710f537de162c362fde0ea30':
  TextInputLayout - a wrapper around EditText

GitOrigin-RevId=809f652c46ec74ffea3505725e577d680a5f47ab

PiperOrigin-RevId: 140545480
2016-12-09 18:12:14 -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
Yuichi Araki
ad24f144d6 am 3f59ee95: am 795b01f0: am 00f28027: Merge "Rename NavigationDrawerView to NavigationView" into lmp-mr1-ub-dev
* commit '3f59ee9538b374910da37aab77009bc69a5aa522':
  Rename NavigationDrawerView to NavigationView

GitOrigin-RevId=198eda17b028c405197cd7f244626d09e5092cf9

PiperOrigin-RevId: 140545306
2016-12-09 18:11:24 -08:00
Yuichi Araki
1ca419753d am d111b070: am d765df61: am 74eafa02: Merge "Add selection feature to NavigationDrawerView." into lmp-mr1-ub-dev
* commit 'd111b07014a5a37a85dc38127aba5808b67505b9':
  Add selection feature to NavigationDrawerView.

GitOrigin-RevId=2a91fc7d0b22e2c9d92012f5d58670364a6a1337

PiperOrigin-RevId: 140545288
2016-12-09 18:11:14 -08:00
Yuichi Araki
440a30fec3 am b3a4fa78: am bd35b10d: Merge "Implement features for NavigationDrawerView menu" into lmp-mr1-ub-dev
* commit 'b3a4fa780f5ca626f579b91f9924435638c6824b':
  Implement features for NavigationDrawerView menu

GitOrigin-RevId=04be515e47761827cfc6d6f31ada5c6937af0dfd

PiperOrigin-RevId: 140545263
2016-12-09 18:11:08 -08:00
Chris Banes
45318f8c4b am a5f441b7: am 320c3e9f: New TabLayout
* commit 'a5f441b7d4d93da2adb4b48dab8ccb5d8457c63c':
  New TabLayout

GitOrigin-RevId=9eeb20e99abdac385954a785383b10eba51908e1

PiperOrigin-RevId: 140545228
2016-12-09 18:09:27 -08:00
Yuichi Araki
30b1bcd3e6 am d3da39bb: am 2b9dabda: Merge "Initial implementation of NavigationDrawer" into lmp-mr1-ub-dev
* commit 'd3da39bbe4b007d3ee2dadd318d55b0e06697b89':
  Initial implementation of NavigationDrawer

GitOrigin-RevId=e06c9b9db020326166a5591c0483c03377418437

PiperOrigin-RevId: 140545176
2016-12-09 18:09:18 -08:00
Yuichi Araki
36b99e40c8 am bd3ea239: am 9ea42dba: Merge "Revert "Initial implementation of NavigationDrawer"" into lmp-mr1-ub-dev
* commit 'bd3ea23910845c29f3d49cc3b241ff352f9fb120':
  Revert "Initial implementation of NavigationDrawer"

GitOrigin-RevId=02a27e6a640f57d55984ab31b814048507e73352

PiperOrigin-RevId: 140545170
2016-12-09 18:05:30 -08:00
Yuichi Araki
7ae9b2c5a9 am fa07fd94: am c501eb8f: Merge "Initial implementation of NavigationDrawer" into lmp-mr1-ub-dev
* commit 'fa07fd94fa1e3acb8c77b75fbcf603766dd525c3':
  Initial implementation of NavigationDrawer

GitOrigin-RevId=0653d5d75dd78048ec9db434bd0f969ef7168645

PiperOrigin-RevId: 140545163
2016-12-09 18:04:51 -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