drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
162,448 Commits 1 Branch 0 Tags
Commit Graph

162448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Cinek
9344ddf1a0 am bb3627bd: am bedae0db: am 3e056aa0: am f9df9dd8: Merge "Fixed an issue where the notification could become transparent" into lmp-dev 
* commit 'bb3627bd7d7dec2c09bd6650a61b371e735e1d02':
  Fixed an issue where the notification could become transparent
 2014-10-10 17:15:03 +00:00
Christopher Tate
4cc3cff6f9 am 2ec14166: am df9cab2f: am ad716e42: am 2aa1d18e: Fix bug 17931760 - spurious timeout leads to mayhem 
* commit '2ec14166958a9460164ff0d6cf45fa22255604b0':
  Fix bug 17931760 - spurious timeout leads to mayhem
 2014-10-10 17:14:59 +00:00
Christoph Studer
d55008d4b7 am efeb94a8: am a6a6f4b2: am a2830b7d: am 2c2cb29a: Merge "WallpaperCropper: Use white color for action bar" into lmp-dev 
* commit 'efeb94a87d5598b486299202e35a72d4e46cde8b':
  WallpaperCropper: Use white color for action bar
 2014-10-10 17:14:50 +00:00
Justin Koh
fd9bfce697 am a53995be: am d853a900: am 1840bfee: Merge "Make GlobalKeyManager broadcasts send as foreground" into lmp-sprout-dev 
* commit 'a53995be1d6f91c3415ed59f839275d81c73d2b4':
  Make GlobalKeyManager broadcasts send as foreground
 2014-10-10 17:14:45 +00:00
Adam Lesinski
97ce1a6a23 am 983b668b: am be003a35: am f23e3ea6: am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev 
* commit '983b668bd8deb58cbd3faabb931c4fb2dd80bf2f':
  Search all packages for a given type string when looking up resources by name
 2014-10-10 17:14:41 +00:00
Dianne Hackborn
a22d2fc319 am 57af6ac7: am d190a5ca: am 0e259ce2: am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit '57af6ac767ff7063adbff694ff784e9ddc442a7e':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-10 17:14:36 +00:00
Jorim Jaggi
1aec63568a am f47ca477: am e10e0dbc: am fc779ccf: am 01f1c5c8: Merge "Fix content description for bluetooth icon" into lmp-dev 
* commit 'f47ca47765fd52b37d42caba3769100c96b8f0ae':
  Fix content description for bluetooth icon
 2014-10-10 17:14:32 +00:00
Joe Fernandez
7810a53c57 am 039e217d: am daf00ceb: am 487e15b9: am 401418d5: Merge "Revert "Removed preview license."" into lmp-dev 
* commit '039e217d32e9484c9b83ba68fc337959371d9a0a':
  Revert "Removed preview license."
 2014-10-10 17:14:27 +00:00
Sandeep Siddhartha
f9c45addce am a591efe2: am dbc9aa2c: am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'a591efe2839d45fe40928e97bf8c3c8c16e6ac82':
  Add tests for model management [SDK Only]
 2014-10-10 17:14:23 +00:00
Etan Cohen
eaecf6a2c9 am d5ea3240: am c3f8a8b1: am 4354e604: am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying. 
* commit 'd5ea324063b2dedc844b1aca65d485b03196a6a1':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
 2014-10-10 17:14:18 +00:00
Jorim Jaggi
1137ea7eaf am 782994ef: am 51650235: Merge "Apply color to progress bar for notifications" into lmp-mr1-dev 
* commit '782994efd30a153af44c38a9871d24fecb0eb609':
  Apply color to progress bar for notifications
 2014-10-10 17:01:07 +00:00
Elliott Hughes
801dbe73ab am 67ed9bde: am 011c96b5: Merge "Remove some unused %% strings from frameworks/base." into lmp-mr1-dev 
* commit '67ed9bdef98d85dc4da0b5afdd8e702f0bc72793':
  Remove some unused %% strings from frameworks/base.
 2014-10-10 17:00:47 +00:00
Elliott Hughes
be002304a3 am 8d092c23: am 7d32838d: Merge "Track change to private libcore data structure." into lmp-mr1-dev 
* commit '8d092c231ff42fdef51507bcb6071ac55678b80f':
  Track change to private libcore data structure.
 2014-10-10 17:00:41 +00:00
Adam Powell
f0eba02485 am 0f61804f: am 7cb761fe: Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev 
* commit '0f61804f18988dd547d3d56aef40a13aa59d3ce6':
  Document that MarginLayoutParams margins should be positive.
 2014-10-10 17:00:35 +00:00
Adam Powell
de640f0210 am 02091f07: am 19a9e6c2: Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev 
* commit '02091f071ad2b4754c9f4c7a66738d0d661c0c0e':
  Throw a more descriptive exception when adding null to a ViewGroup
 2014-10-10 17:00:30 +00:00
Robin Lee
967bc00fc1 am d92e9beb: am 499a3629: am 4a718f2a: am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 
* commit 'd92e9bebdfb37a220cc35d9f64292d4e854a7d6e':
  DevicePolicy: One cert tracker warning per profile
 2014-10-10 16:59:31 +00:00
Joe Fernandez
5d5f3d1d87 am d240b98f: am b455eb7b: am 5b349c4c: am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'd240b98f999533904db68cba93ea25c255f0ae53':
  docs: Android TV publishing requirements
 2014-10-10 16:59:26 +00:00
Chong Zhang
6725305137 am 8dac6fe7: am d4410a19: am d25b996a: am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit '8dac6fe7ae724549607b6400bdfc789f7a323472':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-10 16:59:22 +00:00
Christopher Tate
798965a693 am c049e123: am 97cb995e: am f857b272: am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev 
* commit 'c049e123bec7a573b012a2a024cbbb55ce32c402':
  Also monitor MOVED_TO events for wallpaper updates
 2014-10-10 16:59:17 +00:00
Fred Fettinger
a6758f664a am 0ebdc70d: am 1114b3b8: am 708206c3: am 6c858c25: am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 
* commit '0ebdc70d7a9b0cd38cfd6105135133c888075ef1':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
 2014-10-10 16:59:13 +00:00
mike dooley
7f1f1391c2 am a83896ce: am 6e24a156: am 3175824a: am 879142bf: Fix hangouts conference calling regression. 
* commit 'a83896ce73c56e3b16c8333cf442ebdbe7f9b8d0':
  Fix hangouts conference calling regression.
 2014-10-10 16:59:08 +00:00
Tim Kilbourn
9d285e7f99 am 79297f3c: am bb76d5cd: am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev 
* commit '79297f3c1c7898a194310169ef499889ed544a57':
  Don't start SearchDialog on television.
 2014-10-10 16:59:04 +00:00
Jeff Brown
1a62427231 am 847d2692: am 8aa2e3f1: am ab46eda8: am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev 
* commit '847d2692978bb8efcd5335feb3ea27aa87948f42':
  Ensure we correctly unblank displays when added.
 2014-10-10 16:59:00 +00:00
smain@google.com
ea2a8ba464 am efdf63a7: am 8aa0e547: am 8433b63c: am b880707c: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit 'efdf63a74e101d4c37b50b6ad18ddbefc4d74c37':
  fix unclickable link due to overlay from offset dev below
 2014-10-10 16:58:55 +00:00
smain@google.com
5c90ccc34e am 520100d5: am fc696fb6: am 3ae2a715: am 9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev 
* commit '520100d569127a23052478e0420f5feacbf8b366':
  update droiddoc option to include api level 21 for javadoc tagging
 2014-10-10 16:58:50 +00:00
Christopher Tate
5a65116141 am 353e4a99: am c09f6e69: am b03b6a6c: am 6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev 
* commit '353e4a99e92dbf8739b91e868aad7c2a86f0a7e7':
  Actually tell the widget service that restore is starting
 2014-10-10 16:58:45 +00:00
Jeff Hao
915bd5ca4f am 4b34b329: am 6b7515dd: Merge "Improve priority ordering of apps when performing boot dexopt." into lmp-mr1-dev 
* commit '4b34b329fb242985eedec63418b50357b00f6bd8':
  Improve priority ordering of apps when performing boot dexopt.
 2014-10-10 16:58:14 +00:00
RoboErik
ee512f515f am d9be933f: am 51ff1c93: am f9122232: am a78601dc: Merge "Ensure metadata bundles are unparceled before making them available" into lmp-dev 
* commit 'd9be933fc2e68f5f1ec5503e72f39b85abd65b52':
  Ensure metadata bundles are unparceled before making them available
 2014-10-10 16:57:55 +00:00
Christopher Tate
eb129805b5 am 05d7f0df: am a4d5471f: am 3a8e28c1: am c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev 
* commit '05d7f0dfe8352aab87d35f42209b1d34ae30b2d1':
  Turn on dimension validation in wallpaper restore
 2014-10-10 16:57:50 +00:00
Georgi Nikolov
3cda47927a am fb7bf887: am ffdc68e0: am 682d77dc: am 6eb0f480: Merge "BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler" into lmp-dev 
* commit 'fb7bf887eeacae9de156f819f0575d250b8efc06':
  BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler
 2014-10-10 16:57:45 +00:00
Ye Wen
b9e984594c am b6566c37: am ac9d81b9: am 108ba84a: am de73afe2: Merge "Make MmsServiceBroker more robust to MmsService crashes" into lmp-dev 
* commit 'b6566c373160ab09f346092abeb32eee2928bce1':
  Make MmsServiceBroker more robust to MmsService crashes
 2014-10-10 16:57:40 +00:00
Adam Lesinski
557b8d7cbd am bd1867e4: am 03be7ab5: am 6167950b: am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev 
* commit 'bd1867e48e9655c266fa901ec7bc9f85f8fb5c11':
  Remove UsageEvents#resetToStart() as it doesn't work
 2014-10-10 16:57:35 +00:00
ztenghui
39af6ae064 am a92dd37f: am e6411c76: Merge "Support dot separation as the svg path data did." into lmp-mr1-dev 
* commit 'a92dd37feb28923c1633b85d12382bc2aa2e03da':
  Support dot separation as the svg path data did.
 2014-10-10 16:57:03 +00:00
Geoff Mendal
ad54e37f3d am a036088d: (-s ours) am c1f4c0fe: (-s ours) am e73bb6e0: (-s ours) am 49c5ddd6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'a036088d8e10b3c10b06bb5c73aa885a8eb061ec':
  Import translations. DO NOT MERGE
 2014-10-10 04:27:04 +00:00
Quddus Chong
45d4e141d4 am 39dd5163: am 00c1c564: am 10be6fed: am 8f25f390: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '39dd5163e7c9695c65d728828778de4648903f62':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-10 04:27:00 +00:00
Mike Lockwood
253ad526c1 am 500913ee: am cf1e5c39: am cf61b3f6: am 3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds." into lmp-dev 
* commit '500913ee002eb8a6a418732f3a6d7549ac046eaf':
  bootanimation: Tweak parameters for pcm_open for playing boot sounds.
 2014-10-10 04:26:55 +00:00
Eino-Ville Talvala
874d982c4d am 58d5a8b6: am 7e7a14c5: am eeec4b9e: am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* commit '58d5a8b646ed479d12109a94b9ebd37be79e4662':
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-10 04:26:51 +00:00
Svetoslav
73a02f4337 am 202ff5f2: am fc324ddf: am 2f2864b7: am 3dd06d90: Merge "Restored widget provider id not properly updated." into lmp-dev 
* commit '202ff5f2e0c53ea68d40104f34084cb39b9906f1':
  Restored widget provider id not properly updated.
 2014-10-10 04:26:46 +00:00
Dianne Hackborn
75a6e82bcc am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '36ae48a850bade17d485cb49dd40a3f11f667ad4':
  Put in real "code" (aka marketing) name.
 2014-10-10 04:26:40 +00:00
Deepanshu Gupta
7c5020db4f am d8497e45: am 0a61c7ee: am 985d59d7: am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib. 
* commit 'd8497e45c72fbb27961d096499984906af19d35f':
  Exclude KXmlParser from LayoutLib.
 2014-10-10 04:26:33 +00:00
Jeff Sharkey
1855d0da8b am 8a1df415: am b4248495: am b01a5ba2: am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev 
* commit '8a1df4154d0e1296a3f03fa2aaf852ac08f68f36':
  Bring along more ApplicationInfo fields.
 2014-10-10 04:26:29 +00:00
Geoff Mendal
3853a21f01 am 52940c2b: (-s ours) am 437e5c9c: (-s ours) am db5b94d4: (-s ours) am f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '52940c2bcfa264a45875d36860de3903e336e740':
  Import translations. DO NOT MERGE
 2014-10-10 04:26:24 +00:00
Filip Gruszczynski
1e788daf6a am 6c995613: am 301d2276: am 49e2371a: Merge "Log exception when creating Activity in ActivityUnitTestCase." into lmp-sprout-dev 
* commit '6c99561384dafaa080b804078e55c6167efe0e11':
  Log exception when creating Activity in ActivityUnitTestCase.
 2014-10-10 04:26:18 +00:00
Selim Cinek
bb3627bd7d am bedae0db: am 3e056aa0: am f9df9dd8: Merge "Fixed an issue where the notification could become transparent" into lmp-dev 
* commit 'bedae0dbf1ad202621e676ac909c47fb17c4ec68':
  Fixed an issue where the notification could become transparent
 2014-10-10 00:41:32 +00:00
Christopher Tate
2ec1416695 am df9cab2f: am ad716e42: am 2aa1d18e: Fix bug 17931760 - spurious timeout leads to mayhem 
* commit 'df9cab2f129adcf5ca85369f155ab13193cd46b3':
  Fix bug 17931760 - spurious timeout leads to mayhem
 2014-10-10 00:41:28 +00:00
Christoph Studer
efeb94a87d am a6a6f4b2: am a2830b7d: am 2c2cb29a: Merge "WallpaperCropper: Use white color for action bar" into lmp-dev 
* commit 'a6a6f4b218b9801be842207fe93c74e1f076cb68':
  WallpaperCropper: Use white color for action bar
 2014-10-10 00:41:24 +00:00
Justin Koh
a53995be1d am d853a900: am 1840bfee: Merge "Make GlobalKeyManager broadcasts send as foreground" into lmp-sprout-dev 
* commit 'd853a90026ebbab1d23dd8e1a627be26c3c2410a':
  Make GlobalKeyManager broadcasts send as foreground
 2014-10-10 00:41:19 +00:00
Adam Lesinski
983b668bd8 am be003a35: am f23e3ea6: am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev 
* commit 'be003a357026a54c9fd0ae65cdc909f9b0cbc384':
  Search all packages for a given type string when looking up resources by name
 2014-10-10 00:41:15 +00:00
Dianne Hackborn
57af6ac767 am d190a5ca: am 0e259ce2: am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit 'd190a5ca4c0501f01d2eb5a0359bd987cb703b0c':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-10 00:41:11 +00:00
Jorim Jaggi
f47ca47765 am e10e0dbc: am fc779ccf: am 01f1c5c8: Merge "Fix content description for bluetooth icon" into lmp-dev 
* commit 'e10e0dbc860b12911634a430614163377481a73b':
  Fix content description for bluetooth icon
 2014-10-10 00:41:07 +00:00