Commit Graph

39589 Commits

Author SHA1 Message Date
Adam Powell
f33e58c69b am 50b15348: Merge "Bug 5312828 - Menu button not responding" into ics-mr0
* commit '50b15348c5b61472b5ed02434968b5a035765b63':
  Bug 5312828 - Menu button not responding
2011-10-13 16:15:17 -07:00
Adam Powell
8bb55b80f2 Merge "Bug 5312828 - Menu button not responding" into ics-mr0 2011-10-13 16:13:55 -07:00
Jason Sams
ad0c31fd6b am 43b57ec4: Fix error printing if no command string is set.
* commit '43b57ec48ec7652addc11bbc9fef652c2394b7f5':
  Fix error printing if no command string is set.
2011-10-13 16:13:07 -07:00
Justin Ho
31cae5952f am 846601a1: Merge "Revert "Updated volume rocker assets for ring notification icon"" into ics-mr0
* commit '846601a1627a3be8f87601c13b87a22a6dbfafb4':
  Revert "Updated volume rocker assets for ring notification icon"
2011-10-13 15:25:17 -07:00
Justin Ho
a4271fd5a7 Merge "Revert "Updated volume rocker assets for ring notification icon"" into ics-mr0 2011-10-13 15:23:20 -07:00
Justin Ho
afccbdd911 am 210ccb81: Merge "Updated wifi in range status bar notification icon" into ics-mr0
* commit '210ccb8110be9297acc94975d97156ee8ee2d61b':
  Updated wifi in range status bar notification icon
2011-10-13 15:20:04 -07:00
Justin Ho
bca91030f5 am b5e8a295: Merge "Updated volume rocker assets for ring notification icon" into ics-mr0
* commit 'b5e8a2955a45ab9f5409a8227b96d75d01cdfa5d':
  Updated volume rocker assets for ring notification icon
2011-10-13 15:20:02 -07:00
Justin Ho
3c17d07f4a am 96ae383d: Merge "Updated speakerphone asset" into ics-mr0
* commit '96ae383d9efbae8eb6a28d194de20ba03cb610e8':
  Updated speakerphone asset
2011-10-13 15:20:01 -07:00
Justin Ho
b399f4505c am 41f45e49: Merge "Updated stat_sys wifi icons" into ics-mr0
* commit '41f45e4969565d21f7d49b2b1cf828e27af73efa':
  Updated stat_sys wifi icons
2011-10-13 15:19:59 -07:00
Justin Ho
fcc8fd0894 Merge "Updated wifi in range status bar notification icon" into ics-mr0 2011-10-13 15:17:34 -07:00
Justin Ho
91f2cd746b am 86e12a82: Merge "Updated Systembar back and highlight assets Bug: 5411737" into ics-mr0
* commit '86e12a82d2c25b04cbd2b51fb50b900b459593cd':
  Updated Systembar back and highlight assets Bug: 5411737
2011-10-13 15:17:26 -07:00
Justin Ho
1d1409ef11 am caea6473: Merge "Updated cut actionbar icon" into ics-mr0
* commit 'caea6473b46618040c8a8e611618e2c39d3506bf':
  Updated cut actionbar icon
2011-10-13 15:17:25 -07:00
Justin Ho
ab89bee0ed Merge "Updated volume rocker assets for ring notification icon" into ics-mr0 2011-10-13 15:17:22 -07:00
Justin Ho
f16510b128 Merge "Updated speakerphone asset" into ics-mr0 2011-10-13 15:16:52 -07:00
Justin Ho
835235a90c Merge "Updated stat_sys wifi icons" into ics-mr0 2011-10-13 15:16:37 -07:00
Justin Ho
1723ca28e7 Merge "Updated Systembar back and highlight assets Bug: 5411737" into ics-mr0 2011-10-13 15:16:11 -07:00
Justin Ho
1f5e23f344 Merge "Updated cut actionbar icon" into ics-mr0 2011-10-13 15:15:48 -07:00
Gilles Debunne
5bbd4f2382 Merge "Bug 5428541: Check that span is still in text before deleting" 2011-10-13 14:23:37 -07:00
Christopher Tate
143dad3938 Merge "Require device encryption password to perform adb backup/restore" 2011-10-13 14:06:22 -07:00
Mike Lockwood
9a5cb07fdd am ab9d5b11: Merge "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled." into ics-mr0
* commit 'ab9d5b11737f8a460467657035186bcfa7085eb9':
  PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled.
2011-10-13 14:01:23 -07:00
Mike Lockwood
4f63d0ef62 Merge "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled." into ics-mr0 2011-10-13 13:59:33 -07:00
Scott Main
8632bf0a94 am e89b6969: Merge "docs: add toc to emulator doc and a few cross-links" into ics-mr0
* commit 'e89b69691f6593d4287dd1d02c5d31561f6d4aa8':
  docs: add toc to emulator doc and a few cross-links
2011-10-13 13:48:02 -07:00
Scott Main
a6a6f178a2 Merge "docs: add toc to emulator doc and a few cross-links" into ics-mr0 2011-10-13 13:46:23 -07:00
Adam Cohen
4d9f0a05e5 am c408a5d5: Merge "Fixing issue where widgets file was getting blown away, issue: 5036321" into ics-mr0
* commit 'c408a5d5738c84160a7e9a8299c953ea638bcef4':
  Fixing issue where widgets file was getting blown away, issue: 5036321
2011-10-13 13:40:01 -07:00
Adam Cohen
a80068a6cd Merge "Fixing issue where widgets file was getting blown away, issue: 5036321" into ics-mr0 2011-10-13 13:38:00 -07:00
Robert Ly
418e6490fc am b14b2c25: Merge "docs: tools and adt md5sum and file sizes" into ics-mr0
* commit 'b14b2c25c20f77f7de0fd8b8fe59684a02add85f':
  docs: tools and adt md5sum and file sizes
2011-10-13 13:21:53 -07:00
Robert Ly
985d09db7e Merge "docs: tools and adt md5sum and file sizes" into ics-mr0 2011-10-13 13:20:08 -07:00
Dianne Hackborn
75c5b1fd51 am 97175bc3: Merge "Fix issue #5446988: WindowManager warns BOOT TIMEOUT,..." into ics-mr0
* commit '97175bc3277055047d4c3e6109824065f2abec5d':
  Fix issue #5446988: WindowManager warns BOOT TIMEOUT,...
2011-10-13 13:14:43 -07:00
Dianne Hackborn
8ab2a5b6ea Merge "Fix issue #5446988: WindowManager warns BOOT TIMEOUT,..." into ics-mr0 2011-10-13 13:13:20 -07:00
Adam Powell
56522c605f am aa79a5d5: Merge "Fix bug 5455676 - seek bars without thumbs" into ics-mr0
* commit 'aa79a5d5a3b06b5b4e40a1ab0ccc6697627b1a8d':
  Fix bug 5455676 - seek bars without thumbs
2011-10-13 13:12:42 -07:00
Brian Colonna
2e0dff81fb am 534b7af0: Merge "Fix 5437700: Underlying backup method was exposed" into ics-mr0
* commit '534b7af02782bdd36b96c6b83dfa7213d94b88c9':
  Fix 5437700: Underlying backup method was exposed
2011-10-13 13:10:42 -07:00
Adam Powell
129220fd96 Merge "Fix bug 5455676 - seek bars without thumbs" into ics-mr0 2011-10-13 13:10:14 -07:00
Brian Colonna
2845336362 Merge "Fix 5437700: Underlying backup method was exposed" into ics-mr0 2011-10-13 13:07:55 -07:00
Daniel Sandler
a3e7ecf224 am dba93565: Break apart DISABLE_HOME and DISABLE_RECENT.
* commit 'dba935659024a9ca83cb6bd3f1a9970e277f7658':
  Break apart DISABLE_HOME and DISABLE_RECENT.
2011-10-13 12:38:00 -07:00
Andreas Huber
fe86aeefba Merge "NuPlayer is now taking on the task of streaming over RTSP." 2011-10-13 12:13:57 -07:00
Fred Quintana
e607bea591 am 2984971d: Merge "reworked the flow in the account chooser - resilient to the chooser activity being killed due to memory pressure - back now goes back to the main chooser screen rather than canceling it completely" into ics-mr0
* commit '2984971db306b70aab41e5d10b5e1e86b6ed5b29':
  reworked the flow in the account chooser  - resilient to the chooser activity being killed due to memory pressure  - back now goes back to the main chooser screen rather than canceling    it completely
2011-10-13 11:43:10 -07:00
Jason Sams
71ba9f200a Merge "Start adding simple performance tests for RS compute." 2011-10-13 11:43:03 -07:00
Fred Quintana
8b533e7bd6 Merge "reworked the flow in the account chooser - resilient to the chooser activity being killed due to memory pressure - back now goes back to the main chooser screen rather than canceling it completely" into ics-mr0 2011-10-13 11:41:19 -07:00
Daniel Sandler
e911416078 am 1000e3fa: (-s ours) Merge "Stop enabling all disabled status bar features from GlobalActions. (DO NOT MERGE)" into ics-mr0
* commit '1000e3fa06d1d560a6e790730fa351c497bb2a0e':
  Stop enabling all disabled status bar features from GlobalActions. (DO NOT MERGE)
2011-10-13 10:53:14 -07:00
Adam Skory
95ce620cc4 Merge "Fixing typo on fragments page." 2011-10-13 10:52:18 -07:00
Daniel Sandler
742b029ad6 Merge "Stop enabling all disabled status bar features from GlobalActions. (DO NOT MERGE)" into ics-mr0 2011-10-13 10:51:19 -07:00
Ben Murdoch
fa9835eaa9 Merge "Don't redraw when not scrolling, even if finger is held down." 2011-10-13 10:17:57 -07:00
Andreas Huber
b3721d3931 Merge "Support for an MPEG2 Program Stream extractor." 2011-10-13 10:03:26 -07:00
Mangesh Ghiware
e9de59c75f am a6708c6a: Merge "Add setting for configuring zoom level on double-tap." into ics-mr0
* commit 'a6708c6a462d2a30e51e7ded2559a4054cb651fc':
  Add setting for configuring zoom level on double-tap.
2011-10-13 09:19:20 -07:00
Mangesh Ghiware
35e8259f7b Merge "Add setting for configuring zoom level on double-tap." into ics-mr0 2011-10-13 09:17:10 -07:00
Mike Lockwood
adb621c046 am 0c265c88: Merge "MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size" into ics-mr0
* commit '0c265c886b563095172827d39b55a8cd71a19ffb':
  MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size
2011-10-13 08:56:49 -07:00
Mike Lockwood
db86dfe416 Merge "MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size" into ics-mr0 2011-10-13 08:55:04 -07:00
Justin Ho
e70837e6b2 am 48cf582d: Merge "Volume overlay right padding increased" into ics-mr0
* commit '48cf582df3bb81afae36314c187f909486c47c55':
  Volume overlay right padding increased
2011-10-13 07:36:09 -07:00
Justin Ho
75556227da Merge "Volume overlay right padding increased" into ics-mr0 2011-10-13 07:32:32 -07:00
The Android Open Source Project
78bb9e60cb Reconcile with ics-mr0-release
Change-Id: I326384d8f33fbf4aceaf34331983727fd6bf256f
2011-10-13 07:04:51 -07:00