Commit Graph

5753 Commits

Author SHA1 Message Date
Yu Shan Emily Lau
d391ae2098 Fixed the appCrashBugreport reset flag. Bug# 3383876
Change-Id: I51d06ad30ed43789943cc99744898028e11b8466
2011-01-24 11:57:32 -08:00
Jeff Brown
48bab43f1b am f40ea5cf: (-s ours) am 98ab3219: Prevent monkey from turning off the screen. (DO NOT MERGE)
* commit 'f40ea5cfd9523f1303d1711dbf7df3ccb5697a0a':
  Prevent monkey from turning off the screen. (DO NOT MERGE)
2011-01-24 00:02:08 -08:00
Dianne Hackborn
02f9ba4604 am 8929f134: am 7c69dba7: Remove use of old theme name.
* commit '8929f134293cfcb636ac3da76b2b400ae3df1a06':
  Remove use of old theme name.
2011-01-23 16:50:21 -08:00
Jeff Brown
2559c31618 Add WindowOrientationListener log enable/disable checkbox.
Change-Id: I1107eb39a72b42ddc97e611c3fc33c3997ed49cd
2011-01-23 14:57:12 -08:00
Dianne Hackborn
8929f13429 am 7c69dba7: Remove use of old theme name.
* commit '7c69dba7cc03073820d567dcb2fa6af031326e7a':
  Remove use of old theme name.
2011-01-23 14:41:27 -08:00
Dianne Hackborn
7c69dba7cc Remove use of old theme name.
Change-Id: Iebc7a81738122fbfb94f22649e07eabb39dc4afb
2011-01-23 14:10:41 -08:00
Dianne Hackborn
42f87e1b47 am e6354845: Merge "Monkey: request am to show the ANR dialog"
* commit 'e635484562dc7f21aa16de3147a100210708c8f8':
  Monkey: request am to show the ANR dialog
2011-01-22 11:52:53 -08:00
Dianne Hackborn
e635484562 Merge "Monkey: request am to show the ANR dialog" 2011-01-22 11:36:43 -08:00
Vairavan Srinivasan
af5e575643 Monkey: request am to show the ANR dialog
Default return value of 1 from appNotResponding was to show the
ANR dialog in eclair. However, recent version of android's am
interpret 1 as to wait. Fix is to change the default return
value from 1 to 0.

Change-Id: I6620ef54309f1d30ef18a2b60d73b346c2446f93
2011-01-21 18:00:52 -08:00
Skyler Kaufman
f9940bd84e am 64102835: am 8215de78: am e2a6258c: Merge "A tiny http server to test source.android.com changes"
* commit '641028359a5bd3e3e1b5e772c2d6084c4df55a98':
  A tiny http server to test source.android.com changes
2011-01-21 16:14:42 -08:00
Skyler Kaufman
641028359a am 8215de78: am e2a6258c: Merge "A tiny http server to test source.android.com changes"
* commit '8215de789a5678f67bc5fc4af062b151263eabdd':
  A tiny http server to test source.android.com changes
2011-01-21 16:11:46 -08:00
Alexander Lucas
5a2acc8ef3 am 2d93907d: am 32d902cd: am a0575674: Merge "For SipDemo sample code: Changed chosen image for "selected" state of talk button" into gingerbread
* commit '2d93907d2e81d3e781d71b50d6f4ec2e57ccb1c5':
  For SipDemo sample code:  Changed chosen image for "selected" state of talk button
2011-01-21 15:56:04 -08:00
Alexander Lucas
2d93907d2e am 32d902cd: am a0575674: Merge "For SipDemo sample code: Changed chosen image for "selected" state of talk button" into gingerbread
* commit '32d902cd114dc3132f30db71ca954804b5548345':
  For SipDemo sample code:  Changed chosen image for "selected" state of talk button
2011-01-21 15:50:36 -08:00
Brian Muramatsu
c24f671fda Merge "Add Link to CTS 2.3 R1" 2011-01-21 14:12:47 -08:00
Ed Heyl
291411b365 am e0dfaf68: am fd6a2b4d: Merge "Really don\'t send POWER or ENDCALL." into honeycomb
* commit 'e0dfaf68b4710b88f45548b35404cff6be7b365e':
  Really don't send POWER or ENDCALL.
2011-01-21 10:57:40 -08:00
Adam Powell
261a9724d1 am 7052e859: am 4da9196d: API change - bug 3370353 and bug 3370338
* commit '7052e85913a10e1f09b118ac22f6b3a676cf60f9':
  API change - bug 3370353 and bug 3370338
2011-01-21 10:57:27 -08:00
Nick Pelly
1717afbca4 am 072bca5b: Add Tag app to eclipse classpath
* commit '072bca5b0991c2b4ddbd058ff51fe7f52cb11177':
  Add Tag app to eclipse classpath
2011-01-21 10:51:18 -08:00
Nick Pelly
072bca5b09 Add Tag app to eclipse classpath
Change-Id: Ib548b6a1bfa073069bba8d4225768b048192916e
2011-01-21 10:12:17 -08:00
Jeff Brown
f40ea5cfd9 am 98ab3219: Prevent monkey from turning off the screen. (DO NOT MERGE)
* commit '98ab321927f1ea9ebb7ba6b5506ac6748b005555':
  Prevent monkey from turning off the screen. (DO NOT MERGE)
2011-01-20 21:46:27 -08:00
Ed Heyl
e0dfaf68b4 am fd6a2b4d: Merge "Really don\'t send POWER or ENDCALL." into honeycomb
* commit 'fd6a2b4d2552f4a6179ac6f5f499e48310a8d813':
  Really don't send POWER or ENDCALL.
2011-01-20 21:42:01 -08:00
Adam Powell
7052e85913 am 4da9196d: API change - bug 3370353 and bug 3370338
* commit '4da9196dd096cb0e5d6a34b0a87f2dbd6aa8578f':
  API change - bug 3370353 and bug 3370338
2011-01-20 21:41:58 -08:00
Ed Heyl
fd6a2b4d25 Merge "Really don't send POWER or ENDCALL." into honeycomb 2011-01-20 19:10:22 -08:00
Adam Powell
4da9196dd0 API change - bug 3370353 and bug 3370338
Change-Id: I9da53f3260ca17713e793b420e477686ad23c7d3
2011-01-20 18:36:37 -08:00
Jeff Brown
98ab321927 Prevent monkey from turning off the screen. (DO NOT MERGE)
Bug: 3371251
Change-Id: I33005005fadc0f994f39fded10faafe21116f82a
2011-01-20 17:54:53 -08:00
Jeff Brown
82df76b040 Really don't send POWER or ENDCALL.
Change-Id: If55c6bc7565a9a6b493da16fac5c7ad3c621684f
2011-01-20 17:41:18 -08:00
Yu Shan Emily Lau
5bd4abd422 am 0af8997e: am 080c2376: Merge "Fixed the monkey option - killProcessAfterError is not beging checked in ANR. bug#3146736" into honeycomb
* commit '0af8997e715fec108ac9823f134f44f377b01d39':
  Fixed the monkey option - killProcessAfterError is not beging checked in ANR. bug#3146736
2011-01-20 10:26:28 -08:00
Yu Shan Emily Lau
0af8997e71 am 080c2376: Merge "Fixed the monkey option - killProcessAfterError is not beging checked in ANR. bug#3146736" into honeycomb
* commit '080c237638a38c1bd2fa8d079cbbee0b5f23d956':
  Fixed the monkey option - killProcessAfterError is not beging checked in ANR. bug#3146736
2011-01-20 10:24:24 -08:00
Yu Shan Emily Lau
080c237638 Merge "Fixed the monkey option - killProcessAfterError is not beging checked in ANR. bug#3146736" into honeycomb 2011-01-20 10:21:37 -08:00
Jeff Brown
020159192b am 3ba0b44a: am eddcd118: Merge "Prevent monkey from turning off the screen." into honeycomb
* commit '3ba0b44aefe2ab170adf8e4232baa99a61df944f':
  Prevent monkey from turning off the screen.
2011-01-19 20:01:31 -08:00
Jeff Brown
3ba0b44aef am eddcd118: Merge "Prevent monkey from turning off the screen." into honeycomb
* commit 'eddcd1186b05b9b425ae765e98882a1815e3ac4d':
  Prevent monkey from turning off the screen.
2011-01-19 19:59:04 -08:00
Jeff Brown
eddcd1186b Merge "Prevent monkey from turning off the screen." into honeycomb 2011-01-19 19:56:18 -08:00
Jeff Brown
8a2659dc0d Prevent monkey from turning off the screen.
Bug: 3371251
Change-Id: Iadae29e8e4a67052746b8e2d2f5f542e4ee6dcc5
2011-01-19 19:43:49 -08:00
Alexander Lucas
e39365fbea am 3e5ad6bf: am 11b83fd9: Merge "Added Honeycomb Gallery sample application." into honeycomb
* commit '3e5ad6bf25299b48da1780c3f0995803aaa1431a':
  Added Honeycomb Gallery sample application.
2011-01-19 18:36:50 -08:00
Alexander Lucas
3e5ad6bf25 am 11b83fd9: Merge "Added Honeycomb Gallery sample application." into honeycomb
* commit '11b83fd9f791496410a28f3db95bb27c0873c6fd':
  Added Honeycomb Gallery sample application.
2011-01-19 18:35:04 -08:00
Alexander Lucas
11b83fd9f7 Merge "Added Honeycomb Gallery sample application." into honeycomb 2011-01-19 18:33:28 -08:00
Alexander Lucas
9f935c7da5 Added Honeycomb Gallery sample application.
Change-Id: I1eefc2837016a7973544f0c57a8464466e7dcef9
2011-01-19 17:02:48 -08:00
Trevor Johns
1beb0a7f40 am 6d1e068d: am 953dbee4: Merge "NFC sample app" into honeycomb
* commit '6d1e068db029cdae99874149b7904da6f5cb7307':
  NFC sample app
2011-01-19 15:28:37 -08:00
Trevor Johns
6d1e068db0 am 953dbee4: Merge "NFC sample app" into honeycomb
* commit '953dbee407ebffd4bd340aac5dc5aea469fa2bdf':
  NFC sample app
2011-01-19 15:26:53 -08:00
Trevor Johns
953dbee407 Merge "NFC sample app" into honeycomb 2011-01-19 15:23:41 -08:00
Fabrice Di Meglio
e597c89af7 am df07ce17: am 791c7542: Merge "Update account tester" into honeycomb
* commit 'df07ce17a7b67858e17f68d2bcc932819479be14':
  Update account tester
2011-01-19 14:35:27 -08:00
Fabrice Di Meglio
df07ce17a7 am 791c7542: Merge "Update account tester" into honeycomb
* commit '791c75424600614d0f8604c54fad4ba80ee57794':
  Update account tester
2011-01-19 14:33:57 -08:00
Fabrice Di Meglio
791c754246 Merge "Update account tester" into honeycomb 2011-01-19 14:30:52 -08:00
Megha Joshi
6aa608a559 NFC sample app
Cherry-picking NFC sample into Honeycomb branch, since it wasn't
merged during it's original commit to Gingerbread.

Change-Id: I79308f04c1b2edd6cb5bb675fa13b9e5083a8432
2011-01-19 14:07:55 -08:00
Xavier Ducrohet
1eedc9f9d6 am 09c6f52d: am ede325fe: Merge "HC preview & GB 2.3.1 use platform-tools rev 2." into honeycomb
* commit '09c6f52dc543516685beef0ead0be707ff4d0f44':
  HC preview & GB 2.3.1 use platform-tools rev 2.
2011-01-19 12:44:14 -08:00
Xavier Ducrohet
09c6f52dc5 am ede325fe: Merge "HC preview & GB 2.3.1 use platform-tools rev 2." into honeycomb
* commit 'ede325fe5a2beca79adac09f17adef7e9d72afaf':
  HC preview & GB 2.3.1 use platform-tools rev 2.
2011-01-19 12:42:48 -08:00
Xavier Ducrohet
ede325fe5a Merge "HC preview & GB 2.3.1 use platform-tools rev 2." into honeycomb 2011-01-19 12:41:19 -08:00
Jaikumar Ganesh
ef0db47709 am 1148b835: am 7844a14f: Merge "Modify Bluetooth Chat app for new insecure rfcomm API." into honeycomb
* commit '1148b835a9036f19e57ebb3802285b586b467e08':
  Modify Bluetooth Chat app for new insecure rfcomm API.
2011-01-19 10:44:27 -08:00
Jaikumar Ganesh
1148b835a9 am 7844a14f: Merge "Modify Bluetooth Chat app for new insecure rfcomm API." into honeycomb
* commit '7844a14f5525ca0bd47a9b6b73e040003dd47890':
  Modify Bluetooth Chat app for new insecure rfcomm API.
2011-01-19 10:42:28 -08:00
Jaikumar Ganesh
7844a14f55 Merge "Modify Bluetooth Chat app for new insecure rfcomm API." into honeycomb 2011-01-19 10:40:43 -08:00
Jaikumar Ganesh
2af724c6eb Modify Bluetooth Chat app for new insecure rfcomm API.
Also fix some bugs.

Change-Id: I2e20a3b02fb904d64e03a2c4602a5b724912c742
2011-01-19 10:30:32 -08:00