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

167045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
6cad6b0874 am 253ad526: am 500913ee: am cf1e5c39: am cf61b3f6: am 3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds." into lmp-dev 
* commit '253ad526c11840d64317158a23348169f8fca5a8':
  bootanimation: Tweak parameters for pcm_open for playing boot sounds.
 2014-10-10 05:41:36 +00:00
Eino-Ville Talvala
b3e95f7671 am 874d982c: am 58d5a8b6: am 7e7a14c5: am eeec4b9e: am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* commit '874d982c4ddcb5e4e2e561754cd9986ae5d12fc5':
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-10 05:41:31 +00:00
Svetoslav
137e4102d8 am 73a02f43: am 202ff5f2: am fc324ddf: am 2f2864b7: am 3dd06d90: Merge "Restored widget provider id not properly updated." into lmp-dev 
* commit '73a02f4337d03e723defbd3d89f514eba697d1bf':
  Restored widget provider id not properly updated.
 2014-10-10 05:41:25 +00:00
Dianne Hackborn
d95f1c991c am 75a6e82b: am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '75a6e82bcc625025c5f48dc6c33d0dd469e9ca61':
  Put in real "code" (aka marketing) name.
 2014-10-10 05:41:19 +00:00
Deepanshu Gupta
6799cdea94 am 7c5020db: am d8497e45: am 0a61c7ee: am 985d59d7: am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib. 
* commit '7c5020db4f5fc8f72179d6e34b9189e70f14eb5c':
  Exclude KXmlParser from LayoutLib.
 2014-10-10 05:41:13 +00:00
Jeff Sharkey
05272f2905 am 1855d0da: am 8a1df415: am b4248495: am b01a5ba2: am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev 
* commit '1855d0da8b3cee7774810c6103d4ce19944b1a6b':
  Bring along more ApplicationInfo fields.
 2014-10-10 05:41:07 +00:00
Geoff Mendal
e39fe032c8 am 3853a21f: (-s ours) 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 '3853a21f019da6697e8b851ac9a98da5ac88a5ef':
  Import translations. DO NOT MERGE
 2014-10-10 05:41:02 +00:00
Filip Gruszczynski
6603003794 am 1e788daf: am 6c995613: am 301d2276: am 49e2371a: Merge "Log exception when creating Activity in ActivityUnitTestCase." into lmp-sprout-dev 
* commit '1e788daf6a0a4c3ad561002e1039f9cc2450d578':
  Log exception when creating Activity in ActivityUnitTestCase.
 2014-10-10 05:40:56 +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
Etan Cohen
d5ea324063 am c3f8a8b1: am 4354e604: am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying. 
* commit 'c3f8a8b1ec788a65c247203ddb268a9acc634ab7':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
 2014-10-10 00:40:54 +00:00
Etan Cohen
c3f8a8b1ec am 4354e604: am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying. 
* commit '4354e6046e4a35b2f35348c6c131fdd600ac26af':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
 2014-10-10 00:30:14 +00:00
Alan Viverette
ccefe6eea6 am 3ad81eee: am 2eda6f07: am 466f5581: Merge "Slow down ripple background fade in from press" into lmp-mr1-dev 
* commit '3ad81eee7202317220599454bf550a755516a449':
  Slow down ripple background fade in from press
 2014-10-09 22:31:26 +00:00
Alan Viverette
f0e555086d am cda9841a: am f1d23f9c: am fe087d38: Merge "Fix invalid bounds detection in ExploreByTouchHelper" into lmp-mr1-dev 
* commit 'cda9841a8bc7391b8d9f9a3ec7a00ae06cb26fe3':
  Fix invalid bounds detection in ExploreByTouchHelper
 2014-10-09 22:31:19 +00:00
Alan Viverette
3ad81eee72 am 2eda6f07: am 466f5581: Merge "Slow down ripple background fade in from press" into lmp-mr1-dev 
* commit '2eda6f078cd6014a860903f515affa4d6a58748a':
  Slow down ripple background fade in from press
 2014-10-09 22:23:16 +00:00
Alan Viverette
cda9841a8b am f1d23f9c: am fe087d38: Merge "Fix invalid bounds detection in ExploreByTouchHelper" into lmp-mr1-dev 
* commit 'f1d23f9cc1992b936c98e2882eb5a3d766129fe7':
  Fix invalid bounds detection in ExploreByTouchHelper
 2014-10-09 22:23:11 +00:00
Jorim Jaggi
782994efd3 am 51650235: Merge "Apply color to progress bar for notifications" into lmp-mr1-dev 
* commit '51650235c1bd70c5b5c0d82fed31390008f94c89':
  Apply color to progress bar for notifications
 2014-10-09 22:07:20 +00:00
Jorim Jaggi
51650235c1 Merge "Apply color to progress bar for notifications" into lmp-mr1-dev 2014-10-09 22:01:56 +00:00
Elliott Hughes
67ed9bdef9 am 011c96b5: Merge "Remove some unused %% strings from frameworks/base." into lmp-mr1-dev 
* commit '011c96b556485552d84368130b5e4422ece25baa':
  Remove some unused %% strings from frameworks/base.
 2014-10-09 20:36:49 +00:00
Elliott Hughes
011c96b556 Merge "Remove some unused %% strings from frameworks/base." into lmp-mr1-dev 2014-10-09 20:31:40 +00:00
Elliott Hughes
8d092c231f am 7d32838d: Merge "Track change to private libcore data structure." into lmp-mr1-dev 
* commit '7d32838d7817be6528b8b63ccb3a985b9cd582c1':
  Track change to private libcore data structure.
 2014-10-09 20:20:09 +00:00
Elliott Hughes
7d32838d78 Merge "Track change to private libcore data structure." into lmp-mr1-dev 2014-10-09 20:15:52 +00:00
Adam Powell
0f61804f18 am 7cb761fe: Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev 
* commit '7cb761fe8c29fc00e66515c40f7fcb9111b70da0':
  Document that MarginLayoutParams margins should be positive.
 2014-10-09 20:12:29 +00:00
Adam Powell
7cb761fe8c Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev 2014-10-09 20:08:41 +00:00
Adam Powell
02091f071a am 19a9e6c2: Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev 
* commit '19a9e6c23b44e4fbee2f559e921170e34732d858':
  Throw a more descriptive exception when adding null to a ViewGroup
 2014-10-09 20:00:39 +00:00
Adam Powell
19a9e6c23b Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev 2014-10-09 19:57:00 +00:00
Adam Powell
a7a735fb2a Document that MarginLayoutParams margins should be positive. 
Negative margins can cause all sorts of other problematic assumptions,
subtle errors and unexpected behavior. While they technically work
developers should steer clear of them.

Change-Id: Ia1f7d9a33e25444ebdc3c32679ae1179210558e1
 2014-10-09 12:54:52 -07:00
Etan Cohen
4354e6046e am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying. 
* commit '5e5bc4b13cd1fc657da940c14e2333d8d3b18080':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
 2014-10-09 19:29:43 +00:00
Robin Lee
d92e9bebdf am 499a3629: am 4a718f2a: am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 
* commit '499a36294b48acf5c77f36281ddb40ef205dc596':
  DevicePolicy: One cert tracker warning per profile
 2014-10-09 19:23:27 +00:00
Joe Fernandez
d240b98f99 am b455eb7b: am 5b349c4c: am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'b455eb7b32748c326bf64467223a8e553d630176':
  docs: Android TV publishing requirements
 2014-10-09 19:23:23 +00:00
Chong Zhang
8dac6fe7ae am d4410a19: am d25b996a: am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit 'd4410a19bcad9e402c2a8f31576454a061c0c110':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-09 19:23:19 +00:00
Christopher Tate
c049e123be am 97cb995e: am f857b272: am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev 
* commit '97cb995e990ab868355f109c1466a810dbad4d35':
  Also monitor MOVED_TO events for wallpaper updates
 2014-10-09 19:23:15 +00:00
Fred Fettinger
0ebdc70d7a am 1114b3b8: am 708206c3: am 6c858c25: am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 
* commit '1114b3b8d74aee0f1ec17f9f7b7f8e8c3cb3b4ca':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
 2014-10-09 19:23:11 +00:00
mike dooley
a83896ce73 am 6e24a156: am 3175824a: am 879142bf: Fix hangouts conference calling regression. 
* commit '6e24a156cd9a43ff782926a8d5618ed63944a933':
  Fix hangouts conference calling regression.
 2014-10-09 19:23:07 +00:00
Tim Kilbourn
79297f3c1c am bb76d5cd: am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev 
* commit 'bb76d5cd886f34165e59a35a36c353fe559929c7':
  Don't start SearchDialog on television.
 2014-10-09 19:23:00 +00:00
Jeff Brown
847d269297 am 8aa2e3f1: am ab46eda8: am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev 
* commit '8aa2e3f168bc68b1ed59d0ea14a212bdb1837fa8':
  Ensure we correctly unblank displays when added.
 2014-10-09 19:22:56 +00:00
smain@google.com
efdf63a74e am 8aa0e547: am 8433b63c: am b880707c: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit '8aa0e54703067633001d52661a423075b38ed26e':
  fix unclickable link due to overlay from offset dev below
 2014-10-09 19:22:52 +00:00
smain@google.com
520100d569 am fc696fb6: am 3ae2a715: am 9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev 
* commit 'fc696fb6f3eb1b8226ac4675da02e512e5ff48bd':
  update droiddoc option to include api level 21 for javadoc tagging
 2014-10-09 19:22:48 +00:00
Christopher Tate
353e4a99e9 am c09f6e69: am b03b6a6c: am 6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev 
* commit 'c09f6e6906bc159121bf84454b0462a592032491':
  Actually tell the widget service that restore is starting
 2014-10-09 19:22:44 +00:00
Robin Lee
499a36294b am 4a718f2a: am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 
* commit '4a718f2af33159e58f4ad639d9d0e633a6ca8a8f':
  DevicePolicy: One cert tracker warning per profile
 2014-10-09 19:17:39 +00:00
Joe Fernandez
b455eb7b32 am 5b349c4c: am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit '5b349c4ce9be68efe3b6d0bc09a3cfa22d837f25':
  docs: Android TV publishing requirements
 2014-10-09 19:17:34 +00:00
Chong Zhang
d4410a19bc am d25b996a: am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit 'd25b996a7ab2589f258d0006dda6589f53d98366':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-09 19:17:29 +00:00