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

172050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
ebaad4b457 am 6757cc55: am ec3eb1c7: am 6df786d3: am 87c4d66d: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299 automerge: 469c8c8 automerge: 21fdc41 
* commit '6757cc5543bbc0c2c59669dfd25388ae6a9c2fe3':
 2014-11-04 01:16:16 +00:00
Ricardo Cervera-Navarro
44261ce721 am 4a1fb178: am dc489b6c: am 521f964a: am e3e6193e: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b automerge: 4687757 automerge: 6bda7d2 
* commit '4a1fb17845259c9f48ea6fe9b5ad60df1a653293':
 2014-11-04 01:16:10 +00:00
Rich Slogar
3a9ffeafc9 am d55f4731: am 4a6b69c5: am ec4bc006: am 4f8a41cc: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad automerge: d84910b automerge: 6b54651 
* commit 'd55f47318fc154a46918a372229e2e27b620cafd':
 2014-11-04 01:16:06 +00:00
Eric Gilmore
3b6abc6d4a am 921ceb2e: am f38b98f3: am e9324d0f: am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36 automerge: ee870df 
* commit '921ceb2eaa187242c520838daa906508991aeea9':
 2014-11-04 01:16:02 +00:00
Deepanshu Gupta
fef500107e am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 
* commit '0a2e42d4afe9aa81cc41674102dfc999496db845':
  Fix BridgeContext.get*ResourceValue()
 2014-11-04 01:08:43 +00:00
Deepanshu Gupta
9a6d8ae255 am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a 
* commit '33996b98787c4625f9cd4a8e38e6a88458773276':
  Support framework menus in ActionBar
 2014-11-04 01:08:39 +00:00
Deepanshu Gupta
5ad076396c am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed 
* commit 'cd5f3bab37ef1dc041489f53f565416d295916d9':
  Use the right layout for inflating Action Bar.
 2014-11-04 01:08:23 +00:00
David Friedman
e20e2b9a48 am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 
* commit '5a416a4905ba2f347a9837c1f578327c239f5910':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
 2014-11-04 01:06:41 +00:00
Nancy Chen
bff9a23ab3 am f9503019: Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev 
* commit 'f950301945164f5318ea50401fcf23bef824fa9c':
  Adn queries for multi-SIM. (2/3)
 2014-11-04 01:02:37 +00:00
Dianne Hackborn
e6fa3f4465 am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev 
* commit 'd1f1ea76e854d518803d68a31e35b34841468f4c':
  Few more small meminfo improvements.
 2014-11-04 01:01:35 +00:00
Bryce Lee
68993a41b3 am 99a6c1cb: Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev automerge: abf33e4 
* commit '99a6c1cbe83baff199be6fd69234e20b4b14241d':
  [Theater Mode] Add framework support for screen double tapping out of theater mode.
 2014-11-04 01:01:29 +00:00
Dirk Dougherty
0b8ae553e8 am 73e55866: am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. automerge: 45729a1 
* commit '73e558664d56a68745f9f4b2dc23bfee39ec624a':
  Doc change: Tv doc updates for publishing in Google Play.
 2014-11-04 01:01:19 +00:00
Adam Lesinski
5fa9021822 am f7ffcaa7: Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev 
* commit 'f7ffcaa7a478eaafc121e84b14dcaf2503dd5457':
  Build the split-select tool without C++11 support
 2014-11-04 01:01:13 +00:00
Adam Lesinski
78be0498af am 668f0a35: Merge "Fix issues that will be present in C++11" into lmp-mr1-dev 
* commit '668f0a356cba44c22d8ca0c9f4711613885d46a9':
  Fix issues that will be present in C++11
 2014-11-04 01:01:06 +00:00
David Friedman
5a416a4905 am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 
* commit 'a827de4e8bcd8d90987387b1acf8d8856104e21c':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
 2014-11-04 00:59:31 +00:00
Baligh Uddin
ecd9daab20 am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours 
* commit 'aa816de4e061ae5a70c759a1c6e55d111c636b6d':
  Import translations. DO NOT MERGE
 2014-11-04 00:56:16 +00:00
Deepanshu Gupta
0a2e42d4af Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev 
automerge: 9b64954

* commit '9b64954cb5b30b03abaae0b24132e1b1876f8af1':
  Fix BridgeContext.get*ResourceValue()
 2014-11-04 00:51:51 +00:00
Nancy Chen
f950301945 Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev 2014-11-04 00:51:29 +00:00
Deepanshu Gupta
33996b9878 Merge "Support framework menus in ActionBar" into lmp-dev 
automerge: c23487a

* commit 'c23487aa18a9882cb9c8c800c7c44ccb93ce60b9':
  Support framework menus in ActionBar
 2014-11-04 00:50:48 +00:00
Deepanshu Gupta
cd5f3bab37 Merge "Use the right layout for inflating Action Bar." into lmp-dev 
automerge: 84a89ed

* commit '84a89ed0f56d4c35cde5a1451a22a6edb59db06a':
  Use the right layout for inflating Action Bar.
 2014-11-04 00:49:43 +00:00
Baligh Uddin
aa816de4e0 Import translations. DO NOT MERGE 
automerge: 07dd521  -s ours

* commit '07dd52188ccafac3cec01122b132666f2bd8e32e':
  Import translations. DO NOT MERGE
 2014-11-04 00:48:44 +00:00
Dianne Hackborn
d1f1ea76e8 Merge "Few more small meminfo improvements." into lmp-mr1-dev 2014-11-04 00:41:54 +00:00
Rob Tsuk
b7c26562d0 Make points drawn with default paint visible 
When no stroke width is set, use 0.5 instead of 0.25 to make
sure the resulting rectangle spans at least one pixel.

Bug: 15455111
Change-Id: Id0a4b6d014c542ffc98b13a032f88ae0ce69b3a1
 2014-11-04 00:31:45 +00:00
Bryce Lee
99a6c1cbe8 Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev 
automerge: abf33e4

* commit 'abf33e48baff1ffc14562a499ec3eabc09a5dbb5':
  [Theater Mode] Add framework support for screen double tapping out of theater mode.
 2014-11-04 00:23:50 +00:00
Dirk Dougherty
73e558664d am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. 
automerge: 45729a1

* commit '45729a10495ed828749a706066b69051512bf4f0':
  Doc change: Tv doc updates for publishing in Google Play.
 2014-11-04 00:21:53 +00:00
John Spurlock
2d695813b4 QS: New rotation-lock tile icon, using AVDs. 
Also:
 - Better icon change detection, unify tile.icon vs tile.iconId.
 - Fix regression in touch feedback by fixing a11y string calculation.

Bug: 17426910
Change-Id: I14772f4e9b3be127bc39106ae9146ed46488fa48
 2014-11-03 19:08:39 -05:00
David Friedman
a827de4e8b Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 2014-11-04 00:05:52 +00:00
Jorim Jaggi
7fd12db350 Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev automerge: 3c7efdc 
automerge: 61059fe

* commit '61059fe82ca43adcd34ab8f48201a8925dcec164':
  Only hide sensitive content when Keyguard is showing
 2014-11-04 00:05:04 +00:00
Luan Nguyen
9a4dc72b35 am 9b1bad22: am dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 automerge: 4182391 automerge: c85ccdf 
automerge: 343baef

* commit '343baef7a50c5cdafeeab6b22cd8a888d5cef29c':
 2014-11-04 00:03:06 +00:00
Joe Fernandez
b070a7cf2f am f05f8a30: am cbabe576: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e automerge: 3d76f6a automerge: 583b2cc 
automerge: efbc7f3

* commit 'efbc7f33e47d6c87dbdffbd335c32df42b2190e2':
 2014-11-04 00:02:07 +00:00
Natalie Masse
f208d803a4 am 471a354c: am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58 automerge: f978dac 
automerge: f6ca1a6

* commit 'f6ca1a616cbdf7cc197bb263592dc7eb8e0ed680':
 2014-11-04 00:01:04 +00:00
Scott Rowe
f93197389f am f6768bac: am c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 automerge: e0da6dd automerge: d584dbe 
automerge: cca9f67

* commit 'cca9f67c24ca63b487ce91a858423e39fd2c8150':
 2014-11-03 23:59:56 +00:00
Joe Fernandez
995c1e0ea4 am 9586eacf: am 2fb449e9: am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 automerge: d6ed575 
automerge: a1ce8ca

* commit 'a1ce8ca70172529fbb7dbbdd591865a4396121cd':
 2014-11-03 23:58:10 +00:00
Prashant Malani
b507d8dee1 am eaf585a1: am 80c26ce0: am ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017 -s ours automerge: a8f4b8a -s ours 
automerge: 9ffa931  -s ours

* commit '9ffa931ad9a3e9c7c1bfbab539561abbd64ed177':
 2014-11-03 23:57:07 +00:00
Ricardo Cervera
cd8bff2369 am c96d62a6: am b50fd5d5: am 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 automerge: 884b473 
automerge: e3835c1

* commit 'e3835c143c18581e18362f7be4fd0729f3d4515b':
 2014-11-03 23:56:00 +00:00
Luan Nguyen
768e068bbf am 4e4a1ed3: am 879b948e: am acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 automerge: cc8b367 
automerge: d3b5483

* commit 'd3b5483df203986fc896725ee208e029ef3700ca':
 2014-11-03 23:54:56 +00:00
smain@google.com
cbc3b3db1a am c360ec9b: am afa68731: am 841b7a21: am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a automerge: 870afdb 
automerge: 5dbac8e

* commit '5dbac8e720e7a4227c7018f4fe5a69b717f72ce9':
 2014-11-03 23:53:23 +00:00
smain@google.com
6757cc5543 am ec3eb1c7: am 6df786d3: am 87c4d66d: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299 automerge: 469c8c8 
automerge: 21fdc41

* commit '21fdc416aef371975a656b8f8e7902535895b83d':
 2014-11-03 23:52:19 +00:00
Ricardo Cervera-Navarro
4a1fb17845 am dc489b6c: am 521f964a: am e3e6193e: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b automerge: 4687757 
automerge: 6bda7d2

* commit '6bda7d250e086dbfe829248d2359c564a0871d98':
 2014-11-03 23:51:11 +00:00
Rich Slogar
d55f47318f am 4a6b69c5: am ec4bc006: am 4f8a41cc: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad automerge: d84910b 
automerge: 6b54651

* commit '6b54651c245bd54c3889aa539c20b3c2ea30f10a':
 2014-11-03 23:50:03 +00:00
Eric Gilmore
921ceb2eaa am f38b98f3: am e9324d0f: am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36 
automerge: ee870df

* commit 'ee870df81593774a76d5618fecbccb8a3299dd2b':
 2014-11-03 23:48:43 +00:00
Adam Lesinski
f7ffcaa7a4 Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev 2014-11-03 23:38:56 +00:00
Adam Lesinski
668f0a356c Merge "Fix issues that will be present in C++11" into lmp-mr1-dev 2014-11-03 23:38:43 +00:00
Jorim Jaggi
61059fe82c Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev 
automerge: 3c7efdc

* commit '3c7efdc00506e6561ca08933f0b2acf5e3f16b02':
  Only hide sensitive content when Keyguard is showing
 2014-11-03 23:27:18 +00:00
Joe Fernandez
c0998b7b01 am 21c57b29: am d6d0be4f: am 194d2026: am 7d35425b: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs automerge: a9d803e 
automerge: 8b495ac

* commit '8b495acf4a5d049ccd3ecdd8607a12158c5d02e7':
 2014-11-03 23:15:17 +00:00
Deepanshu Gupta
9b64954cb5 Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev 2014-11-03 23:15:03 +00:00
Deepanshu Gupta
c23487aa18 Merge "Support framework menus in ActionBar" into lmp-dev 2014-11-03 23:14:46 +00:00
Fred Fettinger
3ff39c15ad am 1d538214: am 369aafb6: am eeeebfff: am b33ca4f3: am b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE automerge: 7565da1 -s ours 
automerge: 0ce56ec  -s ours

* commit '0ce56ec4ccb830bbe5d815a6b80161bf163bf04f':
 2014-11-03 23:14:08 +00:00
Deepanshu Gupta
84a89ed0f5 Merge "Use the right layout for inflating Action Bar." into lmp-dev 2014-11-03 23:13:15 +00:00
smain@google.com
00139ebc83 am 93a4b93d: am a2216f74: am 16bc5859: am a77da17e: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below automerge: 3f0cf02 
automerge: 226b432

* commit '226b432b29323989d2c51cbc0868755fa53b68bf':
 2014-11-03 23:11:37 +00:00