Commit Graph

4335 Commits

Author SHA1 Message Date
Megha Joshi
292096fccd am 3471dafa: am 42d3a4ae: Adding CrossCompatibility sample app.
Merge commit '3471dafa11b721ae4510cb182e3d54033faed12d' into gingerbread-plus-aosp

* commit '3471dafa11b721ae4510cb182e3d54033faed12d':
  Adding CrossCompatibility sample app.
2010-09-13 17:43:01 -07:00
Megha Joshi
3471dafa11 am 42d3a4ae: Adding CrossCompatibility sample app.
Merge commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226' into gingerbread

* commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226':
  Adding CrossCompatibility sample app.
2010-09-13 17:38:43 -07:00
Megha Joshi
42d3a4ae14 Adding CrossCompatibility sample app.
Change-Id: I565584ea53212f61a9fbbb44e50da59f4ba06fff
2010-09-13 17:00:10 -07:00
Vairavan Srinivasan
3d925ea9e8 am 50d579d0: GlobalTime: Perform Zoom In and Out only after initialization
Merge commit '50d579d0ec9c9d0bcd3da936af8480808d5e0843' into gingerbread-plus-aosp

* commit '50d579d0ec9c9d0bcd3da936af8480808d5e0843':
  GlobalTime: Perform Zoom In and Out only after initialization
2010-09-10 15:41:59 -07:00
Trevor Johns
915bdba9ac am 12d3ad89: am e55fc016: Merge "Use remote_api for shell access on developer.android.com." into froyo
Merge commit '12d3ad89e48e4e95a1ebf78fad1978e9e5e56a3d' into gingerbread-plus-aosp

* commit '12d3ad89e48e4e95a1ebf78fad1978e9e5e56a3d':
  Use remote_api for shell access on developer.android.com.
2010-09-10 12:38:04 -07:00
Trevor Johns
12d3ad89e4 am e55fc016: Merge "Use remote_api for shell access on developer.android.com." into froyo
Merge commit 'e55fc016a6e40edd456c0d240d06689d84a7127b' into gingerbread

* commit 'e55fc016a6e40edd456c0d240d06689d84a7127b':
  Use remote_api for shell access on developer.android.com.
2010-09-10 12:33:57 -07:00
Trevor Johns
e55fc016a6 Merge "Use remote_api for shell access on developer.android.com." into froyo 2010-09-10 12:23:09 -07:00
Trevor Johns
5e100c67f3 Use remote_api for shell access on developer.android.com.
This allows Python shell access on developer.android.com
using the remote_api_shell.py script that's bundled with
the App Engine SDK.

Change-Id: If3c979ccbf885905a9cc3840645dcb6a5a50cfa8
2010-09-10 11:26:50 -07:00
Jeff Brown
2073f44b8f am ff242db8: Merge "Add samples for secure views." into gingerbread
Merge commit 'ff242db8670695e946400d957a82d2933e7e01a1' into gingerbread-plus-aosp

* commit 'ff242db8670695e946400d957a82d2933e7e01a1':
  Add samples for secure views.
2010-09-08 11:57:59 -07:00
Jeff Brown
ff242db867 Merge "Add samples for secure views." into gingerbread 2010-09-08 11:53:13 -07:00
Vairavan Srinivasan
50d579d0ec GlobalTime: Perform Zoom In and Out only after initialization
Invoking zoom on mGLView before initialization causes Null pointer
exception. The usecase is to launch global time and immediately
press key 2 or 8 (just before the globe is seen on display).

Change-Id: I10e7736527a934029364c9c83f147f94574f5488
2010-09-07 19:13:46 -07:00
Dianne Hackborn
eb39544df6 am d3d58cf7: Update to follow ALooper ident change.
Merge commit 'd3d58cf7d3a508bb855c2ad626205ddcbb3bd237' into gingerbread-plus-aosp

* commit 'd3d58cf7d3a508bb855c2ad626205ddcbb3bd237':
  Update to follow ALooper ident change.
2010-09-07 16:36:39 -07:00
Dianne Hackborn
d3d58cf7d3 Update to follow ALooper ident change.
Also the native-activity sample also has some very simple code showing
how to listen to the accelerometer.

Change-Id: I0629b8bc40cddd66233c1675cd5e8b42a9b722d8
2010-09-07 15:47:35 -07:00
Jeff Brown
cf4db94885 Add samples for secure views.
Change-Id: Ibe1e63c87f4c6a715009f7bbcdafa552dc2d937c
2010-09-07 13:04:15 -07:00
Joe Onorato
310187112b am 7d26cd19: Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
Merge commit '7d26cd198266cd48cb0a912585419fbe0cc8ed89' into gingerbread-plus-aosp

* commit '7d26cd198266cd48cb0a912585419fbe0cc8ed89':
  Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
2010-09-07 11:39:40 -07:00
Joe Onorato
7d26cd1982 Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
Change-Id: I6d3a682adccfef99eaa4d01b97091eda68f05cd8
2010-09-07 12:03:48 -04:00
Dianne Hackborn
84d495af1b am 23bff5dd: Add API demo for picking a contact with a permission grant.
Merge commit '23bff5dd80c782ac6d4f67caa57230f265fca77e' into gingerbread-plus-aosp

* commit '23bff5dd80c782ac6d4f67caa57230f265fca77e':
  Add API demo for picking a contact with a permission grant.
2010-09-02 14:49:25 -07:00
Dianne Hackborn
23bff5dd80 Add API demo for picking a contact with a permission grant.
Change-Id: I9b0659e18afb19f8050cb77104c41ea291a9e3c7
2010-09-02 11:21:05 -07:00
Xavier Ducrohet
666f4c0955 am b7d3c175: Merge "New SDK architecture. DO NOT MERGE." into gingerbread
Merge commit 'b7d3c175e25143cb75199d4e62418df5bc2e413b' into gingerbread-plus-aosp

* commit 'b7d3c175e25143cb75199d4e62418df5bc2e413b':
  New SDK architecture. DO NOT MERGE.
2010-09-01 16:53:40 -07:00
Xavier Ducrohet
b7d3c175e2 Merge "New SDK architecture. DO NOT MERGE." into gingerbread 2010-09-01 16:48:59 -07:00
Xavier Ducrohet
3aecc4de01 New SDK architecture. DO NOT MERGE.
tools normally under the platform, move to a single location
called platform-tools/

Change-Id: I70659167778303722acb107a2d04bbf01467f884
2010-08-30 16:01:45 -07:00
Yu Shan Emily Lau
64a1698a30 am 67aad2d8: Merge "Add the simple script log for the statbility stress test. Add the randomize script option." into gingerbread
Merge commit '67aad2d8d51e9d48730f0c6e4848c60b1a9d0798' into gingerbread-plus-aosp

* commit '67aad2d8d51e9d48730f0c6e4848c60b1a9d0798':
  Add the simple script log for the statbility stress test.
2010-08-30 15:56:38 -07:00
Yu Shan Emily Lau
67aad2d8d5 Merge "Add the simple script log for the statbility stress test. Add the randomize script option." into gingerbread 2010-08-30 15:52:59 -07:00
Yu Shan Emily Lau
6a6c533129 Add the simple script log for the statbility stress test.
Add the randomize script option.

Change-Id: I7fbbd3b78a2fc5fe5300ac4811540d0cd2070688
2010-08-30 15:31:33 -07:00
Jean-Baptiste Queru
e98ed06e17 am d9380caf: Merge "Make runtest --path smarter when choosing path to build."
Merge commit 'd9380caf410ddf4b17a6e5035a89851bc58408f7' into gingerbread-plus-aosp

* commit 'd9380caf410ddf4b17a6e5035a89851bc58408f7':
  Make runtest --path smarter when choosing path to build.
2010-08-30 10:33:39 -07:00
Jean-Baptiste Queru
85173cc08a am be97ad65: Merge "Replaced deprecated Contacts Api with ContactsContract"
Merge commit 'be97ad655dedb392caa06ccc6c528b37ba5169fb' into gingerbread-plus-aosp

* commit 'be97ad655dedb392caa06ccc6c528b37ba5169fb':
  Replaced deprecated Contacts Api with ContactsContract
2010-08-30 10:25:04 -07:00
Jean-Baptiste Queru
d9380caf41 Merge "Make runtest --path smarter when choosing path to build." 2010-08-30 09:10:24 -07:00
Jean-Baptiste Queru
be97ad655d Merge "Replaced deprecated Contacts Api with ContactsContract" 2010-08-30 09:04:19 -07:00
Xavier Ducrohet
7ddeaf2189 am 420b59fe: Fix windows SDK build.
Merge commit '420b59fe215f8a912e66759d1c4a252bea3df39d' into gingerbread-plus-aosp

* commit '420b59fe215f8a912e66759d1c4a252bea3df39d':
  Fix windows SDK build.
2010-08-27 19:41:51 -07:00
Xavier Ducrohet
420b59fe21 Fix windows SDK build.
Location of hierarchyviewer is now in hierarchyviewer2/app/etc

Change-Id: I14257c96552a16d19461cdf8194045a608dd03b3
2010-08-27 19:30:38 -07:00
Dianne Hackborn
1f40b600a8 am 562306ec: Fix build.
Merge commit '562306ecd83526a81aed41ff1db2625d7d3ab271' into gingerbread-plus-aosp

* commit '562306ecd83526a81aed41ff1db2625d7d3ab271':
  Fix build.
2010-08-27 17:03:48 -07:00
Dianne Hackborn
562306ecd8 Fix build.
Change-Id: Ic030f82e79981792dc3116d318e217ab81ecea3b
2010-08-27 17:00:52 -07:00
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