Dirk Dougherty
ff7eddfcf9
am cb0bdf19: am ad8ce534: am 3d52305f: am 59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo
2010-05-14 13:53:33 -07:00
Dirk Dougherty
cb0bdf19f5
am ad8ce534: am 3d52305f: am 59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo
2010-05-14 13:51:42 -07:00
Dirk Dougherty
6ae52006ab
am af4dbcd8: am 8072bdc6: am cae9cfee: am bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo
2010-05-14 13:50:46 -07:00
Dirk Dougherty
ad8ce5346a
am 3d52305f: am 59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo
...
Merge commit '3d52305faa682366eb34c30892ddd2b390940048' into kraken
* commit '3d52305faa682366eb34c30892ddd2b390940048':
Doc change: adjustments to the api changes description
2010-05-14 13:49:56 -07:00
Dirk Dougherty
af4dbcd85e
am 8072bdc6: am cae9cfee: am bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo
2010-05-14 13:48:56 -07:00
Dirk Dougherty
3d52305faa
am 59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo
...
Merge commit '59cfe7137ca411bdbb5ffcdf418eecc55d65d09e' into froyo-plus-aosp
* commit '59cfe7137ca411bdbb5ffcdf418eecc55d65d09e':
Doc change: adjustments to the api changes description
2010-05-14 13:48:04 -07:00
Dirk Dougherty
8072bdc6e2
am cae9cfee: am bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo
...
Merge commit 'cae9cfeed7b0895189e08a4fadf63c917b1aec7b' into kraken
* commit 'cae9cfeed7b0895189e08a4fadf63c917b1aec7b':
Doc change: add note about future instruction set support.
2010-05-14 13:47:07 -07:00
Dirk Dougherty
59cfe7137c
Merge "Doc change: adjustments to the api changes description" into froyo
2010-05-14 13:46:42 -07:00
Dirk Dougherty
6d0438bbc5
am e2fb67d4: am 41a450cd: am bf4cecd2: am 89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo
2010-05-14 13:45:28 -07:00
Dirk Dougherty
877fb9a2cb
Doc change: adjustments to the api changes description
...
Change-Id: I9373b424ae008face124e38a163c980608c2e4df
2010-05-14 13:45:27 -07:00
Dirk Dougherty
cae9cfeed7
am bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo
...
Merge commit 'bba70cdba284c3d76cab9843e44097d664882938' into froyo-plus-aosp
* commit 'bba70cdba284c3d76cab9843e44097d664882938':
Doc change: add note about future instruction set support.
2010-05-14 13:45:17 -07:00
Dirk Dougherty
e2fb67d4bc
am 41a450cd: am bf4cecd2: am 89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo
2010-05-14 13:43:39 -07:00
Dirk Dougherty
bba70cdba2
Merge "Doc change: add note about future instruction set support." into froyo
2010-05-14 13:43:19 -07:00
Dirk Dougherty
41a450cd8e
am bf4cecd2: am 89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo
...
Merge commit 'bf4cecd2822ff74c8c246d2595a836b5f1130ad8' into kraken
* commit 'bf4cecd2822ff74c8c246d2595a836b5f1130ad8':
Doc change: documentation for library projects in sdk.
2010-05-14 13:41:46 -07:00
Dirk Dougherty
bf4cecd282
am 89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo
...
Merge commit '89969d4cdaf7abbbf6d3fce86c274e7b79113e8d' into froyo-plus-aosp
* commit '89969d4cdaf7abbbf6d3fce86c274e7b79113e8d':
Doc change: documentation for library projects in sdk.
2010-05-14 13:40:19 -07:00
Dirk Dougherty
89969d4cda
Merge "Doc change: documentation for library projects in sdk." into froyo
2010-05-14 13:38:20 -07:00
Dirk Dougherty
de98f6e397
Doc change: add note about future instruction set support.
...
Change-Id: If954c1020301f5935c8d9328a531afdddbdad8db
2010-05-14 13:37:01 -07:00
Dirk Dougherty
a3245648d6
Doc change: documentation for library projects in sdk.
...
Change-Id: I615d24a046ba2858676e985072563cc90a906551
2010-05-14 13:27:39 -07:00
James Dong
8196e00d86
am ce3d8b31: am d95266c6: Merge "Detect and handle premature termination of a recording session" into kraken
2010-05-14 12:22:18 -07:00
James Dong
ce3d8b316b
am d95266c6: Merge "Detect and handle premature termination of a recording session" into kraken
2010-05-14 12:21:03 -07:00
James Dong
d95266c6a8
Merge "Detect and handle premature termination of a recording session" into kraken
2010-05-14 12:19:17 -07:00
Nick Kralevich
4864b6fa8a
am 9efc829e: am 4e544e81: Merge "Forgot to fix one -Wformat-security in my previous change. Fixed." into kraken
2010-05-14 12:11:13 -07:00
Nick Kralevich
9efc829e61
am 4e544e81: Merge "Forgot to fix one -Wformat-security in my previous change. Fixed." into kraken
2010-05-14 12:09:02 -07:00
Chih-Chung Chang
84498a7ab5
am 9c192e44: am 29f5d9b6: Merge "Fix deadlock if the last reference of ICameraClient is removed in ICamera::connect()" into kraken
2010-05-14 12:08:24 -07:00
Nick Kralevich
4e544e8146
Merge "Forgot to fix one -Wformat-security in my previous change. Fixed." into kraken
2010-05-14 12:07:05 -07:00
Chih-Chung Chang
9c192e44c2
am 29f5d9b6: Merge "Fix deadlock if the last reference of ICameraClient is removed in ICamera::connect()" into kraken
2010-05-14 12:06:16 -07:00
Chih-Chung Chang
29f5d9b61d
Merge "Fix deadlock if the last reference of ICameraClient is removed in ICamera::connect()" into kraken
2010-05-14 12:05:06 -07:00
Scott Main
060341fa2d
am 33c06f91: am 6c034325: am 6d8e4fd8: am b83a283a: docs: add dev guide for backup
2010-05-14 11:59:04 -07:00
Scott Main
33c06f9158
am 6c034325: am 6d8e4fd8: am b83a283a: docs: add dev guide for backup
2010-05-14 11:57:46 -07:00
Scott Main
6c034325a8
am 6d8e4fd8: am b83a283a: docs: add dev guide for backup
...
Merge commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf' into kraken
* commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf':
docs: add dev guide for backup
2010-05-14 11:56:14 -07:00
Scott Main
6d8e4fd83b
am b83a283a: docs: add dev guide for backup
...
Merge commit 'b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp
* commit 'b83a283ac178ab0a72f1d811189d79b26097835e':
docs: add dev guide for backup
2010-05-14 11:53:44 -07:00
Ray Chen
0fcfca195f
am f4ca2ad0: am f55e3222: Merge "Fix issue 2622023 Clean up all hardcoded \'/sdcard\' in camera related codes." into kraken
2010-05-14 11:51:38 -07:00
Ray Chen
f4ca2ad06e
am f55e3222: Merge "Fix issue 2622023 Clean up all hardcoded \'/sdcard\' in camera related codes." into kraken
2010-05-14 11:50:19 -07:00
Ray Chen
f55e322216
Merge "Fix issue 2622023 Clean up all hardcoded '/sdcard' in camera related codes." into kraken
2010-05-14 11:48:45 -07:00
James Dong
68510e60f9
Detect and handle premature termination of a recording session
...
Change-Id: Ifb83b19f3e68580345b23efed5d5956fb81baeb8
2010-05-14 11:48:00 -07:00
Scott Main
b83a283ac1
docs: add dev guide for backup
...
Change-Id: I168f6b15d3441c9cbea2cd9699612476c7244530
2010-05-14 11:47:42 -07:00
Ray Chen
f75e370e12
Fix issue 2622023 Clean up all hardcoded '/sdcard' in camera related codes.
...
Change-Id: I8a509d957a7b67ee1f59dc4ef5139c4e28adeb9c
2010-05-14 11:43:38 -07:00
Dianne Hackborn
0efa0c45a1
Merge "More fragment stuff:"
2010-05-14 11:26:40 -07:00
Dianne Hackborn
6e8304e57e
More fragment stuff:
...
- New startActivityForResult() API.
- Fragments now should have the correct lifecycle while hanging around
in the back stack (not being destroyed and re-created).
- Rework of state save/restore to make it simpler and better. In theory
now any fragment (including layout and others in the hierarchy) can
now be retained across config changes, though this hasn't been tested.
Change-Id: I2a7fe560e14e567f5675a2f172a23fca67b3e97f
2010-05-14 11:22:48 -07:00
Adam Powell
f7dacd39c1
Merge "ActionBar - custom navigation views"
2010-05-14 11:03:58 -07:00
James Dong
7d4b667348
am 612058d1: am 9db798d0: Audio/video initial recording time synchronization
2010-05-14 10:55:52 -07:00
James Dong
612058d134
am 9db798d0: Audio/video initial recording time synchronization
2010-05-14 10:54:23 -07:00
James Dong
d39c6a1676
am 8b3611ee: am 1824486e: Handle recording file size and/or duration limit
2010-05-14 10:53:02 -07:00
James Dong
8b3611eee5
am 1824486e: Handle recording file size and/or duration limit
2010-05-14 10:51:35 -07:00
James Dong
9db798d0f0
Audio/video initial recording time synchronization
...
Change-Id: Iac58b63d474fe09c1d36ba6ecde91dafbb7fef9a
2010-05-14 10:51:12 -07:00
James Dong
1824486e04
Handle recording file size and/or duration limit
...
Change-Id: Ib9ed1f3ebd8fef550cc130a7ef11f2905fa9aedc
2010-05-14 10:46:56 -07:00
Adam Powell
a1700783b5
ActionBar - custom navigation views
...
Change-Id: Ibc98565816c713474eefd4e96fb51175abfb0187
2010-05-14 10:35:21 -07:00
Nick Kralevich
942a2fbfdf
Forgot to fix one -Wformat-security in my previous change. Fixed.
...
Change-Id: Ice7459b30e1d7dbfe400b68d27ebc04fcca78bae
2010-05-14 10:29:13 -07:00
The Android Open Source Project
41b5fc5c88
am 63c93077: am 21a534d9: am 1d628c5d: merge from open-source master
2010-05-14 09:49:52 -07:00
The Android Open Source Project
63c93077a8
am 21a534d9: am 1d628c5d: merge from open-source master
2010-05-14 09:48:12 -07:00
