Trevor Johns
eba484fbd4
am 951e7288: Fix browseable category for NfcProvisioning sample
...
* commit '951e7288e6bea6ed91f510e3cdefc7110b4de353':
Fix browseable category for NfcProvisioning sample
2015-04-02 21:21:24 +00:00
Trevor Johns
951e7288e6
Fix browseable category for NfcProvisioning sample
...
Synced with developers/samples/android commit
0a4e12c1bc019a34549c6e88260879e2da49ce7c.
Change-Id: Ia75c0e01ce61679d87ab88e80c6db97006aaa1e0
2015-04-02 13:29:30 -07:00
Trevor Johns
721cd1b86a
am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release
...
* commit '77b5d394ff91872896c69f5cee93a126f3aed92e':
Update sdk.atree and samples/browseable for lastest samples release
2015-03-30 23:47:14 +00:00
Trevor Johns
77b5d394ff
Update sdk.atree and samples/browseable for lastest samples release
...
Synced to developers/samples/android commit
97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910.
Change-Id: I360cfa147e71dd519b841df41b4e878f86b9b27b
2015-03-30 16:06:43 -07:00
Xavier Ducrohet
835221bfd3
am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
...
* commit 'd9e9e60f22109b3c8966a41c25b223f40a3d51f9':
Update build tools version to 22.0.2. DO NOT MERGE.
2015-03-27 00:33:32 +00:00
Xavier Ducrohet
d9e9e60f22
Update build tools version to 22.0.2. DO NOT MERGE.
...
Change-Id: Icb5bb90fe3b7c31059d97d87ed8e44c0d794236e
2015-03-23 14:23:54 -07:00
The Android Automerger
dfe61de07e
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-20 06:05:16 -07:00
Kris Giesing
818a7473fd
Merge "Add demos for GuidedStepFragment." into lmp-mr1-ub-dev
2015-03-19 16:41:24 +00:00
The Android Automerger
3fd959fa74
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-18 06:05:34 -07: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
623cfb01dd
Merge "Add branding to DetailsFragment and TitleHelper with RowsFragment." into lmp-mr1-ub-dev
2015-03-17 19:47:08 +00:00
Craig Stout
09f91e6e23
Merge "Fix missing api on kitkat." into lmp-mr1-ub-dev
2015-03-17 19:46:48 +00:00
The Android Automerger
8f79160730
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-17 06:05:29 -07:00
Xavier Ducrohet
cd572c0032
am 4ea9bca1: Update build tools to 22.0.1. DO NOT MERGE.
...
* commit '4ea9bca1234a5a122d4c8db39dc2b4dde5799928':
Update build tools to 22.0.1. DO NOT MERGE.
2015-03-16 22:28:04 +00:00
Xavier Ducrohet
4ea9bca123
Update build tools to 22.0.1. DO NOT MERGE.
...
Bug: 19085051
Change-Id: Ia62982e7bee589c37f8a755d7e6bb51264556412
2015-03-16 15:21:39 -07:00
The Android Automerger
13315fe24e
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-12 06:05:43 -07:00
Deepanshu Gupta
0536cbb469
am b15f499b: Merge "Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]" into lmp-mr1-dev
...
* commit 'b15f499b972ec3d09ac36feb15d5535c1b6cd030':
Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]
2015-03-12 00:39:11 +00:00
Deepanshu Gupta
b15f499b97
Merge "Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]" into lmp-mr1-dev
2015-03-12 00:33:15 +00:00
The Android Automerger
a2c490f849
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-11 06:05:20 -07:00
Deepanshu Gupta
06f472a302
Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]
...
Change-Id: I5060825f330a2da9234744510aa45eb283509113
2015-03-10 17:59:16 -07:00
Xavier Ducrohet
5db57146cd
am aeb400d3: Reset support version to <API>.0.0
...
* commit 'aeb400d30cbbc9d48689de3b75f92855f88d0861':
Reset support version to <API>.0.0
2015-03-10 23:05:31 +00:00
Xavier Ducrohet
aeb400d30c
Reset support version to <API>.0.0
...
Change-Id: I740e937ee51fcbcd0aafc054138f8939110d7cb6
2015-03-10 15:24:16 -07: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
Craig Stout
038b75ead3
Fix missing api on kitkat.
...
Change-Id: I047b1d1198c262e1836bb43551a65c6eab8bc5b4
2015-03-09 12:49:44 -07:00
The Android Automerger
92692a7127
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-03 06:05:24 -08:00
Xavier Ducrohet
3dbe2f827c
am d9273517: Update version of the build tools to be 22.0.0
...
* commit 'd927351738285e17d0be3b4de6f90107e27764ec':
Update version of the build tools to be 22.0.0
2015-03-03 00:53:52 +00:00
Xavier Ducrohet
228a57b795
Update version of the build tools to be 22.0.0
...
Change-Id: I8c6c1ce2cd78665c7e9e806fabc3e6b94795cfa4
(cherry picked from commit d927351738
2015-03-03 00:18:42 +00:00
Xavier Ducrohet
d927351738
Update version of the build tools to be 22.0.0
...
Change-Id: I8c6c1ce2cd78665c7e9e806fabc3e6b94795cfa4
2015-03-02 16:08:59 -08: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
5f6a8c4cbc
Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev
2015-02-27 16:25:23 +00:00
Dake Gu
69cabd12e6
ItemClickedListener -> ItemViewClickedListener
...
Bug 19514090
Change-Id: Icf14e483b95d1bf5d57af9f27d977b0fdb686e67
2015-02-25 15:39:17 -08: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
9ad1e85466
Update sdk.atree for new Palette dir structure
...
Change-Id: I7776f4d843aac8496240a54d0982525039b91469
2015-02-22 14:36:20 +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
bohu
505d46bca7
am 6d2c2385: am b45bd0a4: am fbfb5794: am c7a591c2: am 6a59f8ca: am 4a470965: am 2b67d0bf: am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit '6d2c23850e6905fe02f01564e3ae74eef478e045':
Bump revision number for all system images
2015-02-18 00:31:33 +00:00
bohu
986ba2fb03
am 08898593: am b71024a6: am 30111408: am 56957bdb: am 7838df56: am 423bbda8: am 65325595: am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit '08898593f2c035bd6280230068db1aac4308bcd8':
back port gles fix to api 17
2015-02-18 00:31:32 +00:00
bohu
8d65d5ff0a
am 20601c6a: am 6a06fb6f: am e06de8c0: am 3ef1f569: am fc31df1f: am 31e52ee2: am 65cc9c99: (-s ours) am cfff3894: am 5e44138c: Bump revision number for all the system images
...
* commit '20601c6a317d44cc5545ab9528c826021cbaf357':
Bump revision number for all the system images
2015-02-18 00:31:30 +00:00
bohu
3e449deca2
am 36bff112: am 3ce7eb80: am db8737c8: am a706d1c0: am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
...
* commit '36bff11258d26f6e9046d8f3cfffa516e27769de':
Bump revision number for system images
2015-02-18 00:31:29 +00:00
bohu
6d2c23850e
am b45bd0a4: am fbfb5794: am c7a591c2: am 6a59f8ca: am 4a470965: am 2b67d0bf: am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit 'b45bd0a4fa4467b96c2ca64c908268896e502fa9':
Bump revision number for all system images
2015-02-18 00:25:06 +00:00
bohu
08898593f2
am b71024a6: am 30111408: am 56957bdb: am 7838df56: am 423bbda8: am 65325595: am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit 'b71024a60165e45f896357705714b3bad4021a52':
back port gles fix to api 17
2015-02-18 00:25:05 +00:00
bohu
20601c6a31
am 6a06fb6f: am e06de8c0: am 3ef1f569: am fc31df1f: am 31e52ee2: am 65cc9c99: (-s ours) am cfff3894: am 5e44138c: Bump revision number for all the system images
...
* commit '6a06fb6f66e554b176887f7045afd2d52c40c4a4':
Bump revision number for all the system images
2015-02-18 00:25:04 +00:00
bohu
36bff11258
am 3ce7eb80: am db8737c8: am a706d1c0: am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
...
* commit '3ce7eb80550ee884b3aa72a0165d888938fb5a6e':
Bump revision number for system images
2015-02-18 00:25:03 +00:00
Craig Stout
006d835209
Merge "Add backgrounds." into lmp-mr1-ub-dev
2015-02-17 22:42:00 +00:00
bohu
b45bd0a4fa
am fbfb5794: am c7a591c2: am 6a59f8ca: am 4a470965: am 2b67d0bf: am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit 'fbfb579487c597400ede7fc206d2305e013656ee':
Bump revision number for all system images
2015-02-17 18:46:57 +00:00
bohu
b71024a601
am 30111408: am 56957bdb: am 7838df56: am 423bbda8: am 65325595: am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit '301114084a1fa967b04e9a467499c1290eb4a40c':
back port gles fix to api 17
2015-02-17 18:46:55 +00:00
bohu
6a06fb6f66
am e06de8c0: am 3ef1f569: am fc31df1f: am 31e52ee2: am 65cc9c99: (-s ours) am cfff3894: am 5e44138c: Bump revision number for all the system images
...
* commit 'e06de8c0e655bc49a2d45bfb928d2c9446037b23':
Bump revision number for all the system images
2015-02-17 18:46:54 +00:00
bohu
3ce7eb8055
am db8737c8: am a706d1c0: am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
...
* commit 'db8737c81eecd336c9a3fb7a3947fd4bfc5654d4':
Bump revision number for system images
2015-02-17 18:46:53 +00:00
