Dianne Hackborn
eaca8a46d1
am 1cb87dac: am 4f410fb5: Update to follow API.
...
Merge commit '1cb87dac3363386295e1483053563aff2e1ac989'
* commit '1cb87dac3363386295e1483053563aff2e1ac989':
Update to follow API.
2010-08-27 08:29:04 -07:00
Dianne Hackborn
b15335142e
Update preference samples.
...
Change-Id: Ia78d9c0f4f7e58f500aef55413b911904d0c40cd
2010-08-26 17:09:27 -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
Raphael Moll
23d595f53c
am 059e4eb3: am f08d230e: SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
...
Merge commit '059e4eb3dbcc3ad645a2cd1f1670d92ab3dc1455'
* commit '059e4eb3dbcc3ad645a2cd1f1670d92ab3dc1455':
SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
2010-08-26 13:14:29 -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
Chet Haase
42d5390018
Merge "Demo for using and testing animation events"
2010-08-25 17:40:44 -07:00
Chet Haase
2ab1da8886
Demo for using and testing animation events
...
Change-Id: I7db791928dc590fd724f4c71565b42bc366e519c
2010-08-25 16:49:54 -07:00
Jean-Baptiste Queru
4ade2d71dc
am 40ed6797: am 33462598: am bea98acf: reconcile open-source froyo into google variant
...
Merge commit '40ed6797ee0a734ec7af041b84998c610968503a'
* commit '40ed6797ee0a734ec7af041b84998c610968503a':
Explicitly enable backup by default in SDK builds
2010-08-25 10:17:11 -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
32d72ad800
am 616acdb9: am 06bcd705: Quiet harmless StrictMode violations caused by the Monkey.
...
Merge commit '616acdb9cd78ecd4ae01ff2ccd3694ab8258f226'
* commit '616acdb9cd78ecd4ae01ff2ccd3694ab8258f226':
Quiet harmless StrictMode violations caused by the Monkey.
2010-08-25 10:12:52 -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
Chet Haase
989a1180de
Merge "Adding demo for xml animator loading"
2010-08-25 08:17:55 -07:00
Yu Shan Emily Lau
3e9d3728e7
am 6fae0ba4: am 27d0ec1e: Merge "Add the new option for the scripted monkey profile testing." into gingerbread
...
Merge commit '6fae0ba472388269bd31408e7c2f92333e445063'
* commit '6fae0ba472388269bd31408e7c2f92333e445063':
Add the new option for the scripted monkey profile testing.
2010-08-24 20:11:45 -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
8f5dec6ad4
am 0de7bd8d: am 4a1b80c3: Merge "Added a couple of new properties." into gingerbread
...
Merge commit '0de7bd8d434ec62592d4ee881ae3e033090900c4'
* commit '0de7bd8d434ec62592d4ee881ae3e033090900c4':
Added a couple of new properties.
2010-08-24 20:04:39 -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
Chet Haase
0366ddf4d3
Adding demo for xml animator loading
...
Change-Id: I77d4e4f3b26c47e7973dd64282c12a9d6c3b5dd1
2010-08-24 19:50:12 -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
2195ce47a0
am e68105c1: am c37018a7: am ddc026b1: Merge "Explicitly enable backup by default in SDK builds" into froyo
...
Merge commit 'e68105c113187ec25a2a0a82eb8afe4269920165'
* commit 'e68105c113187ec25a2a0a82eb8afe4269920165':
Explicitly enable backup by default in SDK builds
2010-08-24 18:23:49 -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
Joe Malin
88bcee2e89
Note Pad: merged jmalin and hackbod chgs
...
Change-Id: Ica0fff191b806981bdca05977174a6ed3bb6d9f1
2010-08-24 17:44:55 -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
Gilles Debunne
6e94ff6be9
New Views/Controls themes: Theme.Holo and Theme.Light.Holo
...
Change-Id: Ie3cd1ea5713119ce2027096a55e68997127a46f7
2010-08-23 17:23:02 -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
Megha Joshi
46a790eab0
fixing build
...
Change-Id: If7b523185be7ace6a812adf3b392f38fb05504a6
2010-08-21 18:07:01 -07:00
Megha Joshi
762cc59930
Merge "Clean up sample code to look better."
2010-08-21 17:06:05 -07:00
Yu Shan Emily Lau
a254363819
am 599fcd21: am 3307fdcc: Merge "Added the new keyword tap for the scripted monkey." into gingerbread
...
Merge commit '599fcd2199ded8a7d2be7331b8fece850bd6a1b7'
* commit '599fcd2199ded8a7d2be7331b8fece850bd6a1b7':
Added the new keyword tap for the scripted monkey.
2010-08-21 09:44:36 -07:00
Yu Shan Emily Lau
8744f4c49e
am 2929dce3: am b409cf9c: Merge "Add the monkey event which allows the scripted monkey to execute the shell command." into gingerbread
...
Merge commit '2929dce37ab4361b2c7cb344e69914298a969678'
* commit '2929dce37ab4361b2c7cb344e69914298a969678':
Add the monkey event which allows the scripted monkey to execute the shell command.
2010-08-21 09:42:22 -07:00
Dianne Hackborn
effa303688
Update fragment dialog samples.
...
- Follow API changes.
- Clean up and mark up for inclusion as sample code.
- New sample that shows a DialogFragment used as both a dialog
and embedded in an activity.
Change-Id: Icaa41283562f4f345b188442ef988c9d5edd8ed1
2010-08-20 18:32:43 -07:00
Chet Haase
434672af29
add demo of bouncing balls to show various Animator APIs
...
Change-Id: I9d3aec9661d8845f67ea1c01b00f85f2380fd77f
2010-08-20 17:59:09 -07:00
Megha Joshi
c51da235c2
Clean up sample code to look better.
...
Change-Id: I91bdfc7ce2d32f23dc7ce9a4276cba37d7fafc42
2010-08-20 11:47:18 -07:00
Chet Haase
ce436337da
Revert "Revert "demo multi-property animations""
...
This reverts commit afb6baf915 .
2010-08-19 17:55:31 -07:00
Chet Haase
afb6baf915
Revert "demo multi-property animations"
...
This reverts commit d9e2a04d7c .
2010-08-19 17:40:27 -07:00
Chet Haase
d9e2a04d7c
demo multi-property animations
...
Change-Id: I587bdc08e48a09d6df471e5bae767977c0c9ae18
2010-08-19 15:56:59 -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