drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,884 Commits 1 Branch 0 Tags
Commit Graph

23884 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
The Android Open Source Project
21a534d955 am 1d628c5d: merge from open-source master 
Merge commit '1d628c5d3dd7998b29c339292a2dc391015d0782' into kraken

* commit '1d628c5d3dd7998b29c339292a2dc391015d0782':
  Accept media files by file extension in case insensitive manner.
 2010-05-14 09:46:11 -07:00
The Android Open Source Project
1d628c5d3d merge from open-source master 
Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
 2010-05-14 09:44:36 -07:00
Eric Laurent
03bb2b9651 am 10fde074: am 9f0810e8: Merge "AudioFlinger: rename variables to clarify reference to track channel count or channel mask" into kraken 2010-05-14 09:42:57 -07:00
Eric Laurent
10fde074f2 am 9f0810e8: Merge "AudioFlinger: rename variables to clarify reference to track channel count or channel mask" into kraken 2010-05-14 09:40:42 -07:00
Eric Laurent
9f0810e8c7 Merge "AudioFlinger: rename variables to clarify reference to track channel count or channel mask" into kraken 2010-05-14 09:39:12 -07:00
Nick Kralevich
7a37849761 am b9381956: am ead68d5c: Merge "Remove libdrm2. This code appears to be unused." into kraken 2010-05-14 09:36:05 -07:00
Nick Kralevich
b9381956af am ead68d5c: Merge "Remove libdrm2. This code appears to be unused." into kraken 2010-05-14 09:34:25 -07:00
Nick Kralevich
ead68d5cd6 Merge "Remove libdrm2. This code appears to be unused." into kraken 2010-05-14 09:32:45 -07:00
The Android Open Source Project
1443eddab6 am f7c12cf5: am db20eeb2: am 9167ba50: merge from open-source master 2010-05-14 09:19:03 -07:00
The Android Open Source Project
f7c12cf542 am db20eeb2: am 9167ba50: merge from open-source master 2010-05-14 09:17:22 -07:00
Nick Kralevich
3e913014d8 am 4db8471d: am 1e4dc54d: Get rid of warnings when compiled with -Wformat-security 2010-05-14 09:16:12 -07:00
The Android Open Source Project
db20eeb246 am 9167ba50: merge from open-source master 
Merge commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1' into kraken

* commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1':
  Corrected debug message in WindowManager
  Put the wifi status icon in the right place.
 2010-05-14 09:15:41 -07:00
Nick Kralevich
4db8471d9f am 1e4dc54d: Get rid of warnings when compiled with -Wformat-security 2010-05-14 09:14:34 -07:00
The Android Open Source Project
9167ba50e4 merge from open-source master 
Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226
 2010-05-14 09:11:31 -07:00
Nick Kralevich
1e4dc54d56 Get rid of warnings when compiled with -Wformat-security 
Change-Id: Ibd814d894ff0eba26b01932b9865098b7bb26f95
 2010-05-14 09:06:55 -07:00
Jean-Baptiste Queru
75e181b633 Merge "Accept media files by file extension in case insensitive manner." 2010-05-14 09:06:43 -07:00
Ben Murdoch
d1f5e9e5c0 Merge changes I8da1b801,Id88446d6,I82798d5a 
* changes:
  Merge Webkit at r58956: Update User agent with new WebKit version.
  Merge Webkit at r58956: Update DRT FileFilter.
  Merge Webkit at r58956: Plugin code has switched to C99 integer types. See http://trac.webkit.org/changeset/58590
 2010-05-14 08:17:51 -07:00
Mike Lockwood
8d3257a7dc Move MTP code to the android namespace 
Change-Id: I5da48038fd5e4cdeefaeba42cdc74eb588b3448d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-05-14 10:10:36 -04:00