LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,521 Commits 2 Branches 0 Tags
af1632e1c1f4056e1b2a88c2a727ec9548ddab6c
Commit Graph

10521 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
3ccd5605bc am 67ab9e6f: (-s ours) am 81a034f1: am f6de0952: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '67ab9e6fe059b9b378863865aa8c83fb95bbfd59':
 2012-08-10 12:42:18 -07:00
Eino-Ville Talvala
d5bc34888d am 819d2aac: Merge "EmulatedFakeCamera2: Add autofocus management" into jb-mr1-dev 
* commit '819d2aac43d27100df59ee009c211169787b55dd':
  EmulatedFakeCamera2: Add autofocus management
 2012-08-10 12:40:24 -07:00
The Android Open Source Project
67ab9e6fe0 am 81a034f1: am f6de0952: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '81a034f14743a08ccf9e796880249f2d495f4c05':
 2012-08-10 12:40:22 -07:00
Eino-Ville Talvala
819d2aac43 Merge "EmulatedFakeCamera2: Add autofocus management" into jb-mr1-dev 2012-08-10 12:38:05 -07:00
The Android Open Source Project
81a034f147 am f6de0952: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit 'f6de0952d12995ae8808f46d0e4fa1f6974c1d61':
 2012-08-10 12:36:41 -07:00
The Android Open Source Project
f6de0952d1 Reconcile with jb-mr0-release - do not merge 
Change-Id: I4cf69544b3cddd8558400e57aa20edca8d0b535b
 2012-08-10 08:33:58 -07:00
The Android Automerger
0ead859f71 merge in jb-mr0-release history after reset to jb-dev 2012-08-09 11:36:40 -07:00
Andy Stadler
bacdb6afd2 Add telephony intermediates to classpath 
Change-Id: I019e3f2d4d3eb570590a8d1758b82cc1c1669c19
 2012-08-09 08:16:26 -07:00
Wink Saville
eae8078ded Add opt/telephony and opt/mms to eclipse .classpath 
Change-Id: I7ac5ff06f72435dbe10463ca71413df1fde9e676
 2012-08-09 08:16:19 -07:00
Chiao Cheng
ac0a18e095 Adding new script to generate Intellij projects. 
- Creates modules and includes only dependencies that are needed by
the parent module instead of including the entire source tree. The
new structure makes intellij much more responsive and fast.
- Adds proper android facets when AndroidManifest.xml exists for
quick resource lookup.
- Automatically includes intermediates directory for generated R files.
- Exclusion of un-neccessary language resource folders from id lookups.
- Automatic vcs configuration for git roots.
- Multi-module make file support.
- Aggregate modules for multi-module make files.

Change-Id: I181670b269faa1cc3ab257692833821fab20f73c
 2012-08-08 17:23:48 -07:00
Eino-Ville Talvala
f856a82b87 EmulatedFakeCamera2: Add autofocus management 
- Add skeleton ControlThread for 3A processing
- Add fake autofocus management into ControlThread
- Support AUTO, MACRO, CONTINUOUS_PICTURE, CONTINUOUS_VIDEO

Bug: 6243944
Change-Id: Ic47f5be642d4705db86021b94aaba8dcc7f32cf0
 2012-08-08 10:43:37 -07:00
Elliott Hughes
7cf7b8651b Merge "Remove the astl tests from testrunner." 2012-08-08 10:18:08 -07:00
Elliott Hughes
52f848fa72 Remove the astl tests from testrunner. 
astl is dead.

Change-Id: I54c17eb55d04e1512d0af6a16401d21deebdd130
 2012-08-08 10:10:26 -07:00
The Android Open Source Project
13c1b7d6a0 am 5f0da34a: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '5f0da34a93f25ce394fa2ca0396f122d5b88d2a8':
 2012-08-08 08:18:40 -07:00
The Android Open Source Project
5f0da34a93 Reconcile with jb-mr1-release - do not merge 
Change-Id: If22af71646f72addc47da816b06e8801d79ff306
 2012-08-08 08:15:58 -07:00
The Android Automerger
95e0d504bc merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-08 06:33:34 -07:00
Scott Main
a5068040e4 am 8aa14289: am fbd1a85d: am 5e01d367: am ef91cce8: Merge "remove all zip files for training class samples. They\'re now at frameworks/base/docs/downloads/" into jb-dev 
* commit '8aa1428995e4c0a9311255a2db1477bd803a2738':
  remove all zip files for training class samples. They're now at frameworks/base/docs/downloads/
 2012-08-07 15:29:15 -07:00
Scott Main
8aa1428995 am fbd1a85d: am 5e01d367: am ef91cce8: Merge "remove all zip files for training class samples. They\'re now at frameworks/base/docs/downloads/" into jb-dev 
* commit 'fbd1a85d7b9c176681731c679eefb370873acf6c':
  remove all zip files for training class samples. They're now at frameworks/base/docs/downloads/
 2012-08-07 15:27:31 -07:00
Scott Main
fbd1a85d7b am 5e01d367: am ef91cce8: Merge "remove all zip files for training class samples. They\'re now at frameworks/base/docs/downloads/" into jb-dev 
* commit '5e01d367b08ea225af6bca294acd04706ecaede2':
  remove all zip files for training class samples. They're now at frameworks/base/docs/downloads/
 2012-08-07 15:24:59 -07:00
Scott Main
5e01d367b0 am ef91cce8: Merge "remove all zip files for training class samples. They\'re now at frameworks/base/docs/downloads/" into jb-dev 
* commit 'ef91cce81b6b89c5d47c6fbda9ea913a95fa7d46':
  remove all zip files for training class samples. They're now at frameworks/base/docs/downloads/
 2012-08-07 15:23:33 -07:00
Scott Main
ef91cce81b Merge "remove all zip files for training class samples. They're now at frameworks/base/docs/downloads/" into jb-dev 2012-08-07 15:21:00 -07:00
Scott Main
826be7b0f9 remove all zip files for training class samples. 
They're now at frameworks/base/docs/downloads/

Change-Id: I3a82edcc73196dfc8ffc6a1e4d172925d5581157
 2012-08-07 15:13:23 -07:00
The Android Open Source Project
91f2656a69 am 0ba35c90: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '0ba35c9053302103422ed4062bd22c9fe3aaba07':
 2012-08-07 11:05:45 -07:00
The Android Open Source Project
0ba35c9053 Reconcile with jb-mr1-release - do not merge 
Change-Id: I4dbbd2b4acfd1b4c46645d251e3381ebaa7f8140
 2012-08-07 11:02:51 -07:00
The Android Automerger
c8123801f6 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-07 06:33:44 -07:00
Elliott Hughes
ad55632937 am 542d07a3: am 60fa2c38: am ede21119: am fdb7308b: Merge "Use uintptr_t for cast pointer to integer." 
* commit '542d07a3b28c19e0795531a9ea92a252b3224d88':
  Use uintptr_t for cast pointer to integer.
 2012-08-06 13:31:02 -07:00
Elliott Hughes
542d07a3b2 am 60fa2c38: am ede21119: am fdb7308b: Merge "Use uintptr_t for cast pointer to integer." 
* commit '60fa2c38883e7ad288e579804485ed77d7df923f':
  Use uintptr_t for cast pointer to integer.
 2012-08-06 13:25:26 -07:00
Elliott Hughes
60fa2c3888 am ede21119: am fdb7308b: Merge "Use uintptr_t for cast pointer to integer." 
* commit 'ede21119df2a9bfed7125380fbe7af32c7aa13e3':
  Use uintptr_t for cast pointer to integer.
 2012-08-06 13:23:27 -07:00
Elliott Hughes
ede21119df am fdb7308b: Merge "Use uintptr_t for cast pointer to integer." 
* commit 'fdb7308bb75e503486be134103d1260aadec8cae':
  Use uintptr_t for cast pointer to integer.
 2012-08-06 13:22:05 -07:00
The Android Open Source Project
ce01896bca am 2deb5582: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '2deb5582546f03c9d01829a8697069b1a82302e9':
 2012-08-06 13:19:46 -07:00
The Android Open Source Project
2deb558254 Reconcile with jb-mr1-release - do not merge 
Change-Id: Idbdf5795c4c239be1c515090c0f711cc7eb5c80b
 2012-08-06 13:18:20 -07:00
Elliott Hughes
fdb7308bb7 Merge "Use uintptr_t for cast pointer to integer." 2012-08-06 13:15:16 -07:00
The Android Automerger
1fa2dfd59a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-06 06:27:41 -07:00
Xavier Ducrohet
3928c6a83c am 76ad81c9: am e5fcbb1b: am e76ba310: am 78f6f9b1: Merge "Add Mips support to SDK." 
* commit '76ad81c9ba3bbb9082368b98a53ea27c95a64c4f':
  Add Mips support to SDK.
 2012-08-02 17:28:00 -07:00
Xavier Ducrohet
76ad81c9ba am e5fcbb1b: am e76ba310: am 78f6f9b1: Merge "Add Mips support to SDK." 
* commit 'e5fcbb1ba9b78e7a973126b4cdc4aa6956f78e7d':
  Add Mips support to SDK.
 2012-08-02 17:26:51 -07:00
Xavier Ducrohet
e5fcbb1ba9 am e76ba310: am 78f6f9b1: Merge "Add Mips support to SDK." 
* commit 'e76ba31077b42e4e2de1aa4af47db6bf9213cba6':
  Add Mips support to SDK.
 2012-08-02 17:24:40 -07:00
Xavier Ducrohet
e76ba31077 am 78f6f9b1: Merge "Add Mips support to SDK." 
* commit '78f6f9b1f34e543e0806cfb0393e29b1e39ae84f':
  Add Mips support to SDK.
 2012-08-02 17:22:57 -07:00
Xavier Ducrohet
78f6f9b1f3 Merge "Add Mips support to SDK." 2012-08-02 17:04:19 -07:00
The Android Open Source Project
35a7859b39 am a6c3f0b4: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'a6c3f0b46e7d19493f5f9f53295f384cefee2777':
 2012-08-02 15:09:04 -07:00
The Android Open Source Project
a6c3f0b46e Reconcile with jb-mr1-release - do not merge 
Change-Id: I34cec93953b7f525dd5f197fca616648ded151f4
 2012-08-02 11:26:23 -07:00
The Android Automerger
7a3c074423 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-02 07:14:26 -07:00
Nick Pelly
da8cad5029 am a495fa4c: am c1ca7cfb: Merge "Update eclipse .classpath" into jb-mr1-dev 
* commit 'a495fa4c69bca4f50bca1b6eb60d2e3761052de6':
  Update eclipse .classpath
 2012-08-01 17:24:41 -07:00
Nick Pelly
a495fa4c69 am c1ca7cfb: Merge "Update eclipse .classpath" into jb-mr1-dev 
* commit 'c1ca7cfbdcdefd315d22e6eba0fc421abffccab3':
  Update eclipse .classpath
 2012-08-01 16:15:19 -07:00
Nick Pelly
c1ca7cfbdc Merge "Update eclipse .classpath" into jb-mr1-dev 2012-08-01 16:13:21 -07:00
Nick Pelly
0956cd2055 Update eclipse .classpath 
Change-Id: I0b9120c72c2e59544339280606307a9ebd15db51
 2012-08-01 16:11:27 -07:00
The Android Open Source Project
e840aa72e8 am 3d4bc817: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '3d4bc81710cc6c9e56be64e40d4063db1e6347ba':
 2012-07-31 15:04:05 -07:00
The Android Open Source Project
3d4bc81710 Reconcile with jb-mr1-release - do not merge 
Change-Id: I0b462099aeb6f8cad759b33c16263720d87cec4b
 2012-07-31 15:02:38 -07:00
The Android Open Source Project
3569fe83c1 am 287f6546: (-s ours) am d397be39: am 215695fe: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '287f654637f628e992a636e24a2a24640d31e33c':
 2012-07-31 14:55:07 -07:00
The Android Open Source Project
287f654637 am d397be39: am 215695fe: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit 'd397be39eb7db29f3a52f63bf34c370ff0eaed6b':
 2012-07-31 14:52:49 -07:00
The Android Open Source Project
d397be39eb am 215695fe: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '215695fe5e84f1fd7acecf1bec68c6dd69ea3247':
 2012-07-31 14:49:16 -07:00