Commit Graph

18171 Commits

Author SHA1 Message Date
Tony Mak
dd6195cf27 Merge "Static field name prefix should be 's'" into mnc-dev 2015-05-01 18:29:16 +00:00
Xavier Ducrohet
33e8b894f1 am 72f1c953: Ability to generate SDK system-images for mips64
* commit '72f1c9535dad9a522210ef98ecd39cdfa9799039':
  Ability to generate SDK system-images for mips64
2015-05-01 17:38:17 +00:00
Xavier Ducrohet
72f1c9535d Ability to generate SDK system-images for mips64
Change-Id: I9547a6059a68d1ae3861c35a328c1ff05ae3fc0f
(cherry picked from commit d63ae3ab15)
2015-05-01 16:50:27 +00:00
Tony Mak
6c346c0f75 Static field name prefix should be 's'
According to http://source.android.com/source/code-style.html, static field should start with 's'

Change-Id: Ic883ddcdd42ba030bbe62ff1648440c25e927460
2015-05-01 15:04:44 +01:00
Chris Banes
2194f821f0 AppBarLayout demo
Change-Id: I0b4439c4658371db6c4a4cfe95f8e77cd7015891
2015-05-01 11:28:13 +01:00
Chris Banes
374d4c2b14 Merge "Add Snackbar demo without a CoordinatorLayout" into lmp-mr1-ub-dev 2015-05-01 10:21:38 +00:00
Xavier Ducrohet
d63ae3ab15 Ability to generate SDK system-images for mips64
Change-Id: I9547a6059a68d1ae3861c35a328c1ff05ae3fc0f
2015-04-30 16:19:02 -07:00
Xiaohui Chen
e472fe6d27 intellij-gen: fix git root problem
Some module dir may not be the git root itself.  Some modules may
share the same git root. e.g. "development/tools/apkcheck" module's
git root is "development/".  So we need to look at the parent
directories too when going through all the modules.

Change-Id: Id2ce859efc0d5f6286eb8545fd6a21244e7d40a6
2015-04-29 20:50:18 -07:00
Xiaohui Chen
8145bd2753 Merge "intellij-gen: fix framework dependencies" 2015-04-29 17:17:14 +00:00
Xiaohui Chen
2821fcb134 Merge "intellij-gen: default to use jdk 1.7" 2015-04-29 17:12:51 +00:00
Geoff Mendal
6d3823b081 Import translations. DO NOT MERGE
Change-Id: I8aaebdb327d41ac7e11ee0ea166307b0f980a42c
Auto-generated-cl: translation import
2015-04-29 07:09:14 -05:00
Trevor Johns
85042074e8 am 27f2c0e8: am 437b88c7: am 1d5ed62b: am 03236391: Sync sample prebuilts to lmp-mr1-ub-docs
* commit '27f2c0e81b179a0c13694caf025fde970b1df5eb':
  Sync sample prebuilts to lmp-mr1-ub-docs
2015-04-28 18:58:55 +00:00
Trevor Johns
27f2c0e81b am 437b88c7: am 1d5ed62b: am 03236391: Sync sample prebuilts to lmp-mr1-ub-docs
* commit '437b88c73b91f62e43207f328d0d6c4f988d5f8d':
  Sync sample prebuilts to lmp-mr1-ub-docs
2015-04-28 18:16:38 +00:00
Trevor Johns
437b88c73b am 1d5ed62b: am 03236391: Sync sample prebuilts to lmp-mr1-ub-docs
* commit '1d5ed62b1fac4db1aefa6a38a17afa5bfdc18837':
  Sync sample prebuilts to lmp-mr1-ub-docs
2015-04-28 18:05:28 +00:00
Trevor Johns
1d5ed62b1f am 03236391: Sync sample prebuilts to lmp-mr1-ub-docs
* commit '03236391f11efe2a9ce89ab92602c58ba717f626':
  Sync sample prebuilts to lmp-mr1-ub-docs
2015-04-28 17:55:49 +00:00
Trevor Johns
03236391f1 Sync sample prebuilts to lmp-mr1-ub-docs
Upstream commit: f76d10f3b6abad250d94b5b9a5c73faae6ce8cc5

Change-Id: I32f2690e36f444cae123134268472fb526c26163
2015-04-28 10:39:50 -07:00
Kris Giesing
7312936e85 am 9d66ef51: am afafd390: Merge "Modify Guided Step example showing checkmark groups" into lmp-mr1-ub-dev
* commit '9d66ef5196af97d2d3e2cdc07e700a789df42919':
  Modify Guided Step example showing checkmark groups
2015-04-28 15:07:04 +00:00
Kris Giesing
9d66ef5196 am afafd390: Merge "Modify Guided Step example showing checkmark groups" into lmp-mr1-ub-dev
* commit 'afafd390500d6f3ef60615802ac119b8263ff496':
  Modify Guided Step example showing checkmark groups
2015-04-28 00:50:46 +00:00
Kris Giesing
afafd39050 Merge "Modify Guided Step example showing checkmark groups" into lmp-mr1-ub-dev 2015-04-28 00:34:55 +00:00
Kris Giesing
0d7136a72e Modify Guided Step example showing checkmark groups
Change example to show changing a checked item in a group while
staying on the same screen, to illustrate checkmark animations.

b/20545155

Change-Id: If7e64e57235e24fe3c6a3bf5b96c84fa7bd96da2
2015-04-27 15:47:52 -07:00
Xiaohui Chen
b6615dc7f0 intellij-gen: default to use jdk 1.7
1.7 language features seems already used in Android codebase.  Let's
move the generated project config to match that.

Change-Id: I0269f2e73417393bcd7894356caaea5c48b9d0e1
2015-04-27 14:45:10 -07:00
Trevor Johns
e6bdef48c7 am 3859d624: am e8833767: am 2d983a73: am 9a2076ae: am 13b15893: Update sample browseables
* commit '3859d624a826ea22441d1fada0a202c2449d2b23':
2015-04-27 15:33:54 +00:00
Trevor Johns
022834ce73 am 90c6ef48: (-s ours) am f25b3d23: (-s ours) am c474affc: (-s ours) am 773d3777: (-s ours) DO NOT MERGE: Update version for Android samples pkg (lmp-mr1)
* commit '90c6ef48bce49096a0da623d9d3c1c145630c81d':
2015-04-27 15:33:52 +00:00
Trevor Johns
3859d624a8 am e8833767: am 2d983a73: am 9a2076ae: am 13b15893: Update sample browseables
* commit 'e88337677c420515d52b4d2cc2e56cad233d7026':
2015-04-27 07:38:03 +00:00
Trevor Johns
e88337677c am 2d983a73: am 9a2076ae: am 13b15893: Update sample browseables
* commit '2d983a7359b93b160dd6955f2d6257432ca581d3':
2015-04-27 07:24:31 +00:00
Trevor Johns
2d983a7359 am 9a2076ae: am 13b15893: Update sample browseables
* commit '9a2076aef4d57f3b29f108999ccba02ab438f926':
  Update sample browseables
2015-04-27 07:01:37 +00:00
Trevor Johns
90c6ef48bc am f25b3d23: (-s ours) am c474affc: (-s ours) am 773d3777: (-s ours) DO NOT MERGE: Update version for Android samples pkg (lmp-mr1)
* commit 'f25b3d236b2fcd9acaba42ac1b93fc47c47407cb':
2015-04-27 07:00:24 +00:00
Trevor Johns
9a2076aef4 am 13b15893: Update sample browseables
* commit '13b15893e3804ac8dac72226b6ad9f3478219060':
  Update sample browseables
2015-04-26 22:07:55 +00:00
Trevor Johns
f25b3d236b am c474affc: (-s ours) am 773d3777: (-s ours) DO NOT MERGE: Update version for Android samples pkg (lmp-mr1)
* commit 'c474affc8f7ca9ac371095527be46d91ddb6f016':
2015-04-26 20:23:11 +00:00
Trevor Johns
c474affc8f am 773d3777: (-s ours) DO NOT MERGE: Update version for Android samples pkg (lmp-mr1)
* commit '773d377754b8f79a3da7c7ef715199314d785460':
  DO NOT MERGE: Update version for Android samples pkg (lmp-mr1)
2015-04-26 18:55:23 +00:00
Geoff Mendal
3e691651b2 Import translations. DO NOT MERGE
Change-Id: I59f01c002066b71b1039ca0dbbbbef0efcaa4c47
Auto-generated-cl: translation import
2015-04-24 23:33:17 -07:00
Xavier Ducrohet
83f4d2a1c9 Optional library listing file.
Also update some files for MNC.

Change-Id: I3901b07d72831cdb6557da1696ae4845e4d15be5
2015-04-24 13:17:36 -07:00
Trevor Johns
f6c11994e7 am acee4e84: (-s ours) am 773d3777: (-s ours) DO NOT MERGE: Update version for Android samples pkg (lmp-mr1)
* commit 'acee4e84ecda5656e598d3a3b174504f99175b16':
  DO NOT MERGE: Update version for Android samples pkg (lmp-mr1)
2015-04-23 23:16:41 +00:00
Trevor Johns
2db71f01ad am 7b488099: am 17e6746d: am 831ae650: am bc576e3e: am 13b15893: Update sample browseables
* commit '7b488099443b839c0dd72bb7bc411b352847dbd3':
  Update sample browseables
2015-04-23 23:16:31 +00:00
Trevor Johns
acee4e84ec am 773d3777: (-s ours) DO NOT MERGE: Update version for Android samples pkg (lmp-mr1)
* commit '773d377754b8f79a3da7c7ef715199314d785460':
  DO NOT MERGE: Update version for Android samples pkg (lmp-mr1)
2015-04-23 23:05:09 +00:00
Trevor Johns
7b48809944 am 17e6746d: am 831ae650: am bc576e3e: am 13b15893: Update sample browseables
* commit '17e6746db6def0dd5aa683d0c0b6243165190cfc':
  Update sample browseables
2015-04-23 22:30:56 +00:00
Trevor Johns
773d377754 DO NOT MERGE: Update version for Android samples pkg (lmp-mr1)
Change-Id: I213de7f201ff9ec85e5bd0821cf4beb15156188f
2015-04-23 15:30:39 -07:00
Ying Wang
cac5f594f6 am f3dc3184: am 0273c81e: am 4ea82d63: Merge "Update prebuilts path."
* commit 'f3dc31847e29c7d7ed10be0557f20ac232b6f52e':
  Update prebuilts path.
2015-04-23 22:29:42 +00:00
Ying Wang
f3dc31847e am 0273c81e: am 4ea82d63: Merge "Update prebuilts path."
* commit '0273c81e01c6c7462af00d9d5323422773bc1aa9':
  Update prebuilts path.
2015-04-23 22:19:22 +00:00
Trevor Johns
17e6746db6 am 831ae650: am bc576e3e: am 13b15893: Update sample browseables
* commit '831ae650bb03e88391ecc3761b93b4f858c866ac':
  Update sample browseables
2015-04-23 22:17:37 +00:00
Trevor Johns
831ae650bb am bc576e3e: am 13b15893: Update sample browseables
* commit 'bc576e3e5dcebe446e7ad7d00e7277433fd70bf8':
  Update sample browseables
2015-04-23 22:08:11 +00:00
Trevor Johns
a72da35331 am 73567b8f: am 0cb88687: Update sample browseables
* commit '73567b8f6dd8db5c31ce4d992eb31d340d0163b3':
  Update sample browseables
2015-04-23 21:57:46 +00:00
Trevor Johns
bc576e3e5d am 13b15893: Update sample browseables
* commit '13b15893e3804ac8dac72226b6ad9f3478219060':
  Update sample browseables
2015-04-23 21:56:49 +00:00
Trevor Johns
73567b8f6d am 0cb88687: Update sample browseables
* commit '0cb8868739d7f2f0b73078d9c3a5f1987c1a6312':
  Update sample browseables
2015-04-23 21:45:04 +00:00
Trevor Johns
0cb8868739 Update sample browseables
Synced to developers/samples/android commit
121d61a3334fd4999d3cb6553f2356eb8893d19b.

Change-Id: I9a8cebc4b0de0e704b1f2172d57a18420cc96b92
(cherry picked from commit 13b15893e3)
2015-04-23 21:33:11 +00:00
Xavier Ducrohet
171ba549e2 am fe6737a6: Update support pkg version to 22.1.1
* commit 'fe6737a63b458b060d5993c2aa491d598d1f4716':
  Update support pkg version to 22.1.1
2015-04-23 18:31:17 +00:00
Xavier Ducrohet
fe6737a63b Update support pkg version to 22.1.1
Change-Id: I3fca16fdfdde689cd9cafbcd5cb3b5fd1ecf3468
2015-04-23 11:17:40 -07:00
Ying Wang
0273c81e01 am 4ea82d63: Merge "Update prebuilts path."
* commit '4ea82d63dd67e1776885900a28d8f7057ce3c00f':
  Update prebuilts path.
2015-04-23 17:19:31 +00:00
Ying Wang
4ea82d63dd Merge "Update prebuilts path." 2015-04-23 17:02:22 +00:00
Ying Wang
87f01085fe Update prebuilts path.
Bug: 20239510
Change-Id: Id2c699fb516d55deceffd8194a485b078564c8de
2015-04-23 10:00:15 -07:00