Commit Graph

4301 Commits

Author SHA1 Message Date
Derek Sollenberger
131bf0b09e am 704da604: Merge "Disable Proguard for the SampleBrowerPlugin" into gingerbread
Merge commit '704da60406d259c5a3bfe273755861f80575d7ca' into gingerbread-plus-aosp

* commit '704da60406d259c5a3bfe273755861f80575d7ca':
  Disable Proguard for the SampleBrowerPlugin
2010-08-27 07:45:43 -07:00
Derek Sollenberger
704da60406 Merge "Disable Proguard for the SampleBrowerPlugin" into gingerbread 2010-08-27 07:43:54 -07:00
Derek Sollenberger
48c0834ab5 Disable Proguard for the SampleBrowerPlugin
The native plugin library makes calls into java files that are
not often stripped out when Proguard optimizes the package.

Change-Id: I6ce8867dc9fa23e8a6adcc8daf9c8fb75f83c16d
2010-08-27 10:40:51 -04:00
Yu Shan Emily Lau
f1598c4cf4 am ea7d6e8e: Merge "Add the new option for the device sleep time. This is only for the scripted monkey." into gingerbread
Merge commit 'ea7d6e8e6568b777693c52183e9abf973786a6b5' into gingerbread-plus-aosp

* commit 'ea7d6e8e6568b777693c52183e9abf973786a6b5':
  Add the new option for the device sleep time. This is only for the scripted monkey.
2010-08-26 15:27:57 -07:00
Yu Shan Emily Lau
ea7d6e8e65 Merge "Add the new option for the device sleep time. This is only for the scripted monkey." into gingerbread 2010-08-26 15:17:36 -07:00
Dianne Hackborn
1cb87dac33 am 4f410fb5: Update to follow API.
Merge commit '4f410fb5bfe0bad4760610b771edb33300470041' into gingerbread-plus-aosp

* commit '4f410fb5bfe0bad4760610b771edb33300470041':
  Update to follow API.
2010-08-26 14:46:30 -07:00
Dianne Hackborn
4f410fb5bf Update to follow API.
Change-Id: I9d6a1dc64cd4e55bf68994784c4a724aeafd7857
2010-08-26 14:38:20 -07:00
Yu Shan Emily Lau
9ab015751d Add the new option for the device sleep time. This is only for the scripted monkey.
Change-Id: I4a6bd7133bbd2da9594a47e1f5529c5358cd9aed
2010-08-26 14:18:18 -07:00
Raphael Moll
059e4eb3db am f08d230e: SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
Merge commit 'f08d230ed0d2612e79c121e0afa1e439b5702815' into gingerbread-plus-aosp

* commit 'f08d230ed0d2612e79c121e0afa1e439b5702815':
  SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
2010-08-26 09:02:13 -07:00
Jean-Baptiste Queru
40ed6797ee am 33462598: am bea98acf: reconcile open-source froyo into google variant
Merge commit '33462598d8c20001483f3f2e1bca155fa3a83cd5' into gingerbread-plus-aosp

* commit '33462598d8c20001483f3f2e1bca155fa3a83cd5':
  Explicitly enable backup by default in SDK builds
2010-08-25 10:15:11 -07:00
Jean-Baptiste Queru
33462598d8 am bea98acf: reconcile open-source froyo into google variant
Merge commit 'bea98acfa2253796aeade605c7020a7cc942af41' into gingerbread

* commit 'bea98acfa2253796aeade605c7020a7cc942af41':
  Explicitly enable backup by default in SDK builds
2010-08-25 10:13:14 -07:00
Brad Fitzpatrick
616acdb9cd am 06bcd705: Quiet harmless StrictMode violations caused by the Monkey.
Merge commit '06bcd705606070aa71425fc557e72592a2405a0a' into gingerbread-plus-aosp

* commit '06bcd705606070aa71425fc557e72592a2405a0a':
  Quiet harmless StrictMode violations caused by the Monkey.
2010-08-25 10:10:40 -07:00
Brad Fitzpatrick
06bcd70560 Quiet harmless StrictMode violations caused by the Monkey.
The monkey writes to System.out which is effectively a file and is
caught by StrictMode.

BUG=2947447

Change-Id: Iab38917f18baa319dad34d0c788bc9a10a041796
2010-08-25 09:45:49 -07:00
Jean-Baptiste Queru
bea98acfa2 reconcile open-source froyo into google variant
Change-Id: I2dcb50be9b2061fb90a10d40e430294233cc5039
2010-08-25 09:37:34 -07:00
Christopher Tate
b668245cf1 Explicitly enable backup by default in SDK builds
This change parallels a frameworks/base change that makes the default
backup state at boot "enabled, with LocalTransport as the currently
active transport."  Device vendors who wish to ship the Google backup
transport need to explicitly disable backup by default (it is enabled
when the user agrees to the opt-in disclosure).

Change-Id: I6b0c5c059ef58effd5c121107ea3a5edd9e936cc
2010-08-25 08:28:07 -07:00
Yu Shan Emily Lau
6fae0ba472 am 27d0ec1e: Merge "Add the new option for the scripted monkey profile testing." into gingerbread
Merge commit '27d0ec1e87dcf41960f87f203c1822e88f99ea38' into gingerbread-plus-aosp

* commit '27d0ec1e87dcf41960f87f203c1822e88f99ea38':
  Add the new option for the scripted monkey profile testing.
2010-08-24 20:10:38 -07:00
Yu Shan Emily Lau
27d0ec1e87 Merge "Add the new option for the scripted monkey profile testing." into gingerbread 2010-08-24 20:08:29 -07:00
Brian Carlstrom
0de7bd8d43 am 4a1b80c3: Merge "Added a couple of new properties." into gingerbread
Merge commit '4a1b80c386fb2d87ae2d47f6b4c22599227d010f' into gingerbread-plus-aosp

* commit '4a1b80c386fb2d87ae2d47f6b4c22599227d010f':
  Added a couple of new properties.
2010-08-24 20:02:24 -07:00
Brian Carlstrom
4a1b80c386 Merge "Added a couple of new properties." into gingerbread 2010-08-24 19:58:19 -07:00
Yu Shan Emily Lau
6035a57a97 Add the new option for the scripted monkey profile testing.
Change-Id: I1013a1a0daed948f509d9a29077f0e282baf1a10
2010-08-24 19:49:38 -07:00
Christopher Tate
e68105c113 am c37018a7: am ddc026b1: Merge "Explicitly enable backup by default in SDK builds" into froyo
Merge commit 'c37018a7c485322b5cc1ae8060a47363ac3b3e49' into gingerbread-plus-aosp

* commit 'c37018a7c485322b5cc1ae8060a47363ac3b3e49':
  Explicitly enable backup by default in SDK builds
2010-08-24 18:21:53 -07:00
Christopher Tate
c37018a7c4 am ddc026b1: Merge "Explicitly enable backup by default in SDK builds" into froyo
Merge commit 'ddc026b1d5633348d97d78477ff1c7c950c3f3a8' into gingerbread

* commit 'ddc026b1d5633348d97d78477ff1c7c950c3f3a8':
  Explicitly enable backup by default in SDK builds
2010-08-24 18:19:19 -07:00
Christopher Tate
ddc026b1d5 Merge "Explicitly enable backup by default in SDK builds" into froyo 2010-08-24 18:04:35 -07:00
Brian Carlstrom
d275b6237e Added a couple of new properties.
The Android framework crashes with an int parsing failure and then
spins wildly if it can't find an expected property.

(git cherry-pick -e d88ee455)

Change-Id: Ie33e0261185301e6ce41b0896f9916816db9f928
2010-08-24 18:02:43 -07:00
Christopher Tate
cc6ed7bd92 Explicitly enable backup by default in SDK builds
This change parallels a frameworks/base change that makes the default
backup state at boot "enabled, with LocalTransport as the currently
active transport."  Device vendors who wish to ship the Google backup
transport need to explicitly disable backup by default (it is enabled
when the user agrees to the opt-in disclosure).

Change-Id: I6b0c5c059ef58effd5c121107ea3a5edd9e936cc
2010-08-24 13:24:48 -07:00
Raphael Moll
f08d230ed0 SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
Change-Id: Id85ec31d80fc12a6907d9c3404a29d28d4923abd
2010-08-23 13:38:02 -07:00
Yu Shan Emily Lau
599fcd2199 am 3307fdcc: Merge "Added the new keyword tap for the scripted monkey." into gingerbread
Merge commit '3307fdcce1f322ed72cc3d3a8d9da87aae856531' into gingerbread-plus-aosp

* commit '3307fdcce1f322ed72cc3d3a8d9da87aae856531':
  Added the new keyword tap for the scripted monkey.
2010-08-19 15:49:25 -07:00
Yu Shan Emily Lau
3307fdcce1 Merge "Added the new keyword tap for the scripted monkey." into gingerbread 2010-08-19 15:46:51 -07:00
Yu Shan Emily Lau
39b0199222 Added the new keyword tap for the scripted monkey.
Change-Id: Iabfc462f8fc853b3235aa0d742fa46c97e980b77
2010-08-19 15:01:38 -07:00
Yu Shan Emily Lau
2929dce37a am b409cf9c: Merge "Add the monkey event which allows the scripted monkey to execute the shell command." into gingerbread
Merge commit 'b409cf9ca1251df1145139580f6809364fb3881f' into gingerbread-plus-aosp

* commit 'b409cf9ca1251df1145139580f6809364fb3881f':
  Add the monkey event which allows the scripted monkey to execute the shell command.
2010-08-19 11:14:05 -07:00
Yu Shan Emily Lau
b409cf9ca1 Merge "Add the monkey event which allows the scripted monkey to execute the shell command." into gingerbread 2010-08-19 11:11:28 -07:00
Yu Shan Emily Lau
4fbc8db891 Add the monkey event which allows the scripted monkey to execute the shell command.
Change-Id: Id5548fc42fc5c7bee6879fffc580e134a75572ab
2010-08-19 11:03:34 -07:00
Mathias Agopian
5b8ec51113 am b5c4c9e2: don\'t strip resources so it work on all devices
Merge commit 'b5c4c9e266c13bbd32a36f553ad0089ccedd6dc1' into gingerbread-plus-aosp

* commit 'b5c4c9e266c13bbd32a36f553ad0089ccedd6dc1':
  don't strip resources so it work on all devices
2010-08-18 13:37:58 -07:00
Mathias Agopian
b5c4c9e266 don't strip resources so it work on all devices
Change-Id: Ifc6be52151fcdecd0f8f622c7312ffa0ac4705e9
2010-08-17 20:04:34 -07:00
Svetoslav Ganov
b07724366e am 4b06026c: am 9f93186b: Adding a sample accessibility service
Merge commit '4b06026cb901d4a032ecc731a835767ff1bf27fe' into gingerbread-plus-aosp

* commit '4b06026cb901d4a032ecc731a835767ff1bf27fe':
  Adding a sample accessibility service
2010-08-17 10:48:34 -07:00
Svetoslav Ganov
4b06026cb9 am 9f93186b: Adding a sample accessibility service
Merge commit '9f93186beae13ea057a4b2e867928b357cd650a4' into gingerbread

* commit '9f93186beae13ea057a4b2e867928b357cd650a4':
  Adding a sample accessibility service
2010-08-17 10:45:23 -07:00
Mathias Agopian
9cd582f8cb am a37be42f: Reformat to Android style guidelines
Merge commit 'a37be42f9f4d0f54f8ff10524ee023177f0b7990' into gingerbread-plus-aosp

* commit 'a37be42f9f4d0f54f8ff10524ee023177f0b7990':
  Reformat to Android style guidelines
2010-08-16 16:54:37 -07:00
Mathias Agopian
056fe7952e am a7c85d92: Take screen rotation into account
Merge commit 'a7c85d92351070605b93176c1f691f4f80321ad5' into gingerbread-plus-aosp

* commit 'a7c85d92351070605b93176c1f691f4f80321ad5':
  Take screen rotation into account
2010-08-16 16:54:33 -07:00
Mathias Agopian
a37be42f9f Reformat to Android style guidelines
Change-Id: Ib9d7e39464a246dbaae38e00fbb325f153f89f65
2010-08-16 16:13:24 -07:00
Jean-Baptiste Queru
8930942de2 am 4388d2c3: Merge "Monkey: Set the name of the process to distinguish from generic name (app_process)"
Merge commit '4388d2c333c164ce67db6d4a59cded8dfea9fc9a' into gingerbread-plus-aosp

* commit '4388d2c333c164ce67db6d4a59cded8dfea9fc9a':
  Monkey: Set the name of the process to distinguish from generic name (app_process)
2010-08-16 13:16:44 -07:00
Mathias Agopian
a7c85d9235 Take screen rotation into account
Change-Id: I354c58eb1d28552d46b8fa269e12c00eaf6cbb99
2010-08-16 12:55:18 -07:00
Jean-Baptiste Queru
4388d2c333 Merge "Monkey: Set the name of the process to distinguish from generic name (app_process)" 2010-08-16 09:19:10 -07:00
Jean-Baptiste Queru
0fd0e932d2 am 898004c4: Merge "Activity/provider used is restricted to the application\'s Package, but can be spread across other packages as well. A better way to construct the activity name should be by getting the substring from the fully qualified classname itself and not usi
Merge commit '898004c4b2322c8fece08944731eed9fc08a14a5' into gingerbread-plus-aosp

* commit '898004c4b2322c8fece08944731eed9fc08a14a5':
  Activity/provider used is restricted to the application's Package, but can be spread across other packages as well.
2010-08-16 08:24:20 -07:00
Jean-Baptiste Queru
898004c4b2 Merge "Activity/provider used is restricted to the application's Package, but can be spread across other packages as well. A better way to construct the activity name should be by getting the substring from the fully qualified classname itself and not using the PackageInfo. Credit:Ritu Srivastava" 2010-08-16 08:11:53 -07:00
Ying Wang
a27eb4c7d9 am 8fc77898: Fix keycode. [Cherry-pick from master]
Merge commit '8fc778984cd0b737df102fca14be7c1815505b80' into gingerbread-plus-aosp

* commit '8fc778984cd0b737df102fca14be7c1815505b80':
  Fix keycode. [Cherry-pick from master]
2010-08-12 13:14:11 -07:00
Ying Wang
8fc778984c Fix keycode. [Cherry-pick from master]
see frameworks/base/core/java/android/view/KeyEvent.java.

Change-Id: Ic9a355b36815c4ac7db9c57c14bfe933585cf963
http://b/issue?id=2830562
2010-08-12 11:30:41 -07:00
Svetoslav Ganov
9f93186bea Adding a sample accessibility service
Change-Id: I5bd42157e263aac6d7a85db090319db168dea2fd
2010-08-11 14:45:56 -07:00
Dianne Hackborn
a7d7e653f0 am 79b946e8: Some native activity sample code cleanup.
Merge commit '79b946e8f2ccb552e1a3fe8222f660b9a76cc001' into gingerbread-plus-aosp

* commit '79b946e8f2ccb552e1a3fe8222f660b9a76cc001':
  Some native activity sample code cleanup.
2010-08-11 00:47:46 -07:00
Dianne Hackborn
79b946e8f2 Some native activity sample code cleanup.
Update to include newest headers and library, tweak glue code to
work better with state saving and add support for config changes.

Change-Id: I4d27bd4a0f542f217efaec86cf4f219aca020426
2010-08-11 00:31:37 -07:00
Raphael Moll
4336dcc64b am ff779c0f: Update win_sdk to put binaries in SDK/platform-tools.
Merge commit 'ff779c0f2a19985a9a6733d4864b4b56b20729bd' into gingerbread-plus-aosp

* commit 'ff779c0f2a19985a9a6733d4864b4b56b20729bd':
  Update win_sdk to put binaries in SDK/platform-tools.
2010-08-10 11:39:50 -07:00