LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,409 Commits 2 Branches 0 Tags
ef1e085461ece39acf6433e7cb135a90aa67295c
Commit Graph

9409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
85ae4c5a46 merge in ics-mr1-release history after reset to ics-mr1 2011-11-08 06:45:15 -08:00
Ken Wakasa
e53fd02f84 am c7160d8d: am c3b08379: Fix wrong paths to class references 
* commit 'c7160d8dcb9861af67eea4b822889b3ce93be0b9':
  Fix wrong paths to class references
 2011-11-07 17:37:20 +00: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
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
a2c602839d am d960df40: cherrypick 76bd108d from master. do not merge. 
* commit 'd960df40f2c762c02cc2b47c53444b9b0f8374f1':
  cherrypick 76bd108d from master. do not merge.
 2011-11-03 22:45:52 +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
4b148ed4f9 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:57:14 +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
David Turner
a04badffcd Merge "Native media sample app for NDK API level 14" 2011-11-03 04:46:21 -07:00
David Hu
63e5983c9b Merge "Change the test to user the listener mechanism" 2011-11-02 20:11:20 -07:00
Glenn Kasten
e14b1a23af Native media sample app for NDK API level 14 
Change-Id: I72de0406eefb7ccf1a39944e814aa7c240d8184b
 2011-11-02 18:04:54 -07:00
David Hu
acf95539c3 Change the test to user the listener mechanism 
this is to avoid the precision issue with the coordinates

Change-Id: Icfab3fa6fd0a331aef12ee71c73bac04dc9685be
 2011-11-02 17:01:23 -07:00
Robert Ly
a3a8cfd25b adding fountain framebuffer object sdk sample 
Change-Id: I0156281baf450b4aafcd1d43bf5fd9ef8d4cb6cc
 2011-11-02 15:30:37 -07:00
Raphael
d18e045118 Merge "SDK: updating android Windows USB Driver." 2011-11-02 13:56:11 -07:00
Eric Fischer
3e22ceeefe am 92a00bb6: Import revised translations. 
* commit '92a00bb671bc65612aa72d57ef0e601e80ecb12e':
  Import revised translations.
 2011-11-02 17:30:45 +00:00
Eric Fischer
0ece08bce4 Import revised translations. 
Change-Id: Icf6596dc62d32e54aee3be73261c43cb0777fbef
 2011-11-02 09:39:20 -07:00
The Android Automerger
7da5f25160 merge in ics-mr1-release history after reset to ics-mr1 2011-11-02 06:45:30 -07:00
Eric Fischer
37ce92f9a2 am 92a00bb6: Import revised translations. 
* commit '92a00bb671bc65612aa72d57ef0e601e80ecb12e':
  Import revised translations.
 2011-11-01 20:26:38 +00:00
Eric Fischer
92a00bb671 Import revised translations. 
Change-Id: I7220d09a75e5372acdab213888ecd53665004c71
 2011-11-01 13:19:12 -07:00
The Android Automerger
0e91ad7563 merge in ics-mr1-release history after reset to ics-mr1 2011-11-01 06:45:26 -07:00
Svetoslav Ganov
d3837ae622 resolved conflicts for merge of c90e0d59 to master 
Change-Id: I51f83d9a0df0c9b154936a669e458becec8b38f7
 2011-10-31 17:22:41 -07:00
Svetoslav Ganov
ef9a8adcab am c90e0d59: am bc43ef45: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 
* commit 'c90e0d59360db5bb1b94712fc87737c9ab2ce475':
  Folding Accessibility Service sample into ApiDemos.
 2011-10-31 20:32:42 +00:00
Svetoslav Ganov
c90e0d5936 am bc43ef45: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 
* commit 'bc43ef4554c457c499af9e5f998f6f79a484f4a3':
  Folding Accessibility Service sample into ApiDemos.
 2011-10-31 20:30:29 +00:00
Svetoslav Ganov
bc43ef4554 Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 2011-10-31 13:28:53 -07:00
The Android Open Source Project
6e26392551 Reconcile with ics-mr1-release 
Change-Id: I73e9ddce05e732bebb97a86e24c318b009ddceb7
 2011-10-31 13:19:08 -07:00
Ed Heyl
39858d19e9 Merge remote branch 'goog/ics-mr1' into ics-aah 2011-10-31 05:54:41 -07:00
Jack Palevich
a4591cb625 am 48a1cf10: am e864636c: Remove Graphics > OpenGL ES > Hidden Activity from Api Demos 
* commit '48a1cf10af09f578221933a4e55109fbddf4c270':
  Remove Graphics > OpenGL ES > Hidden Activity from Api Demos
 2011-10-31 12:26:35 +00:00
The Android Automerger
a3fc6df0db merge in ics-mr1-release history after reset to ics-mr1 2011-10-30 06:45:57 -07:00
Jack Palevich
48a1cf10af am e864636c: Remove Graphics > OpenGL ES > Hidden Activity from Api Demos 
* commit 'e864636c554efa18f83ad9fa405058b51d531998':
  Remove Graphics > OpenGL ES > Hidden Activity from Api Demos
 2011-10-29 03:15:18 +00:00
Svetoslav Ganov
101f061d35 Folding Accessibility Service sample into ApiDemos. 
1. Moving Accerssibility Service sample into ApiDemos since
   we are putting all accessibility samples there.

2. Fixed regressions (mainly due to adding new event types)
   in the Accessibility Service sample.

3. Updated the Query Window Content sample to have some
   instructions and to work with touch exploration.

Change-Id: I226ac4130f7f8cae47bb52cbdeab9f104cfaba40
 2011-10-28 19:18:24 -07:00
Jack Palevich
e864636c55 Remove Graphics > OpenGL ES > Hidden Activity from Api Demos 
This activity was accidentally added to the Api Demos manifest
in an earlier checkin.

Because the corresponding Java classes were never checked in,
the activity never actually worked.

Change-Id: I7a7c8c90e8e6b9689f87720fc7f4d53556c2f227
 2011-10-28 15:45:43 -07:00