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

154590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bryce Lee
55e846d4a2 Add config to control going to sleep when entering theater mode. 
Bug: 18241209
Change-Id: I7fa29d92391b1c8ab74585008d6599fd7174cc61
 2014-11-04 12:43:44 -08:00
Mark Renouf
2750e9ffe1 am 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours automerge: 01afc37 -s ours 
* commit '4cc7ae80387df1556cd4f2a0db75cf91057f7609':
 2014-11-04 07:18:31 +00:00
Mark Renouf
2faa0c532c am 066f97e7: Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da -s ours automerge: ff2e718 -s ours 
* commit '066f97e79bce5ac6722f44dcb411f9642c40026c':
 2014-11-04 07:18:28 +00:00
kmccormick
eac757a8a2 am b2dfaf0e: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a automerge: 5298190 
* commit 'b2dfaf0ee621642190598b32b5ead861402b32ec':
 2014-11-04 07:18:24 +00:00
Mark Renouf
4cc7ae8038 If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours 
automerge: 01afc37  -s ours

* commit '01afc37403a244e75fbfa385b197d76e476213e8':
 2014-11-04 07:15:18 +00:00
Mark Renouf
066f97e79b Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da -s ours 
automerge: ff2e718  -s ours

* commit 'ff2e71830cafe063e876e5a56db0d33a8a5ba679':
 2014-11-04 07:14:17 +00:00
kmccormick
b2dfaf0ee6 am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a 
automerge: 5298190

* commit '5298190a30288d29cb9107d89b00411def3e469b':
 2014-11-04 07:13:11 +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
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
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
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
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
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
Deepanshu Gupta
84a89ed0f5 Merge "Use the right layout for inflating Action Bar." into lmp-dev 2014-11-03 23:13:15 +00:00
Bryce Lee
abf33e48ba Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev 2014-11-03 21:59:27 +00:00
Baligh Uddin
07dd52188c Import translations. DO NOT MERGE 
Bug: 18218486
Change-Id: I929129a2c443e4db78e0ad4e78e653a7cd603855
Auto-generated-cl: translation import
 2014-11-03 21:58:01 +00:00
Dirk Dougherty
45729a1049 am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. 
* commit '550465ba444a860eddfbf673ad09c07519d262d2':
  Doc change: Tv doc updates for publishing in Google Play.
 2014-11-03 21:21:11 +00:00
Luan Nguyen
9b1bad22a2 am dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 automerge: 4182391 
* commit 'dcea6fa9ad14e2b1ba4cce5c1f6acd08219494c5':
 2014-11-03 21:15:58 +00:00
Joe Fernandez
f05f8a3036 am cbabe576: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e automerge: 3d76f6a 
* commit 'cbabe5761296d60bd26a76dff710c00b86d55f69':
 2014-11-03 21:15:54 +00:00
Natalie Masse
471a354c87 am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58 
* commit '7d3bd06d2928942c6eedbcf5e9437b43a1268a6d':
 2014-11-03 21:15:51 +00:00
Scott Rowe
f6768bac86 am c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 automerge: e0da6dd 
* commit 'c51276ec1fddf67c7d31b35bdc0632098233fbb6':
 2014-11-03 21:15:47 +00:00
Dirk Dougherty
550465ba44 am e1970f12: Doc change: Tv doc updates for publishing in Google Play. 
* commit 'e1970f12583120613bc94e15841f6a7cc7919f68':
  Doc change: Tv doc updates for publishing in Google Play.
 2014-11-03 21:13:25 +00:00
Luan Nguyen
dcea6fa9ad am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 
automerge: 4182391

* commit '418239190b0d0e6921ee0e1e498a34bb7cddc392':
 2014-11-03 21:10:02 +00:00
Joe Fernandez
cbabe57612 am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e 
automerge: 3d76f6a

* commit '3d76f6a9578302e4c6c0de694ec7e0923f3cabe2':
 2014-11-03 21:08:45 +00:00
Joe Fernandez
2fb449e919 am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 automerge: d6ed575 
* commit '031a08631900b7863b3ea228db50062633a2decd':
 2014-11-03 21:08:40 +00:00
Prashant Malani
80c26ce0f6 am ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017 -s ours automerge: a8f4b8a -s ours 
* commit 'ee2802ebedf920b43bd199b807b4d413c8c8cf0a':
 2014-11-03 21:08:37 +00:00
Ricardo Cervera
b50fd5d569 am 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 automerge: 884b473 
* commit '764e61ad3ffecb0bcde4d1d5569757f9674f0849':
 2014-11-03 21:08:34 +00:00
Luan Nguyen
879b948e2b am acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 automerge: cc8b367 
* commit 'acbfd20d53b4caeb6e1bb1fc564fe795cde3a5bc':
 2014-11-03 21:08:30 +00:00
Natalie Masse
7d3bd06d29 am 1e5bb861: Link and typo fixed automerge: bcf9ced 
automerge: 9f6ea58

* commit '9f6ea5841c139bf061bc8b212b6f3183558235a1':
 2014-11-03 21:07:41 +00:00
Scott Rowe
c51276ec1f am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 
automerge: e0da6dd

* commit 'e0da6ddc08ff014bf2e5cd619451d95f5ac5663b':
 2014-11-03 21:05:48 +00:00
Joe Fernandez
031a086319 am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 
automerge: d6ed575

* commit 'd6ed5752da2c741b43d7c4d4d33da955c4fc72b9':
 2014-11-03 21:04:37 +00:00
Prashant Malani
ee2802ebed Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017 -s ours 
automerge: a8f4b8a  -s ours

* commit 'a8f4b8a26055055cc5efa3a33862db6f5ca572a5':
 2014-11-03 21:03:23 +00:00
Ricardo Cervera
764e61ad3f am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 
automerge: 884b473

* commit '884b473ad8bccfef4e379de9034278ffa2113780':
 2014-11-03 21:02:22 +00:00
smain@google.com
afa68731cf am 841b7a21: am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a automerge: 870afdb 
* commit '841b7a21f164f8fd9bf3c870e635d48861738751':
 2014-11-03 21:02:16 +00:00
smain@google.com
6df786d3b6 am 87c4d66d: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299 automerge: 469c8c8 
* commit '87c4d66ddd45829559f70eb921d0dbea66ca9982':
 2014-11-03 21:02:12 +00:00
Ricardo Cervera-Navarro
521f964a6e am e3e6193e: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b automerge: 4687757 
* commit 'e3e6193ea040a25691b68a780f16ebed3f685d0e':
 2014-11-03 21:02:07 +00:00
Rich Slogar
ec4bc00674 am 4f8a41cc: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad automerge: d84910b 
* commit '4f8a41cccdd7d7c8070d925decf4893b397cb7bc':
 2014-11-03 21:01:59 +00:00
Eric Gilmore
e9324d0f82 am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36 
* commit '7ecb0a3e5c50837d1b9ea6d952805a9b3795448e':
 2014-11-03 21:01:54 +00:00
Luan Nguyen
acbfd20d53 am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 
automerge: cc8b367

* commit 'cc8b36706cd976d8313ba35c238920079005578e':
 2014-11-03 20:59:12 +00:00
smain@google.com
841b7a21f1 am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a 
automerge: 870afdb

* commit '870afdb39abdb308aee8d035f5e72251059f7af4':
 2014-11-03 20:58:03 +00:00
Joe Fernandez
194d2026a3 am 7d35425b: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs automerge: a9d803e 
* commit '7d35425b98d7228f1b6fc58e96a2b3b9333318c2':
 2014-11-03 20:57:20 +00:00
Fred Fettinger
eeeebfff30 am b33ca4f3: am b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE automerge: 7565da1 -s ours 
* commit 'b33ca4f38c6b2a804fda7dad4cb488134b485130':
 2014-11-03 20:57:15 +00:00
smain@google.com
87c4d66ddd am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299 
automerge: 469c8c8

* commit '469c8c898389368b7fb9f34c302d810565e29326':
 2014-11-03 20:56:59 +00:00
Ricardo Cervera-Navarro
e3e6193ea0 am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b 
automerge: 4687757

* commit '46877572906d932d27bc39f0a347d17607411282':
 2014-11-03 20:55:52 +00:00
Rich Slogar
4f8a41cccd am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad 
automerge: d84910b

* commit 'd84910b06b8d8af7de04f975e58a77e65f888374':
 2014-11-03 20:54:50 +00:00
Eric Gilmore
7ecb0a3e5c Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp 
automerge: 068cb36

* commit '068cb36877144dc337766c1113250f5ebc2cbf6f':
 2014-11-03 20:53:40 +00:00
smain@google.com
16bc5859b7 am a77da17e: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below automerge: 3f0cf02 
* commit 'a77da17ecc64f6125c954892c6d2dabf1a317be5':
 2014-11-03 20:52:11 +00:00