LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,511 Commits 2 Branches 0 Tags
f5c5d8153b58ca8fead20b2cf9ee93bac13215d7
Commit Graph

8511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
3af6828840 am 402d3fd4: am 41867b63: Merge "Fix the support-v4 demos to work on a platform with APIs V4 (samples part)" into ics-mr1 
* commit '402d3fd41838dc6a098ec3482f83b20b32df29f4':
  Fix the support-v4 demos to work on a platform with APIs V4 (samples part)
 2011-11-15 14:40:44 -08:00
Svetoslav Ganov
402d3fd418 am 41867b63: Merge "Fix the support-v4 demos to work on a platform with APIs V4 (samples part)" into ics-mr1 
* commit '41867b639fb02d9606d4f30359cafc66498f0cbd':
  Fix the support-v4 demos to work on a platform with APIs V4 (samples part)
 2011-11-15 14:38:04 -08:00
Svetoslav Ganov
41867b639f Merge "Fix the support-v4 demos to work on a platform with APIs V4 (samples part)" into ics-mr1 2011-11-15 14:34:53 -08:00
Svetoslav Ganov
a09e21a223 Fix the support-v4 demos to work on a platform with APIs V4 (samples part) 
Some of the samples are using APIs that are introduced after v4 but not supported
in the v4 library.  Update the samples to use the new stuff added to the support
library.

bug:5616340

Change-Id: I90889f5e9ee48e7e30249464e60d5d28cd3f7a4b
 2011-11-15 11:38:45 -08:00
The Android Automerger
c69cc60aa0 merge in ics-release history after reset to master 2011-11-15 06:59:25 -08:00
The Android Automerger
cfb2cc2120 merge in ics-mr1-release history after reset to ics-mr1 2011-11-15 06:45:30 -08:00
Fred Chung
14c26228cd SDK sample code for Bluetooth HDP API. 
Change-Id: I0f68ba42309c960f0df1e537b0932c6d68d9657b
 2011-11-14 21:36:25 -08:00
Alex Sakhartchouk
e27055bdec Fixing vector element alignment issues. 
Change-Id: Ie5555b9f5bbbc75e1dfd26d3ccbee84b8f71e018
 2011-11-14 17:47:26 -08:00
Dianne Hackborn
0efad946bd am f1ab1a8e: am 2fd75c63: Move switch preference into its own demo. 
* commit 'f1ab1a8e26c89442b758c56613a47e35e71d2ef5':
  Move switch preference into its own demo.
 2011-11-14 14:38:27 -08:00
Dianne Hackborn
f1ab1a8e26 am 2fd75c63: Move switch preference into its own demo. 
* commit '2fd75c63684e4ada9e00e1d31304519e60f5a22a':
  Move switch preference into its own demo.
 2011-11-14 14:35:56 -08:00
Dianne Hackborn
2fd75c6368 Move switch preference into its own demo. 
This avoids everything breaking on pre-ICS platforms.

Also get rid of pref initialization in Application. I hate that.  Hate
hate hate.  Hate.  Totally hate.

Totally.

Change-Id: Idb3526a96eb2dff49f9de8e5ae71149cb4ed6e96
 2011-11-14 14:28:42 -08:00
The Android Open Source Project
b9f27a5dcc Reconcile with ics-mr1-release 
Change-Id: Icbe033444524bc3b55a7dfb4fa21fca1f3b65b51
 2011-11-10 14:35:22 -08:00
The Android Automerger
80ff5aaeb5 merge in ics-release history after reset to master 2011-11-10 06:59:35 -08:00
Vladimir Chtchetkine
8d21ceda27 Merge "Fix temperature sensor" 2011-11-09 18:42:40 -08:00
Vladimir Chtchetkine
50ab613ece Fix temperature sensor 
Change-Id: I4cc1264f4437172e78b38ce394e4dd005ad1a59f
 2011-11-09 18:02:21 -08:00
Yu Shan Emily Lau
a97b2c8e45 am 145e160b: (-s ours) am d673b70d: am 6b415b7d: (-s ours) Merge "do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch" into ics-mr0 
* commit '145e160bfeb61c8bf3cfbd4242da4cde0d998df0':
 2011-11-10 01:11:31 +00:00
Yu Shan Emily Lau
c2837c2f34 am c7b60925: (-s ours) am 1baa142c: do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch 
* commit 'c7b60925d7ef7f6825bbb338f476198669a2b5c4':
  do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
 2011-11-09 21:50:48 +00:00
Yu Shan Emily Lau
e23a6af2d0 am 6c11c19b: (-s ours) am 6b415b7d: Merge "do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch" into ics-mr0 
* commit '6c11c19ba152a23cad8ae272c9b7b8e97c175c85':
  do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
 2011-11-09 21:18:58 +00:00
Yu Shan Emily Lau
145e160bfe am d673b70d: am 6b415b7d: (-s ours) Merge "do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch" into ics-mr0 
* commit 'd673b70dfd2506882c04335e29714e0d2c4ed5cd':
 2011-11-09 16:44:45 +00:00
Yu Shan Emily Lau
d673b70dfd am 6b415b7d: (-s ours) Merge "do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch" into ics-mr0 
* commit '6b415b7d0530151ffa3221594102a6752a539692':
  do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
 2011-11-09 16:41:13 +00:00
The Android Automerger
b9a0aa9594 merge in ics-release history after reset to master 2011-11-09 06:59:24 -08:00
The Android Automerger
36ad3914cd merge in ics-mr1-release history after reset to ics-mr1 2011-11-09 06:45:58 -08:00
Yu Shan Emily Lau
c7b60925d7 am 1baa142c: do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch 
* commit '1baa142c06f3500f02dfc8d2fc15f5f70b77f3b0':
  do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
 2011-11-09 14:36:12 +00:00
Yu Shan Emily Lau
6c11c19ba1 am 6b415b7d: Merge "do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch" into ics-mr0 
* commit '6b415b7d0530151ffa3221594102a6752a539692':
  do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
 2011-11-09 14:35:14 +00:00
David 'Digit' Turner
25e3c216f2 ndk: ANativeActivity: Fix 'clazz' member documentation. 
As discussed on android-ndk, the member is misnamed

Change-Id: I2a5a1c8dce327ddf9ab7a4d14f4e2fdf62808753
 2011-11-09 13:13:43 +01:00
Yu Shan Emily Lau
6b415b7d05 Merge "do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch" into ics-mr0 2011-11-08 16:03:19 -08:00
Yu Shan Emily Lau
1baa142c06 do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch 
Change-Id: Ia54463c93a7f941d7de3cc003ce773749d1f016e
 2011-11-08 15:35:28 -08:00
David Hu
9bc092f5b1 Change the test to user the listener mechanism 
this is to avoid the precision issue with the coordinates

DO NOT MERGE

Change-Id: Icfab3fa6fd0a331aef12ee71c73bac04dc9685be
 2011-11-08 14:43:36 -08:00
The Android Automerger
44c4dcf64c merge in ics-release history after reset to master 2011-11-08 06:53:05 -08:00
The Android Automerger
85ae4c5a46 merge in ics-mr1-release history after reset to ics-mr1 2011-11-08 06:45:15 -08:00
Ken Wakasa
638bfdf26d am c7160d8d: am c3b08379: Fix wrong paths to class references 
* commit 'c7160d8dcb9861af67eea4b822889b3ce93be0b9':
  Fix wrong paths to class references
 2011-11-07 16:49:17 +00:00
Ken Wakasa
c7160d8dcb am c3b08379: Fix wrong paths to class references 
* commit 'c3b0837982378fc1277295fb2322e33f6414a0b9':
  Fix wrong paths to class references
 2011-11-07 16:44:19 +00:00
The Android Open Source Project
e1cd1bda22 Reconcile with ics-mr1-release 
Change-Id: I075d7266fe74709ba56574d99fff5566956680b6
 2011-11-07 08:30:45 -08:00
Ken Wakasa
c3b0837982 Fix wrong paths to class references 
Change-Id: I778be2217165185fbb8eef08b8a232ea7ba986f0
 2011-11-07 20:00:25 +09:00
The Android Automerger
ef03c87706 merge in ics-release history after reset to master 2011-11-06 06:59:37 -08:00
The Android Automerger
6c6e78d4a2 merge in ics-mr1-release history after reset to ics-mr1 2011-11-06 06:45:31 -08:00
Yu Shan Emily Lau
887527429d do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch 
Change-Id: I21f83b96afc5c3a00a6570e8284adc23191b6dd2
 2011-11-05 17:09:57 -07:00
Yu Shan Emily Lau
95a667e29f Merge "Bug 5560527 Inject the keycode_0 to the wakeupscreen test activity to trun off the screen." 2011-11-04 16:31:58 -07:00
Yu Shan Emily Lau
4216f999d8 Bug 5560527 
Inject the keycode_0 to the
wakeupscreen test activity
to trun off the screen.

Change-Id: I094dbc4ffa42771a13dfb796761546093649481c
 2011-11-04 11:04:45 -07:00
Eric Fischer
bfe191ac7f Merge "Import revised translations." 2011-11-04 10:19:15 -07:00
The Android Open Source Project
d169814ab1 Reconcile with ics-mr1-release 
Change-Id: I4408759197de8cb777049a7581a77f29986b78f7
 2011-11-04 08:31:12 -07:00
Raphael
860997a7f4 am d960df40: (-s ours) cherrypick 76bd108d from master. do not merge. 
* commit 'd960df40f2c762c02cc2b47c53444b9b0f8374f1':
  cherrypick 76bd108d from master. do not merge.
 2011-11-03 22:47:35 +00:00
Raphael
d960df40f2 cherrypick 76bd108d from master. do not merge. 
Change-Id: Ibb677f286b54a9dd593301a0f8b194d3b2dc58d1
SDK: update SDK to API 15
 2011-11-03 15:42:39 -07:00
Robert Ly
65be1a5342 am cc1eef49: am 8e3c1951: Merge "adding fountain framebuffer object sdk sample" into ics-mr0 
* commit 'cc1eef493524af0ce727927996b346312637c78a':
  adding fountain framebuffer object sdk sample
 2011-11-03 19:59:31 +00:00
Robert Ly
cc1eef4935 am 8e3c1951: Merge "adding fountain framebuffer object sdk sample" into ics-mr0 
* commit '8e3c1951915010985db2abee212e8c4c37cacc53':
  adding fountain framebuffer object sdk sample
 2011-11-03 19:56:00 +00:00
Robert Ly
8e3c195191 Merge "adding fountain framebuffer object sdk sample" into ics-mr0 2011-11-03 12:54:02 -07:00
Raphael
4fbd948d15 Merge "SDK: update SDK to API 15" 2011-11-03 12:53:20 -07:00
Raphael
76bd108da7 SDK: update SDK to API 15 
Change-Id: Ie6eecb86c441ef71a0677884be4c9fdfcd2737de
 2011-11-03 12:31:37 -07:00
The Android Automerger
e1b5674322 merge in ics-release history after reset to master 2011-11-03 06:58:18 -07:00
David Turner
a04badffcd Merge "Native media sample app for NDK API level 14" 2011-11-03 04:46:21 -07:00