LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,266 Commits 2 Branches 0 Tags
4ddc85ac9da73899dc3a33e289daf51a14f6c69c
Commit Graph

4266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
8cc5a8166d merge from open-source master 
Change-Id: I900ca65f70c1a66781fb5f6f37c45961416d5650
 2010-06-02 07:22:11 -07:00
Guang Zhu
68f37ab918 Merge "Add coverage_targets.xml into test image" into kraken 2010-06-01 15:55:21 -07:00
Guang Zhu
ea7e48c8be Add coverage_targets.xml into test image 
This file is needed to get coverage targets definition when running code
coverage

Change-Id: If48ad5d9693eaa5857a308f2d304f388d5d8c4d5
 2010-06-01 14:38:23 -07:00
Kenny Root
8aede04bf2 Add positional parameters to aid in i18n 
Different languages might have different word orders, so add in
positional parameters for strings that have more than one substitution.

Change-Id: Ie9fc74eb0a22471b272e65c6cd521f1518b322d1
 2010-06-01 11:50:47 -07:00
Yu Shan Emily Lau
67dfcbf17b am 59b6dce0: am 39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo 
Merge commit '59b6dce0d5035b44dd8d99523efc63a469246f42' into kraken

* commit '59b6dce0d5035b44dd8d99523efc63a469246f42':
  Added the instrumentation and power log monkey events fro the new power framework.
 2010-05-28 15:54:27 -07:00
Yu Shan Emily Lau
59b6dce0d5 am 39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo 
Merge commit '39d7a7451b7e43dc1d71ac983821e76c88775a81' into froyo-plus-aosp

* commit '39d7a7451b7e43dc1d71ac983821e76c88775a81':
  Added the instrumentation and power log monkey events fro the new power framework.
 2010-05-28 15:50:23 -07:00
Yu Shan Emily Lau
39d7a7451b Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo 2010-05-28 15:38:48 -07:00
Yu Shan Emily Lau
2952b49c7c Added the instrumentation and power log monkey events fro the new power framework. 
Change-Id: I3102e6caaba8763a2197ff80f13c8d127ea42316
 2010-05-28 13:48:42 -07:00
Kenny Root
13cf156b85 am 8824549d: am 99cb1d16: Merge "Spelling fix for source download page" into froyo 
Merge commit '8824549dce27b5bb3085e6a83f06ca4d16b78ea6' into kraken

* commit '8824549dce27b5bb3085e6a83f06ca4d16b78ea6':
  Spelling fix for source download page
 2010-05-26 15:39:52 -07:00
Kenny Root
8824549dce am 99cb1d16: Merge "Spelling fix for source download page" into froyo 
Merge commit '99cb1d16cc609866bb17c729d9b41926924ab4dd' into froyo-plus-aosp

* commit '99cb1d16cc609866bb17c729d9b41926924ab4dd':
  Spelling fix for source download page
 2010-05-26 15:38:05 -07:00
Kenny Root
99cb1d16cc Merge "Spelling fix for source download page" into froyo 2010-05-26 15:36:27 -07:00
Xavier Ducrohet
d9c6e6948a am 6e6c1ebd: (-s ours) am 02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge 
Merge commit '6e6c1ebd77a6a353bf2af77035c73c606311d8c3' into kraken

* commit '6e6c1ebd77a6a353bf2af77035c73c606311d8c3':
  Move the rev of the froyo sdk component to 2. Do not merge
 2010-05-26 13:52:59 -07:00
Xavier Ducrohet
6e6c1ebd77 am 02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge 
Merge commit '02ad7fc23a8f6a6eddf8ac25138c78f2fd5e8ed7' into froyo-plus-aosp

* commit '02ad7fc23a8f6a6eddf8ac25138c78f2fd5e8ed7':
  Move the rev of the froyo sdk component to 2. Do not merge
 2010-05-26 13:51:54 -07:00
Xavier Ducrohet
02ad7fc23a Move the rev of the froyo sdk component to 2. Do not merge 
Change-Id: I44b05cd40dad2df760d3d259246a714b82ddf9a2
 2010-05-26 13:48:10 -07:00
Christian Mehlmauer
58ff1585cd Replaced Deprecated GestureDetector API Call 
Change-Id: I36429680b555f834e74ec86c6aa17b696d17d2b6
 2010-05-25 20:17:51 +02:00
Dirk Dougherty
b2d652d1c0 am d43be56d: am 3c19d0e0: Doc change: increment androidappdocs version. 
Merge commit 'd43be56d40a813bedf96203c4b58056c6139eec0' into kraken

* commit 'd43be56d40a813bedf96203c4b58056c6139eec0':
  Doc change: increment androidappdocs version.
 2010-05-24 10:25:09 -07:00
Dirk Dougherty
d43be56d40 am 3c19d0e0: Doc change: increment androidappdocs version. 
Merge commit '3c19d0e052fae5f21f8e8592143a24919b106743' into froyo-plus-aosp

* commit '3c19d0e052fae5f21f8e8592143a24919b106743':
  Doc change: increment androidappdocs version.
 2010-05-24 10:23:08 -07:00
Dirk Dougherty
3c19d0e052 Doc change: increment androidappdocs version. 
Change-Id: Ifd517ed5c51cb95fdc4cc83d5521242086d59534
 2010-05-24 10:17:06 -07:00
Andy McFadden
26dc36123f Sim fixes. 
Pulled a fix to the simulator app ("long" is 64-bit when 32-bit was
needed) from master.  sim-eng is useful for verifying the x86 SMP stuff.

Also quieted a compiler warning.

Change-Id: I399ea4923b7e0650d5f995e056c751374b057fbd
 2010-05-21 11:00:14 -07:00
Romain Guy
91cd277060 Merge "removed unused imports" 2010-05-20 22:11:49 -07:00
Romain Guy
8b676d1916 Merge "removed unused imports" 2010-05-20 22:10:43 -07:00
Romain Guy
72d89196dd Merge "removed unused imports" 2010-05-20 22:10:15 -07:00
Romain Guy
c34cbee5b2 Merge "Removed unused import" 2010-05-20 22:09:03 -07:00
Christian Mehlmauer
60a798eff5 removed unused imports 
Change-Id: Ic48743a984bae2140e7e8f1b451be0f3760179f0
 2010-05-20 21:07:30 +02:00
Christian Mehlmauer
ed674c1ec7 removed unused imports 
Change-Id: I26fd85aa922e73c49ac319ed2b9f9e31603ced7b
 2010-05-20 21:06:37 +02:00
Christian Mehlmauer
942e696486 removed unused imports 
Change-Id: I1411ee3d0229918a6ff3837894d63f775550da27
 2010-05-20 21:04:57 +02:00
Christian Mehlmauer
019a7e463b Removed unused import 
Change-Id: I85a1120ff8f9bc7186cdbc07c78d91a8d136fd5a
 2010-05-20 20:35:14 +02:00
Christian Mehlmauer
38dcb296c9 Reduced Warnings 
Change-Id: I3ce0d27d24e8aad3fdbf8c57cefe39d1a3fd99e9
 2010-05-20 20:13:51 +02:00
Romain Guy
4b5c09f29e Merge "Updated deprecated Contacts API to ContactsContract" 2010-05-19 22:06:53 -07:00
Romain Guy
d2e12d0428 Merge "Updated Sensor Samples to newest API" 2010-05-19 22:06:33 -07:00
Christian Mehlmauer
62e6bdb0fe Updated deprecated Contacts API to ContactsContract 
Change-Id: I1d51b5eba579e841d6024eec08670ae8ff595f94
 2010-05-20 06:29:48 +02:00
Christian Mehlmauer
707eb2ffec Updated Sensor Samples to newest API 
Change-Id: I88c0ce08232fed34aa99c97385155220e7d9abff
 2010-05-19 18:27:34 +02:00
The Android Open Source Project
d350cf1bb8 am ca81fb41: merge from open-source master 
Merge commit 'ca81fb411afd93378f01e3e13ef482693fd35a73' into kraken

* commit 'ca81fb411afd93378f01e3e13ef482693fd35a73':
  Corrected StatusBarNotificationSample
 2010-05-19 08:18:13 -07:00
The Android Open Source Project
ca81fb411a merge from open-source master 
Change-Id: I4af8f65d1dfff3912f0057645943df78ddefc7ca
 2010-05-19 08:13:51 -07:00
Guang Zhu
1a3ab7bfaf Merge "code coverage improvement (DO NOT MERGE)" into kraken 2010-05-18 18:44:16 -07:00
Dianne Hackborn
689868ac47 Small fix to surface window sample. 
Change-Id: Iaae90aaf8cfdb71c6201eba8a436450a75b2b732
 2010-05-18 18:33:05 -07:00
Christian Mehlmauer
9bfa323af1 Corrected StatusBarNotificationSample 
Change-Id: I892e84198cfe288e673b81e8ffc331525fee09b8
 2010-05-18 23:44:32 +02:00
Dianne Hackborn
5ee6d7a18c Merge "Add new demo of taking over a window's surface." into kraken 2010-05-18 12:21:39 -07:00
The Android Open Source Project
f8402ac032 am 253290a7: merge from open-source master 
Merge commit '253290a70f2b8f9ca4f0e79b18d9c3f7fe82561b' into kraken

* commit '253290a70f2b8f9ca4f0e79b18d9c3f7fe82561b':
  Removed bad BuildPaths (not existing Directories after checkout)
 2010-05-18 10:59:19 -07:00
The Android Open Source Project
253290a70f merge from open-source master 
Change-Id: I5780767c96fbc775ce0dbbcfddb0c2e84bbfaf41
 2010-05-18 10:56:24 -07:00
Guang Zhu
863870c168 code coverage improvement (DO NOT MERGE) 
* automatically detect if emma is on device
* build emma into libcore if necessary
* stop runtime before adb sync and restart afterwards

Change-Id: Id5087fdd6c0345f2b9b76658a5083b9260af061e
 2010-05-18 10:54:47 -07:00
Dianne Hackborn
988a7192ac Add new demo of taking over a window's surface. 
Change-Id: If76f577d2a314018d7dc7980ffa446b7cf050037
 2010-05-18 10:46:32 -07:00
The Android Open Source Project
3dcb1f7ab4 am c043a97c: merge from open-source master 
Merge commit 'c043a97c9f3e1a2c8b5a95df70b89c711a1087ce' into kraken

* commit 'c043a97c9f3e1a2c8b5a95df70b89c711a1087ce':
  Removed Calls to deprecated API
  Removed Duplicate Build Paths
 2010-05-18 09:31:32 -07:00
The Android Open Source Project
c043a97c9f merge from open-source master 
Change-Id: Ib0c6bef7b527a79c9902046889e29a4bccd0ab87
 2010-05-18 09:27:19 -07:00
Christian Mehlmauer
ec867a8c35 Removed bad BuildPaths (not existing Directories after checkout) 
Change-Id: Ia21cb1927dfc8851f728ef3a2175cbdf701f7641
 2010-05-18 06:53:36 +02:00
Jean-Baptiste Queru
0195941e06 Merge "Removed Duplicate Build Paths" 2010-05-17 15:02:56 -07:00
Christian Mehlmauer
b88f42b361 Removed Calls to deprecated API 
Change-Id: Ia94734637df6aa7b8b08417c49a3485f34f1b94c
 2010-05-17 23:43:43 +02:00
Christian Mehlmauer
165b906aa5 Removed Duplicate Build Paths 
Change-Id: I9b4d4d5163365cde3c97d0d8f05b38a4b8406cea
 2010-05-16 22:46:34 +02:00
The Android Open Source Project
08d3110279 am 99096976: merge from open-source master 
Merge commit '99096976d0ed8436c0eacdefae0ffb606bd573c5' into kraken

* commit '99096976d0ed8436c0eacdefae0ffb606bd573c5':
  Added missing --pct-syskeys to processOptions in Monkey
 2010-05-12 09:36:11 -07:00
The Android Open Source Project
99096976d0 merge from open-source master 
Change-Id: I4bbf0fccef174a7f0eb8241b422f846ea21c3349
 2010-05-12 09:27:49 -07:00