Commit Graph

11766 Commits

Author SHA1 Message Date
Jeff Brown
dd22bb2a7d am 8db95167: Merge "appcompat: Add samples for options menu usage with fragments." into jb-mr2-dev
* commit '8db9516710589f3ca1a7c1a35348ad0e6b03ed08':
  appcompat: Add samples for options menu usage with fragments.
2013-04-23 16:46:08 -07:00
Kenny Root
8d581dbfc5 am 0190c7dd: Merge "Add Android KeyStore API demo" into jb-mr2-dev
* commit '0190c7ddaa512b0351973cde55fde65c47096954':
  Add Android KeyStore API demo
2013-04-23 16:46:02 -07:00
Andrew Hsieh
db967948ae am 98815e31: Merge "Fix x86 endian.h"
* commit '98815e312404638a2ced6683ee0e80769b695273':
  Fix x86 endian.h
2013-04-21 20:40:29 -07:00
Andrew Hsieh
98815e3124 Merge "Fix x86 endian.h" 2013-04-22 03:33:59 +00:00
Andrew Hsieh
25c7f95934 Fix x86 endian.h
See https://code.google.com/p/android/issues/detail?id=54465
and https://android-review.googlesource.com/#/c/57242

Change-Id: Ib61fc0696e4979421f9bc6916c776a41fdc8be71
2013-04-22 11:25:41 +08:00
Jeff Brown
8db9516710 Merge "appcompat: Add samples for options menu usage with fragments." into jb-mr2-dev 2013-04-20 00:28:10 +00:00
Kenny Root
0190c7ddaa Merge "Add Android KeyStore API demo" into jb-mr2-dev 2013-04-20 00:00:10 +00:00
Kenny Root
f59ea3b54e Add Android KeyStore API demo
Adds a sample application which uses the AndroidKeyStore and
KeyPairGenerator for AndroidKeyStore.

Bug: 8608817
Change-Id: Iec78a74461dc259e4080ed1fab7d923593fcdf75
2013-04-19 11:50:06 -07:00
Dianne Hackborn
6931cb5e68 am 3da1568a: Merge "Update to follow TransportMediator API changes." into jb-mr2-dev
* commit '3da1568ae86f49fbe9f239e0e4f6d0389e4bacd7':
  Update to follow TransportMediator API changes.
2013-04-19 11:03:36 -07:00
Dianne Hackborn
3da1568ae8 Merge "Update to follow TransportMediator API changes." into jb-mr2-dev 2013-04-19 17:58:00 +00:00
Adam Powell
4488849397 am 4f48d974: resolved conflicts for merge of b105894b to jb-mr2-dev
* commit '4f48d974410137961fc06139aa44ae038269705b':
  Add Support4Demos examples for DrawerLayout and SlidingPaneLayout
2013-04-19 09:45:12 -07:00
Adam Powell
4f48d97441 resolved conflicts for merge of b105894b to jb-mr2-dev
Change-Id: Ifa617d1807d29e91998d98482e50bdd40ee61b1a
2013-04-19 09:35:00 -07:00
Adam Powell
b105894b1b am 2622ae27: am 98c5d4a2: Add Support4Demos examples for DrawerLayout and SlidingPaneLayout
* commit '2622ae27adefc16299deb611dc040bec5ad59c73':
  Add Support4Demos examples for DrawerLayout and SlidingPaneLayout
2013-04-19 09:23:31 -07:00
Adam Powell
2622ae27ad am 98c5d4a2: Add Support4Demos examples for DrawerLayout and SlidingPaneLayout
* commit '98c5d4a228a45a3240afe82f269bb90f91b8e6a5':
  Add Support4Demos examples for DrawerLayout and SlidingPaneLayout
2013-04-19 09:21:03 -07:00
Jeff Brown
e14dfaf571 appcompat: Add samples for options menu usage with fragments.
Bug: 8661191
Change-Id: I3664f00c09d81c01b904f8c5203a69a12180c565
2013-04-18 23:38:33 -07:00
Dianne Hackborn
74c5bcff29 Update to follow TransportMediator API changes.
Change-Id: Icedd0fbe15cf84ff4d3f0c59826f698e92138b47
2013-04-18 18:26:18 -07:00
Adam Powell
98c5d4a228 Add Support4Demos examples for DrawerLayout and SlidingPaneLayout
Show basic usage of these two new widgets.

Change-Id: I1ec82041c198e2b2853a0d1eb07e0ab78dbea61c
2013-04-18 17:31:30 -07:00
Dianne Hackborn
f67c9b3a9d am 43b9e5a8: Merge "Fix issue #8520788: Add WakefulBroadcastReceiver" into jb-mr2-dev
* commit '43b9e5a83b6c9a8d0e62be2a316c81934c5d0e98':
  Fix issue #8520788: Add WakefulBroadcastReceiver
2013-04-17 16:30:05 -07:00
Dianne Hackborn
43b9e5a83b Merge "Fix issue #8520788: Add WakefulBroadcastReceiver" into jb-mr2-dev 2013-04-17 23:25:08 +00:00
Winson Chung
7ebb78ea14 am 412de090: Merge "DO NOT MERGE Deferring new collections widget apis. Revert "Updating WeatherListWidget to the new collections widget api."" into jb-mr2-dev
* commit '412de090412d75b80204d7b1462c967c39e33c22':
  DO NOT MERGE Deferring new collections widget apis. Revert "Updating WeatherListWidget to the new collections widget api."
2013-04-17 13:57:59 -07:00
Winson Chung
412de09041 Merge "DO NOT MERGE Deferring new collections widget apis. Revert "Updating WeatherListWidget to the new collections widget api."" into jb-mr2-dev 2013-04-17 20:52:52 +00:00
Winson Chung
d86ea2c0e0 DO NOT MERGE Deferring new collections widget apis. Revert "Updating WeatherListWidget to the new collections widget api."
This reverts commit b28878a5b8.
2013-04-17 13:42:05 -07:00
Amith Yamasani
8fabb70dfc am 55cadb05: Changes to handle restrictions API change
* commit '55cadb05ded9ddc54e70c6be4fef019b3e8c8439':
  Changes to handle restrictions API change
2013-04-17 11:30:37 -07:00
Amith Yamasani
55cadb05de Changes to handle restrictions API change
Framework passes in a Bundle, application returns ArrayList<RestrictionEntry>.

Bug: 8633967
Change-Id: Ib9b1c9fe555a0a87a77b7278d1fe3ef41ca07b9b
2013-04-17 10:48:37 -07:00
Dianne Hackborn
041bfcd9e4 Fix issue #8520788: Add WakefulBroadcastReceiver
Add sample code.

Change-Id: I46f4f25ceb4e12f975e3cebd83f62de2555a8996
2013-04-17 10:33:16 -07:00
Amith Yamasani
25b86dcba4 am fb6dc4fe: Merge "Fix some crashes in the sample" into jb-mr2-dev
* commit 'fb6dc4fedf1034e61a792d24094b7f74854f70d4':
  Fix some crashes in the sample
2013-04-15 10:38:55 -07:00
Amith Yamasani
fb6dc4fedf Merge "Fix some crashes in the sample" into jb-mr2-dev 2013-04-15 17:34:04 +00:00
Scott Main
0db0ae59c4 am 68eae9dd: am 7f3dab19: am f987cbbf: am 2c0001e6: am 1259eff8: add redirects for removed files from I1b17e4eca17e69169002fc617180beb2ac83f67a
* commit '68eae9dd3dded2ec8f211b8e7f34925f54bae564':
  add redirects for removed files from I1b17e4eca17e69169002fc617180beb2ac83f67a
2013-04-12 13:15:33 -07:00
Scott Main
68eae9dd3d am 7f3dab19: am f987cbbf: am 2c0001e6: am 1259eff8: add redirects for removed files from I1b17e4eca17e69169002fc617180beb2ac83f67a
* commit '7f3dab19aff9d8f6712e26821de84d13b6ecad17':
  add redirects for removed files from I1b17e4eca17e69169002fc617180beb2ac83f67a
2013-04-12 13:11:20 -07:00
Scott Main
7f3dab19af am f987cbbf: am 2c0001e6: am 1259eff8: add redirects for removed files from I1b17e4eca17e69169002fc617180beb2ac83f67a
* commit 'f987cbbfc25374dbf7a767fc86174508a0e4662e':
  add redirects for removed files from I1b17e4eca17e69169002fc617180beb2ac83f67a
2013-04-12 13:07:47 -07:00
Scott Main
f987cbbfc2 am 2c0001e6: am 1259eff8: add redirects for removed files from I1b17e4eca17e69169002fc617180beb2ac83f67a
* commit '2c0001e62c749d987a20e48c76eb4e3736209aee':
  add redirects for removed files from I1b17e4eca17e69169002fc617180beb2ac83f67a
2013-04-12 13:04:18 -07:00
Scott Main
2c0001e62c am 1259eff8: add redirects for removed files from I1b17e4eca17e69169002fc617180beb2ac83f67a
* commit '1259eff8064bdd2230b1fbb43f68c3678181b9e5':
  add redirects for removed files from I1b17e4eca17e69169002fc617180beb2ac83f67a
2013-04-12 13:00:03 -07:00
Scott Main
1259eff806 add redirects for removed files from I1b17e4eca17e69169002fc617180beb2ac83f67a
Change-Id: I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
2013-04-12 11:42:20 -07:00
Jeff Brown
f755282a79 am 84dc1f05: Update media router API.
* commit '84dc1f05b7ed34064a1186ab6782e0806cecd36d':
  Update media router API.
2013-04-11 21:08:36 -07:00
Jeff Brown
84dc1f05b7 Update media router API.
Bug: 8175766
Change-Id: I28aeb92851caba332774664e71041c2cfdf9605e
2013-04-11 20:38:34 -07:00
Scott Main
88e8fc1b83 am 96a0aa00: am 0311ce6c: am 48b058e2: am 675e1b54: am d7fc587c: add redirects for some orphaned docs.
* commit '96a0aa00a72f8622136a1d6213fc1ddc1c02e4e2':
  add redirects for some orphaned docs.
2013-04-11 19:30:26 -07:00
Scott Main
96a0aa00a7 am 0311ce6c: am 48b058e2: am 675e1b54: am d7fc587c: add redirects for some orphaned docs.
* commit '0311ce6c831a896cc671efa44340abcf5825a593':
  add redirects for some orphaned docs.
2013-04-11 19:27:19 -07:00
Scott Main
0311ce6c83 am 48b058e2: am 675e1b54: am d7fc587c: add redirects for some orphaned docs.
* commit '48b058e2ef7e565217c4b1338cd545f3a1e29bdf':
  add redirects for some orphaned docs.
2013-04-11 19:24:46 -07:00
Scott Main
48b058e2ef am 675e1b54: am d7fc587c: add redirects for some orphaned docs.
* commit '675e1b542269dfb5e1365d8312df7a91e20c2a72':
  add redirects for some orphaned docs.
2013-04-11 19:21:41 -07:00
Scott Main
675e1b5422 am d7fc587c: add redirects for some orphaned docs.
* commit 'd7fc587cc23286164757e8806cd6e235ba936cfc':
  add redirects for some orphaned docs.
2013-04-11 19:18:03 -07:00
Dianne Hackborn
89238d7809 am 7cf29a76: Update for java docs.
* commit '7cf29a7636c5a4f1f1e353c28d10d65e515ff4ca':
  Update for java docs.
2013-04-11 19:16:00 -07:00
Dianne Hackborn
7cf29a7636 Update for java docs.
Change-Id: I1a34e5d3aaf2b00717d65b3487a919f237738dc2
2013-04-11 19:10:54 -07:00
Dianne Hackborn
df59f73c35 am 2f5f3c1d: Merge "Issue #7341342 API request: way to determine current orientation..." into jb-mr2-dev
* commit '2f5f3c1d6302a11ad72f7a0229d1708d6c444ed3':
  Issue #7341342 API request: way to determine current orientation...
2013-04-11 17:11:18 -07:00
Dianne Hackborn
2f5f3c1d63 Merge "Issue #7341342 API request: way to determine current orientation..." into jb-mr2-dev 2013-04-12 00:08:39 +00:00
Nick Kralevich
99585925bd am 2209abf6: Merge "Remove OptionalPermissions demo." into jb-mr2-dev
* commit '2209abf69495283225d5daf0e8b3fae5cfa9b02a':
  Remove OptionalPermissions demo.
2013-04-11 12:58:03 -07:00
Nick Kralevich
2209abf694 Merge "Remove OptionalPermissions demo." into jb-mr2-dev 2013-04-11 19:52:20 +00:00
Jaikumar Ganesh
acce8f0500 am 8a0799f2: Add Trigger Sensor API Demo.
* commit '8a0799f2d611d750d65fce3eb2c7973b9bddf54b':
  Add Trigger Sensor API Demo.
2013-04-11 11:34:48 -07:00
Scott Main
d7fc587cc2 add redirects for some orphaned docs.
coincides with the doc removals in I6539076edf8962fd974d790a0edd1d4badc4d5f7

Change-Id: I1cac3419835fe8402d416c14eb11652c89b0dd81
2013-04-11 11:31:55 -07:00
Nick Kralevich
0ceb4bb830 Remove OptionalPermissions demo.
Change-Id: Iabfdcfbf45c2a116e91681c05421deeedd9c9d27
2013-04-11 10:19:55 -07:00
Amith Yamasani
5c9ba3308f Fix some crashes in the sample
Change-Id: I8d03f8912d9a9932f8b24dd23d5f0dd21716dd0d
2013-04-10 18:49:18 -07:00