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

4759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Murdoch
3b6f45dbd2 Merge Webkit at r58956: Plugin code has switched to C99 integer types. See http://trac.webkit.org/changeset/58590 
Change-Id: Id521afd66935db6149a341f89ab6b4d7440e4695
 2010-05-14 10:24:06 +01:00
Dianne Hackborn
edb8628b41 Update fragment API demos for new fragment APIs: 
- Correctly work with state saving and restoring.
- Add new sample showing a fragment that is retained across activities.

Change-Id: I7b1e02135177e69e9fff23fcc55e86d93a75c7e0
 2010-05-13 11:13:47 -07:00
The Android Open Source Project
5b4766d4a2 am 08d31102: am 99096976: merge from open-source master 2010-05-12 09:51:39 -07: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
Dirk Dougherty
8dcf7716c0 am 529ba2e5: am 8bfa91f0: am 56c8df1b: sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds. 2010-05-11 10:27:58 -07:00
Dirk Dougherty
529ba2e5f2 am 8bfa91f0: am 56c8df1b: sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds. 
Merge commit '8bfa91f076b667223920d8b68c8ab0f6e8dbc164' into kraken

* commit '8bfa91f076b667223920d8b68c8ab0f6e8dbc164':
  sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
 2010-05-11 10:23:32 -07:00
Dirk Dougherty
8bfa91f076 am 56c8df1b: sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds. 
Merge commit '56c8df1b0637c380bd7aa3f9a928430abfba2c7d' into froyo-plus-aosp

* commit '56c8df1b0637c380bd7aa3f9a928430abfba2c7d':
  sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
 2010-05-11 10:18:43 -07:00
Johan Alfven
f515f1a6c8 Added missing --pct-syskeys to processOptions in Monkey 
According to the developer guidelines
http://developer.android.com/guide/developing/tools/monkey.html
it should be possible to run monkey with option --pct-syskeys <percent>
to adjust percentage of "system" key events. (These are keys that are
generally reserved for use by the system, such as Home, Back,
Start Call, End Call, or Volume controls.) However, when trying
to run monkey with that option it fails with:
** Error: Unknown option: --pct-syskeys
The function processOptions in file Monkey.java was missing the
option --pct-syskeys.

Change-Id: I5d328fc93dfe67ed7a905735d6762c7f91c69838
 2010-05-11 09:11:43 +02:00
Dirk Dougherty
56c8df1b06 sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds. 
Change-Id: I51d412e1e78e6bd672eb419d53310eb1194672a3
 2010-05-10 16:12:24 -07:00
Scott Main
4518a7eae6 am 07155b40: am 46ea5655: am 6807387d: change searchable dictionary folder name back to normal (exclude "v2", which should instead be used only for HTML titles) 2010-05-10 13:51:41 -07:00
Scott Main
3f9bf30749 am 689176f3: am e7506f83: am 1b2c8084: add version code and name to searchable dictionary sample (make it v2) 2010-05-10 13:51:36 -07:00
Scott Main
07155b40b4 am 46ea5655: am 6807387d: change searchable dictionary folder name back to normal (exclude "v2", which should instead be used only for HTML titles) 
Merge commit '46ea565515a1ab4f3bc4107eae8c0e909b634dac' into kraken

* commit '46ea565515a1ab4f3bc4107eae8c0e909b634dac':
  change searchable dictionary folder name back to normal (exclude "v2", which
 2010-05-10 13:48:59 -07:00
Scott Main
689176f33b am e7506f83: am 1b2c8084: add version code and name to searchable dictionary sample (make it v2) 
Merge commit 'e7506f830636bfb3425b0efb6f8a8675cb1717c6' into kraken

* commit 'e7506f830636bfb3425b0efb6f8a8675cb1717c6':
  add version code and name to searchable dictionary sample (make it v2)
 2010-05-10 13:48:57 -07:00
Scott Main
46ea565515 am 6807387d: change searchable dictionary folder name back to normal (exclude "v2", which should instead be used only for HTML titles) 
Merge commit '6807387d71dbcad1577edc3b2a88e11eda0aa8c0' into froyo-plus-aosp

* commit '6807387d71dbcad1577edc3b2a88e11eda0aa8c0':
  change searchable dictionary folder name back to normal (exclude "v2", which
 2010-05-10 13:47:14 -07:00
Scott Main
e7506f8306 am 1b2c8084: add version code and name to searchable dictionary sample (make it v2) 
Merge commit '1b2c80841221bb69ca0384974fab462156cfc07d' into froyo-plus-aosp

* commit '1b2c80841221bb69ca0384974fab462156cfc07d':
  add version code and name to searchable dictionary sample (make it v2)
 2010-05-10 13:47:12 -07:00
Scott Main
6807387d71 change searchable dictionary folder name back to normal (exclude "v2", which 
should instead be used only for HTML titles)

Change-Id: Ia5c08478d91fb8aa6246fcbca3d68337becadf65
 2010-05-10 12:46:19 -07:00
Scott Main
1b2c808412 add version code and name to searchable dictionary sample (make it v2) 
Change-Id: Ie19c107528ef0df715936303baeda002efaef6cb
 2010-05-10 12:34:08 -07:00
Xavier Ducrohet
4b0af94a9a am 54d1f9c9: am 33c1d23b: am ca2327f1: Merge "Fix target for library sample" into froyo 2010-05-10 09:50:58 -07:00
Xavier Ducrohet
54d1f9c9cf am 33c1d23b: am ca2327f1: Merge "Fix target for library sample" into froyo 
Merge commit '33c1d23b012e9351667c85b2769b838a7f12b727' into kraken

* commit '33c1d23b012e9351667c85b2769b838a7f12b727':
  Fix target for library sample
 2010-05-10 09:47:30 -07:00
Xavier Ducrohet
33c1d23b01 am ca2327f1: Merge "Fix target for library sample" into froyo 
Merge commit 'ca2327f1d44fcd66c4a9396e4e70471f1075eae6' into froyo-plus-aosp

* commit 'ca2327f1d44fcd66c4a9396e4e70471f1075eae6':
  Fix target for library sample
 2010-05-10 09:43:08 -07:00
Dianne Hackborn
09fa09cff2 Update to follow fragment APIs. 
Change-Id: If7f4d2465590cd27aed04d2675498fbe59474728
 2010-05-07 11:31:43 -07:00
Xavier Ducrohet
ca2327f1d4 Merge "Fix target for library sample" into froyo 2010-05-07 10:58:32 -07:00
Xavier Ducrohet
1959000ef1 Fix target for library sample 
Change-Id: I89a1b6a7c7803ac52f5872e4b8a8696bb32ca5a3
 2010-05-07 10:57:58 -07:00
Joe Malin
9ad468d208 am 13318841: am 10cedd23: am 527cfd6e: Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications... 2010-05-07 10:53:13 -07:00
Dirk Dougherty
fbb0042fe4 Merge commit '0f7185d9' into master, resolve conflicts. 
Conflicts:
	samples/Spinner/_index.html
	samples/SpinnerTest/AndroidManifest.xml
	samples/SpinnerTest/_index.html
	samples/SpinnerTest/src/com/android/example/spinner/test/SpinnerActivityTest.java

Change-Id: Ibd2bbd81c828c4a4337d2d0e397bd9a0b1e90728
 2010-05-07 10:44:30 -07:00
Joe Malin
133188410d am 10cedd23: am 527cfd6e: Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications... 
Merge commit '10cedd234b31ab785c61ddf3f101d9a5980a0ec2' into kraken

* commit '10cedd234b31ab785c61ddf3f101d9a5980a0ec2':
  Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications...
 2010-05-07 09:55:34 -07:00
Joe Malin
10cedd234b am 527cfd6e: Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications... 
Merge commit '527cfd6ef30a92a679aa2fff3d57f7024cebf609' into froyo-plus-aosp

* commit '527cfd6ef30a92a679aa2fff3d57f7024cebf609':
  Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications...
 2010-05-07 09:54:29 -07:00
Joe Malin
527cfd6ef3 Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications... 
Change-Id: Ic4a1d28ea821ab7e35255d5a62ca0978cb9155ba
 2010-05-07 09:48:47 -07:00
Dirk Dougherty
0f7185d921 am 9e678c26: am 2f0b1c13: Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial 
Merge commit '9e678c26d81ba76ad48e73cb7c78a6210cd91a7b' into kraken

* commit '9e678c26d81ba76ad48e73cb7c78a6210cd91a7b':
  Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial
 2010-05-07 09:21:55 -07:00
Dirk Dougherty
9e678c26d8 am 2f0b1c13: Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial 
Merge commit '2f0b1c1335f6212889633e170d71c56dba70e78e' into froyo-plus-aosp

* commit '2f0b1c1335f6212889633e170d71c56dba70e78e':
  Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial
 2010-05-07 09:20:00 -07:00
Dirk Dougherty
2f0b1c1335 Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial 
Conflicts:

	build/sdk.atree

Change-Id: I5edb1d4d8a18fbda53a0e78ca6c9d20cf7d3ff4a
 2010-05-07 09:16:56 -07:00
Xavier Ducrohet
41d44d30bb am fd51be7a: am e823f9eb: am cf997049: Fix the Library sample. 2010-05-06 17:43:34 -07:00
Xavier Ducrohet
9409d1c3e8 am 03c7c8b6: am 5542d32c: am fc7428f9: Add the TicTacToe Lib+Main samples 2010-05-06 17:42:06 -07:00
Xavier Ducrohet
fd51be7a7e am e823f9eb: am cf997049: Fix the Library sample. 
Merge commit 'e823f9ebc789718ee9061856f1f3951bfec562e1' into kraken

* commit 'e823f9ebc789718ee9061856f1f3951bfec562e1':
  Fix the Library sample.
 2010-05-06 17:39:57 -07:00
Xavier Ducrohet
e823f9ebc7 am cf997049: Fix the Library sample. 
Merge commit 'cf9970499bfcce80d92c2fe37fd552e586c177b6' into froyo-plus-aosp

* commit 'cf9970499bfcce80d92c2fe37fd552e586c177b6':
  Fix the Library sample.
 2010-05-06 17:38:30 -07:00
Xavier Ducrohet
03c7c8b615 am 5542d32c: am fc7428f9: Add the TicTacToe Lib+Main samples 
Merge commit '5542d32c67e31f4e39ff33904613ec722d42ddd1' into kraken

* commit '5542d32c67e31f4e39ff33904613ec722d42ddd1':
  Add the TicTacToe Lib+Main samples
 2010-05-06 17:38:24 -07:00
Xavier Ducrohet
5542d32c67 am fc7428f9: Add the TicTacToe Lib+Main samples 
Merge commit 'fc7428f91254740a245fdac5db77d035c0b4c41f' into froyo-plus-aosp

* commit 'fc7428f91254740a245fdac5db77d035c0b4c41f':
  Add the TicTacToe Lib+Main samples
 2010-05-06 17:36:56 -07:00
Xavier Ducrohet
cf9970499b Fix the Library sample. 
Change-Id: I38d0336b8f1952d4e0424501dcd060d173624b5b
 2010-05-06 17:35:35 -07:00
Xavier Ducrohet
fc7428f912 Add the TicTacToe Lib+Main samples 
Change-Id: I17a26172ab82b2e4b794774c5ab94bed8202b7d4
 2010-05-06 16:53:09 -07:00
The Android Open Source Project
39ffffa094 am dd440b40: am 02d92477: Merge commit \'goog/readonly-korg-master\' into HEAD 2010-05-06 15:35:33 -07:00
The Android Open Source Project
dd440b4067 am 02d92477: Merge commit \'goog/readonly-korg-master\' into HEAD 
Merge commit '02d92477d5bd290eb8cd1ef7e13e903520ebba05' into kraken

* commit '02d92477d5bd290eb8cd1ef7e13e903520ebba05':
  Update sdk.atree with new ant rules location.
 2010-05-06 15:16:03 -07:00
The Android Open Source Project
02d92477d5 Merge commit 'goog/readonly-korg-master' into HEAD 2010-05-06 15:07:55 -07:00
Kenny Root
cc5e047e6c am 3215afae: (-s ours) Update classpath for Eclipse DO NOT MERGE 2010-05-06 13:30:44 -07:00
Kenny Root
3215afaee4 Update classpath for Eclipse DO NOT MERGE 
Change-Id: Id16bde9c7eef953e7c31f86e8c485a9025294586
 2010-05-06 12:01:08 -07:00
Dianne Hackborn
d2d93d0b17 Update fragment samples to show back stacks and layout. 
Change-Id: I016f87dc3b7433d0600a9a9308f666a36c5a98ca
 2010-05-06 11:57:56 -07:00
Kenny Root
5a5697c81a Spelling fix for source download page 
Change-Id: I177310b80a2fe632823b6c7b7b63ec11e8e6e829
 2010-05-05 18:06:45 -07:00
Xavier Ducrohet
c52dc95107 am 360fba54: Update sdk.atree with new ant rules location. 2010-05-05 17:51:25 -07:00
Xavier Ducrohet
360fba5491 Update sdk.atree with new ant rules location. 
Change-Id: I8ff92a2343e1a4aa13ad4e8751e2a135eac09425
 2010-05-05 15:56:12 -07:00
Xavier Ducrohet
36cb47e677 Update sdk.atree with new ant rules location. 
Change-Id: I69cd421f36c8ea2b41b3f22f053489ac7dc5e3e9
 2010-05-05 14:13:49 -07:00