Commit Graph

2737 Commits

Author SHA1 Message Date
Chris Banes
f51cf635a3 Merge "TextInputLayout and Snackbar demos" into lmp-mr1-ub-dev 2015-03-23 10:01:56 +00:00
Chris Banes
2ea6b5d060 Add hide on scroll demo
Change-Id: I1c76ad7c5f2c37a4cdfde4e73b9579ec3a633fcb
2015-03-23 10:01:15 +00:00
Neil Fuller
1920869ec1 am e0a3b19f: am f66c8d36: Merge "Remove usages of FloatMath"
* commit 'e0a3b19ffbd69b4401724477d346dc1494bad04a':
  Remove usages of FloatMath
2015-03-21 05:43:44 +00:00
Neil Fuller
7c2255556c am b48e8788: am 29923a44: am a6e8e0d8: Merge "Remove dependencies on FloatMath"
* commit 'b48e8788934fde9669529a3785591b32ade978cd':
  Remove dependencies on FloatMath
2015-03-21 05:15:36 +00:00
Kris Giesing
d1eaf438dc am c5ba8fc0: am 02000988: am 818a7473: Merge "Add demos for GuidedStepFragment." into lmp-mr1-ub-dev
* commit 'c5ba8fc04ccf45b49270b3f0ca081f42bf1485b4':
  Add demos for GuidedStepFragment.
2015-03-19 16:59:07 +00:00
Kris Giesing
c5ba8fc04c am 02000988: am 818a7473: Merge "Add demos for GuidedStepFragment." into lmp-mr1-ub-dev
* commit '02000988f8598a5027bc08ebe0bc923d897c1157':
  Add demos for GuidedStepFragment.
2015-03-19 16:51:44 +00:00
Kris Giesing
818a7473fd Merge "Add demos for GuidedStepFragment." into lmp-mr1-ub-dev 2015-03-19 16:41:24 +00:00
Kris Giesing
bfcde222e9 Add demos for GuidedStepFragment.
Make the main activity a guided step that allows the selection of
other activities.  Add a dedicated activity to represent a
sequence of GuidedStepFragments.

b/18935698

Change-Id: I16142f4d7e87b3f2f02b812faa9bff82ecf5361c
2015-03-17 16:36:48 -07:00
Craig Stout
a38058de25 am 3762e5a9: am b477cc7f: am 623cfb01: Merge "Add branding to DetailsFragment and TitleHelper with RowsFragment." into lmp-mr1-ub-dev
* commit '3762e5a9dc5b8952814f8ba965e20784fd585760':
  Add branding to DetailsFragment and TitleHelper with RowsFragment.
2015-03-17 20:03:47 +00:00
Craig Stout
21c4a88a26 am 5f052b26: am 4c56adc9: am 09f91e6e: Merge "Fix missing api on kitkat." into lmp-mr1-ub-dev
* commit '5f052b26ee338e44d2f92f550a7b4c8d19d7282f':
  Fix missing api on kitkat.
2015-03-17 20:03:45 +00:00
Craig Stout
3762e5a9dc am b477cc7f: am 623cfb01: Merge "Add branding to DetailsFragment and TitleHelper with RowsFragment." into lmp-mr1-ub-dev
* commit 'b477cc7f5c08e11f43b4c3c88ead1cd617916a49':
  Add branding to DetailsFragment and TitleHelper with RowsFragment.
2015-03-17 19:57:44 +00:00
Craig Stout
5f052b26ee am 4c56adc9: am 09f91e6e: Merge "Fix missing api on kitkat." into lmp-mr1-ub-dev
* commit '4c56adc9164c172bff6832111c201cce5ddb01eb':
  Fix missing api on kitkat.
2015-03-17 19:57:39 +00:00
Craig Stout
623cfb01dd Merge "Add branding to DetailsFragment and TitleHelper with RowsFragment." into lmp-mr1-ub-dev 2015-03-17 19:47:08 +00:00
Dianne Hackborn
3e8a010ab6 Merge "Add API demo for sharing." 2015-03-16 18:05:59 +00:00
Dianne Hackborn
aa9e46deb6 Add API demo for sharing.
Change-Id: I8f65979ab67297932e82f26eba8c4729725ee6d5
2015-03-12 11:20:52 -07:00
Chris Banes
1d6d833cb8 TextInputLayout and Snackbar demos
Change-Id: I8de5e4d21528225f9688e8d42c73f51ce42bc8b8
2015-03-12 13:33:05 +00:00
Adrian Roos
6826ec699f Merge "Revert "Fix the build"" 2015-03-11 16:05:40 +00:00
Craig Stout
3da78ae74d Add branding to DetailsFragment and TitleHelper with RowsFragment.
b/16029942

Change-Id: I4179245c110ce74ebd5e50d55432e8ed3332d52b
2015-03-10 10:22:28 -07:00
James Cook
5c42f75896 Re-enable the undo demo activity
The UI now shows these input fields:
* A normal field with buttons for programmatic SetText, append and insert.
* A field with undo disabled.
* A field with a length limit (via InputFilter).
* A field with a credit card input formatter (via TextWatcher)

Bug: 19332904
Change-Id: I41df56c84dd5232918e7ee5e6ed5874b2023cc78
2015-03-10 17:00:19 +00:00
Craig Stout
038b75ead3 Fix missing api on kitkat.
Change-Id: I047b1d1198c262e1836bb43551a65c6eab8bc5b4
2015-03-09 12:49:44 -07:00
Adrian Roos
b9c9443703 Revert "Fix the build"
This reverts commit 18c5fb7c2c, which
disabled the trust agent whitelisting in the sample device admin. Now
that the API is re-enabled, that code should be too.

Bug: 19461292
Change-Id: I85e3b4dcaab500ea9dd4b7e75490ca840ff396be
2015-03-09 16:08:55 +00:00
Craig Stout
053eb7e946 am d07078d2: am aaa3fa06: Default to using wrap content for row height.
* commit 'd07078d2afbe2a30371ad32fba734f971ad9c669':
  Default to using wrap content for row height.
2015-03-03 00:59:36 +00:00
Craig Stout
aaa3fa06b1 Default to using wrap content for row height.
Change-Id: I902b292726bdf8fa1d2134b00fde1385cbccc4ae
(cherry picked from commit 24ad89cd2b)
2015-03-03 00:04:15 +00:00
Craig Stout
21efbcc41e am d7eb2ab1: am 12f481fb: am 5f6a8c4c: Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev
* commit 'd7eb2ab1953a653c985b85dce487a16dd5e738ae':
  Updated to clarify division of functionality.
2015-02-27 16:47:42 +00:00
Craig Stout
d7eb2ab195 am 12f481fb: am 5f6a8c4c: Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev
* commit '12f481fb8958846766ecbb420d5b429c72cd83eb':
  Updated to clarify division of functionality.
2015-02-27 16:41:54 +00:00
Craig Stout
5f6a8c4cbc Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev 2015-02-27 16:25:23 +00:00
Chris Banes
2068c6a59a Remove the old ActionBarCompat sample
Change-Id: I04dfe8dd38e153ae8f28c3044a7e6d37f1a7d562
2015-02-27 10:01:47 +00:00
Dake Gu
a827e50225 am 602c6910: am 6efdf6b7: am 69cabd12: ItemClickedListener -> ItemViewClickedListener
* commit '602c69109002485984e8f10a0b473fe6f33ca98a':
  ItemClickedListener -> ItemViewClickedListener
2015-02-26 02:16:01 +00:00
Dake Gu
602c691090 am 6efdf6b7: am 69cabd12: ItemClickedListener -> ItemViewClickedListener
* commit '6efdf6b750429d6367ea161c537a64735cb8754e':
  ItemClickedListener -> ItemViewClickedListener
2015-02-26 00:57:05 +00:00
Dake Gu
69cabd12e6 ItemClickedListener -> ItemViewClickedListener
Bug 19514090

Change-Id: Icf14e483b95d1bf5d57af9f27d977b0fdb686e67
2015-02-25 15:39:17 -08:00
Jim Miller
94b490117c am 71abf355: am 34bdc613: am fe07a079: am 18c5fb7c: Fix the build
* commit '71abf355011906353a571b471c04027bf2112804':
  Fix the build
2015-02-25 19:11:20 +00:00
Jim Miller
71abf35501 am 34bdc613: am fe07a079: am 18c5fb7c: Fix the build
* commit '34bdc6136f13d01af339fd0c8f1f569bb28d6971':
  Fix the build
2015-02-25 19:04:55 +00:00
Jim Miller
fe07a079ca am 18c5fb7c: Fix the build
* commit '18c5fb7c2cb649b355eff5fc33022516e5af150c':
  Fix the build
2015-02-25 18:52:03 +00:00
Jim Miller
18c5fb7c2c Fix the build
This API was hidden for MR1.

Bug 19461292

Change-Id: Ib0a5ca536e843c91a142faeeccf684294aa3e274
2015-02-25 10:37:37 -08:00
Chris Banes
2ff5cc9671 am 7114b925: am 531ebcdc: am 2797e1a4: Merge "AlertDialog Demo" into lmp-mr1-ub-dev
* commit '7114b925b6e0f8fb5f07b75d0a9c00da0aeb2acc':
  AlertDialog Demo
2015-02-20 12:18:53 +00:00
Chris Banes
822d9f209f am 8f95e8d7: am 97919fdf: am ee2eb13f: Merge "Add ActionMode demos to Support7Demos" into lmp-mr1-ub-dev
* commit '8f95e8d7ab037e723942350999745c230f978d6f':
  Add ActionMode demos to Support7Demos
2015-02-20 12:12:47 +00:00
Chris Banes
7114b925b6 am 531ebcdc: am 2797e1a4: Merge "AlertDialog Demo" into lmp-mr1-ub-dev
* commit '531ebcdc40909b21c64d5b7f740f2201a9a8cbd5':
  AlertDialog Demo
2015-02-20 12:12:42 +00:00
Chris Banes
8f95e8d7ab am 97919fdf: am ee2eb13f: Merge "Add ActionMode demos to Support7Demos" into lmp-mr1-ub-dev
* commit '97919fdfb9c8bf1e23b1e0e22939ef330eddeca8':
  Add ActionMode demos to Support7Demos
2015-02-20 12:06:30 +00:00
Chris Banes
2797e1a401 Merge "AlertDialog Demo" into lmp-mr1-ub-dev 2015-02-20 12:00:52 +00:00
Chris Banes
ee2eb13f45 Merge "Add ActionMode demos to Support7Demos" into lmp-mr1-ub-dev 2015-02-20 11:56:12 +00:00
Craig Stout
8f295cdef4 Updated to clarify division of functionality.
PlaybackControlHelper can be used in BrowseFragment.

Change-Id: Iac37e0a4f51ed1fab5edcff20d4a7037d4cc9ef9
2015-02-19 11:10:23 -08:00
Craig Stout
321933a007 am 3b3cd1df: am 532dc1f4: am 006d8352: Merge "Add backgrounds." into lmp-mr1-ub-dev
* commit '3b3cd1dfe85e5f72d3ede75b9ece5b12756d59a6':
  Add backgrounds.
2015-02-18 00:30:17 +00:00
Craig Stout
3b3cd1dfe8 am 532dc1f4: am 006d8352: Merge "Add backgrounds." into lmp-mr1-ub-dev
* commit '532dc1f4f02898a379308a2652f4c182e8cc4fb9':
  Add backgrounds.
2015-02-17 22:56:50 +00:00
Craig Stout
006d835209 Merge "Add backgrounds." into lmp-mr1-ub-dev 2015-02-17 22:42:00 +00:00
Chris Banes
0dfad9e6b0 Add ActionMode demos to Support7Demos
Change-Id: I6e98fbe932f3c9569a96cdfac8fe54b7913d2784
2015-02-17 12:02:38 +00:00
Neil Fuller
f9c21d6616 am e0a3b19f: am f66c8d36: Merge "Remove usages of FloatMath"
* commit 'e0a3b19ffbd69b4401724477d346dc1494bad04a':
  Remove usages of FloatMath
2015-02-12 19:30:31 +00:00
Neil Fuller
e0a3b19ffb am f66c8d36: Merge "Remove usages of FloatMath"
* commit 'f66c8d36ed081d901e495b904965e8f341ed47de':
  Remove usages of FloatMath
2015-02-12 17:42:38 +00:00
Narayan Kamath
8b1958a449 am 91e47149: Fix build (again).
* commit '91e471491826e718347e280ec61bc2edd42302e4':
  Fix build (again).
2015-02-12 16:57:12 +00:00
Narayan Kamath
91e4714918 Fix build (again).
Another set of strings that needed to be localized but were
missed in 4fe89883c2.

(cherry picked from commit 6da3c008cb)

Change-Id: Ibb08df992129361578aeb1c556f4d965ab3404c2
2015-02-12 16:46:11 +00:00
Narayan Kamath
6da3c008cb Fix build (again).
Another set of strings that needed to be localized but were
missed in 4fe89883c2.

Change-Id: Ibb08df992129361578aeb1c556f4d965ab3404c2
2015-02-12 12:44:51 +00:00