Jaikumar Ganesh
5d2c955a69
am 50435d3e: Add Trigger Sensor API Demo.
...
* commit '50435d3e6f13f1faca9d743bd4f29791e8a4931d':
Add Trigger Sensor API Demo.
2013-03-12 23:14:22 +00:00
Jaikumar Ganesh
50435d3e6f
Add Trigger Sensor API Demo.
...
Add sensor API demo for significant motion sensor.
Change-Id: I9d55fef52bdda2b804003bb07d6d977f13cda5b0
2013-03-12 14:13:21 -07:00
Jeff Sharkey
90c1aea72b
am dafe2546: Merge "Example code for FileProvider." into jb-mr2-dev
...
* commit 'dafe2546c9b83f41903ea726f8ff4d74730c9c1f':
Example code for FileProvider.
2013-03-12 17:20:04 +00:00
Jeff Sharkey
dafe2546c9
Merge "Example code for FileProvider." into jb-mr2-dev
2013-03-12 17:13:16 +00:00
Michael Wright
6e9f145875
am def9515c: Merge "Update ApiDemos to use new input source check" into jb-mr2-dev
...
* commit 'def9515cb018807a5f441fe27e621759bdcd5b6b':
Update ApiDemos to use new input source check
2013-03-12 02:14:37 +00:00
Michael Wright
def9515cb0
Merge "Update ApiDemos to use new input source check" into jb-mr2-dev
2013-03-12 02:10:47 +00:00
Roman Nurik
88087ad0ca
am 574bec3b: am 573642d8: am f3084087: am ee77f868: am 85364937: Add InteractiveChart sample code for update to Gestures training class.
...
* commit '574bec3b90b494d98c88378689983027c8b773e4':
Add InteractiveChart sample code for update to Gestures training class.
2013-03-11 23:36:14 +00:00
Jean-Baptiste Queru
dc86028f31
am 05f409b6: (-s ours) am 240f3771: am 86dea47b: am 0327ed0d: am 0c0bad05: (-s ours) am 4aed7b07: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '05f409b61cb1ac0d33db6fc16ad126e441212260':
2013-03-11 23:36:13 +00:00
Adam Koch
afba7d0d3a
am d40239e3: am 8ae5c7b6: am 0fd0b16f: am 005ea967: am 0ff44f00: am 5f51b7fb: Bitmapfun Sample: Add some docs and clean up some method naming.
...
* commit 'd40239e3d2b34f4109e831f28f1640998efb04a9':
2013-03-11 23:36:12 +00:00
Adam Koch
81962b5f7d
am f6749fe8: am fa7910ed: am 9b58e08b: am 36893523: am 0c5b72b4: am e826ee24: Merge "Bitmapfun Sample: Add additional sample images." into jb-mr1-dev
...
* commit 'f6749fe8b448f4c747ccf7e27f2b5b85509ee041':
2013-03-11 23:36:11 +00:00
Chris Banes
b3cd03c0d5
am 4f0b10aa: am 0e21e8b9: am 22c2d527: am 56eb96fc: am ac5a7844: am c5d5c3db: Merge "bitmapfun: Add support to use inBitmap option" into jb-mr1-dev
...
* commit '4f0b10aa1ed52382dcefd3c539c3a89165e7e1a3':
2013-03-11 23:36:11 +00:00
Roman Nurik
574bec3b90
am 573642d8: am f3084087: am ee77f868: am 85364937: Add InteractiveChart sample code for update to Gestures training class.
...
* commit '573642d8e9fdb5fbd1d2a7cd9a0a9fe0204eacd7':
Add InteractiveChart sample code for update to Gestures training class.
2013-03-11 16:31:38 -07:00
Jean-Baptiste Queru
05f409b61c
am 240f3771: am 86dea47b: am 0327ed0d: am 0c0bad05: (-s ours) am 4aed7b07: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '240f37715ec6eeeeca9b857cbbcf3a9e3037b17a':
2013-03-11 16:31:38 -07:00
Adam Koch
d40239e3d2
am 8ae5c7b6: am 0fd0b16f: am 005ea967: am 0ff44f00: am 5f51b7fb: Bitmapfun Sample: Add some docs and clean up some method naming.
...
* commit '8ae5c7b6f98a5bdb7d7d1908935030aa88d89e1e':
2013-03-11 16:31:37 -07:00
Adam Koch
f6749fe8b4
am fa7910ed: am 9b58e08b: am 36893523: am 0c5b72b4: am e826ee24: Merge "Bitmapfun Sample: Add additional sample images." into jb-mr1-dev
...
* commit 'fa7910ed26c15cd4522af32194ebf6816bff9a66':
2013-03-11 16:31:36 -07:00
Chris Banes
4f0b10aa1e
am 0e21e8b9: am 22c2d527: am 56eb96fc: am ac5a7844: am c5d5c3db: Merge "bitmapfun: Add support to use inBitmap option" into jb-mr1-dev
...
* commit '0e21e8b9edc7efdaf7e2cc2fbff35e7f517a272d':
2013-03-11 16:31:35 -07:00
Roman Nurik
573642d8e9
am f3084087: am ee77f868: am 85364937: Add InteractiveChart sample code for update to Gestures training class.
...
* commit 'f308408752736df3e67362584dbad5899ba58d71':
Add InteractiveChart sample code for update to Gestures training class.
2013-03-11 16:29:03 -07:00
Jean-Baptiste Queru
240f37715e
am 86dea47b: am 0327ed0d: am 0c0bad05: (-s ours) am 4aed7b07: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '86dea47ba8c4c5edcefa06cd730aaed20c29b920':
2013-03-11 16:29:03 -07:00
Adam Koch
8ae5c7b6f9
am 0fd0b16f: am 005ea967: am 0ff44f00: am 5f51b7fb: Bitmapfun Sample: Add some docs and clean up some method naming.
...
* commit '0fd0b16fee5c300a0c442192efde13b26e80903a':
2013-03-11 16:29:02 -07:00
Adam Koch
fa7910ed26
am 9b58e08b: am 36893523: am 0c5b72b4: am e826ee24: Merge "Bitmapfun Sample: Add additional sample images." into jb-mr1-dev
...
* commit '9b58e08bd86e639cdb6a4cafc4eec54de60ad31c':
2013-03-11 16:29:01 -07:00
Chris Banes
0e21e8b9ed
am 22c2d527: am 56eb96fc: am ac5a7844: am c5d5c3db: Merge "bitmapfun: Add support to use inBitmap option" into jb-mr1-dev
...
* commit '22c2d52712248e5db4e2ecddbdcac64e9538a5b0':
2013-03-11 16:29:00 -07:00
Roman Nurik
f308408752
am ee77f868: am 85364937: Add InteractiveChart sample code for update to Gestures training class.
...
* commit 'ee77f86813e5fcb10e9bc6bfd4c36993b3330150':
Add InteractiveChart sample code for update to Gestures training class.
2013-03-11 16:27:42 -07:00
Jean-Baptiste Queru
86dea47ba8
am 0327ed0d: am 0c0bad05: (-s ours) am 4aed7b07: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '0327ed0d33129aef5d4110630daa3e57a5274447':
2013-03-11 16:27:42 -07:00
Adam Koch
0fd0b16fee
am 005ea967: am 0ff44f00: am 5f51b7fb: Bitmapfun Sample: Add some docs and clean up some method naming.
...
* commit '005ea96746a8fdf620e840a9086e1601d5e1f316':
2013-03-11 16:27:41 -07:00
Adam Koch
9b58e08bd8
am 36893523: am 0c5b72b4: am e826ee24: Merge "Bitmapfun Sample: Add additional sample images." into jb-mr1-dev
...
* commit '3689352361cd5f1d7ae51c0fe0edf1f1caaf59e5':
2013-03-11 16:27:40 -07:00
Chris Banes
22c2d52712
am 56eb96fc: am ac5a7844: am c5d5c3db: Merge "bitmapfun: Add support to use inBitmap option" into jb-mr1-dev
...
* commit '56eb96fcfe2adff3df95783ef3ae65fc4124252e':
2013-03-11 16:27:39 -07:00
Roman Nurik
ee77f86813
am 85364937: Add InteractiveChart sample code for update to Gestures training class.
...
* commit '85364937ce0f4fdd0d8387d3f46fdb8d41fb41dd':
Add InteractiveChart sample code for update to Gestures training class.
2013-03-11 16:25:35 -07:00
Jean-Baptiste Queru
0327ed0d33
am 0c0bad05: (-s ours) am 4aed7b07: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '0c0bad0598f532c52c93c104f909e9e42b63fe88':
2013-03-11 16:25:34 -07:00
Adam Koch
005ea96746
am 0ff44f00: am 5f51b7fb: Bitmapfun Sample: Add some docs and clean up some method naming.
...
* commit '0ff44f005003a554f22ccf79595999ef965c1f47':
2013-03-11 16:25:33 -07:00
Adam Koch
3689352361
am 0c5b72b4: am e826ee24: Merge "Bitmapfun Sample: Add additional sample images." into jb-mr1-dev
...
* commit '0c5b72b4dd3cd7d354165ee6b3b95f870ad94714':
2013-03-11 16:25:32 -07:00
Chris Banes
56eb96fcfe
am ac5a7844: am c5d5c3db: Merge "bitmapfun: Add support to use inBitmap option" into jb-mr1-dev
...
* commit 'ac5a78446794c078954754159f6a74dbed81b0f0':
2013-03-11 16:25:31 -07:00
Roman Nurik
85364937ce
Add InteractiveChart sample code for update to Gestures training class.
...
Change-Id: I1e245cd6735d54603174045ca557057763861469
2013-03-11 16:22:53 -07:00
Michael Wright
8f48506e2d
Update ApiDemos to use new input source check
...
Change-Id: Iab20881dca49cfef66fa35396942cdb5045137aa
2013-03-11 15:57:21 -07:00
keunyoung
8aea29c6a6
am ce0385a4: Merge "move emulator HALs to device/generic/goldfish" into jb-mr2-dev
...
* commit 'ce0385a450b416e2b9d9ff1432d4c0bc9690125b':
move emulator HALs to device/generic/goldfish
2013-03-11 21:52:39 +00:00
keunyoung
ce0385a450
Merge "move emulator HALs to device/generic/goldfish" into jb-mr2-dev
2013-03-11 21:48:40 +00:00
Dmitry Shmidt
48fd37e474
am 569dfe08: Merge "Connectivity: Add Wifi Scan test" into jb-mr2-dev
...
* commit '569dfe08d03b1f2458e635bc71de4d6c3e162eb3':
Connectivity: Add Wifi Scan test
2013-03-11 21:41:17 +00:00
Dmitry Shmidt
569dfe08d0
Merge "Connectivity: Add Wifi Scan test" into jb-mr2-dev
2013-03-11 21:38:01 +00:00
Dmitry Shmidt
6420ac2c74
Connectivity: Add Wifi Scan test
...
Initial Revision
Change-Id: I6bf5f65f877980ab889e6d08f206cd9c99e5338c
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com >
2013-03-11 11:35:58 -07:00
keunyoung
e39f0b3ea1
move emulator HALs to device/generic/goldfish
...
Change-Id: I1ff304d540c75c4d27c5fddeb7315e177d366fb3
2013-03-11 10:55:13 -07:00
Jeff Sharkey
01ae453b0e
Example code for FileProvider.
...
Shows simple usage of FileProvider to share a private thumbnail
across process boundaries. Also serves as sample code for javadoc
on FileProvider.
Bug: 7005318
Change-Id: I0ca12977a3832c7c2ac1c254d411a547ffee0a51
2013-03-08 10:02:39 -08:00
Ying Wang
cbb4e77e51
am b74c3ef7: am f39c1088: am 7b9e308b: Merge ""debug" in those modules is discouraged"
...
* commit 'b74c3ef70bd124cabb9c0d57a95a05b4e2b30c43':
"debug" in those modules is discouraged
2013-03-08 01:36:39 +00:00
Ying Wang
b74c3ef70b
am f39c1088: am 7b9e308b: Merge ""debug" in those modules is discouraged"
...
* commit 'f39c1088f08e194a212f55a246bac85036f62a42':
"debug" in those modules is discouraged
2013-03-07 17:32:46 -08:00
Ying Wang
f39c1088f0
am 7b9e308b: Merge ""debug" in those modules is discouraged"
...
* commit '7b9e308b95ff1bd92ca8d4343a4ed43d87bbd6b6':
"debug" in those modules is discouraged
2013-03-07 17:30:03 -08:00
Ying Wang
7b9e308b95
Merge ""debug" in those modules is discouraged"
2013-03-08 01:16:00 +00:00
Dianne Hackborn
a8b61ab708
am 919e1de3: Merge "Add API demo for a custom layout." into jb-mr2-dev
...
* commit '919e1de34de1aeb34de30720e6443e569e2d14e0':
Add API demo for a custom layout.
2013-03-06 22:48:11 +00:00
Dianne Hackborn
919e1de34d
Merge "Add API demo for a custom layout." into jb-mr2-dev
2013-03-06 22:41:25 +00:00
Dianne Hackborn
654f51aa29
Add API demo for a custom layout.
...
This serves as a complete, formal layout, with attributes
and all that good stuff. Intended for use as sample code
in the java docs.
Change-Id: Ic45b9387d724bf574e2bfb8970b26c7b47fc0a2b
2013-03-06 13:46:42 -08:00
Andrew Hsieh
9af021a681
am ba6e0af5: am 7398b953: am e9fc6c19: Merge "[ARM] Add unwind portable header adaptor."
...
* commit 'ba6e0af54597a43e6fd691f4db72d93c28e3c44a':
[ARM] Add unwind portable header adaptor.
2013-03-06 16:53:40 +00:00
Andrew Hsieh
ba6e0af545
am 7398b953: am e9fc6c19: Merge "[ARM] Add unwind portable header adaptor."
...
* commit '7398b953edcd1afd307a379aebefdb2b166a5946':
[ARM] Add unwind portable header adaptor.
2013-03-06 03:21:02 +00:00
Andrew Hsieh
7398b953ed
am e9fc6c19: Merge "[ARM] Add unwind portable header adaptor."
...
* commit 'e9fc6c19ac1becfcc193bc913b0cd77dcff3ee2d':
[ARM] Add unwind portable header adaptor.
2013-03-05 19:19:27 -08:00
