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

158143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
a369809808 am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed 
automerge: 5ad0763

* commit '5ad076396c43b2d26f9c020f0914623972cadd0e':
  Use the right layout for inflating Action Bar.
 2014-11-04 01:22:24 +00:00
Baligh Uddin
dc9dc7fa94 am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours 
automerge: ecd9daa  -s ours

* commit 'ecd9daab207b297a1b7404457b3578bcda9ca51d':
  Import translations. DO NOT MERGE
 2014-11-04 01:21:03 +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
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
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
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
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
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
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
Deepanshu Gupta
84a89ed0f5 Merge "Use the right layout for inflating Action Bar." into lmp-dev 2014-11-03 23:13:15 +00:00
Jorim Jaggi
3c7efdc005 Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev 2014-11-03 22:38:34 +00:00
Luan Nguyen
343baef7a5 am 9b1bad22: am dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 automerge: 4182391 
automerge: c85ccdf

* commit 'c85ccdf307fcc8c826ac6d02f372f724b8984089':
 2014-11-03 22:11:54 +00:00
Joe Fernandez
efbc7f33e4 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

* commit '583b2cc0513da316ba9d192a4c03143b9e0429f8':
 2014-11-03 22:10:53 +00:00
Natalie Masse
f6ca1a616c am 471a354c: am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58 
automerge: f978dac

* commit 'f978dac8b7de06911a2da0f5a32fb20ac430443d':
 2014-11-03 22:09:47 +00:00
Scott Rowe
cca9f67c24 am f6768bac: am c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 automerge: e0da6dd 
automerge: d584dbe

* commit 'd584dbea672341a533dc0cfdfb5d05ffadcc67f5':
 2014-11-03 22:08:38 +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
Dianne Hackborn
1842930762 Few more small meminfo improvements. 
- Add in category for graphics driver, and knowledge about it
  for N5 (more devices will be added later).
- Renaming the labels for the .oat and .art files to be just
  that, so it is clear what they are talking about.

Change-Id: I663ca8bd2febce41fcdde74b0d3a96ef9325edf1
 2014-11-03 13:58:11 -08: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
Joe Fernandez
a1ce8ca701 am 9586eacf: am 2fb449e9: am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 automerge: d6ed575 
* commit '9586eacf98de267d9caed9cb0f09f501c1ecf761':
 2014-11-03 21:24:07 +00:00
Prashant Malani
9ffa931ad9 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 
* commit 'eaf585a1bb7564891844eeee3e48ba60433487d1':
 2014-11-03 21:24:01 +00:00
Ricardo Cervera
e3835c143c am c96d62a6: am b50fd5d5: am 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 automerge: 884b473 
* commit 'c96d62a66a539d7fd66e84294b82637a22e4ef37':
 2014-11-03 21:23:56 +00:00
Luan Nguyen
d3b5483df2 am 4e4a1ed3: am 879b948e: am acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 automerge: cc8b367 
* commit '4e4a1ed3380b51a1667516579825f2bf839036f0':
 2014-11-03 21:23:51 +00:00
Luan Nguyen
c85ccdf307 am 9b1bad22: am dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 automerge: 4182391 
* commit '9b1bad22a2cc6ff4d996d40c7c1cbbd56200ec38':
 2014-11-03 21:22:12 +00:00
Joe Fernandez
583b2cc051 am f05f8a30: am cbabe576: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e automerge: 3d76f6a 
* commit 'f05f8a3036730389ced119ee9f4a44f2af96e06e':
 2014-11-03 21:22:02 +00:00
Natalie Masse
f978dac8b7 am 471a354c: am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58 
* commit '471a354c870ea02c2742c92c7b819ca1b1567f6f':
 2014-11-03 21:21:52 +00:00
Scott Rowe
d584dbea67 am f6768bac: am c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 automerge: e0da6dd 
* commit 'f6768bac864cdf9ed99b088dc88da6b38df6911e':
 2014-11-03 21:21:48 +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
smain@google.com
5dbac8e720 am c360ec9b: am afa68731: am 841b7a21: am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a automerge: 870afdb 
* commit 'c360ec9b6d310e0813bdb86e563eafb5c236ffaa':
 2014-11-03 21:18:58 +00:00
smain@google.com
21fdc416ae am ec3eb1c7: am 6df786d3: am 87c4d66d: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299 automerge: 469c8c8 
* commit 'ec3eb1c7f56e2f67eb0a706d259946ea6bb9c403':
 2014-11-03 21:18:53 +00:00
Ricardo Cervera-Navarro
6bda7d250e 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 
* commit 'dc489b6ce770780a02966bbcb6b2e0dfceb618bd':
 2014-11-03 21:18:48 +00:00
Rich Slogar
6b54651c24 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 
* commit '4a6b69c54545f5d1b8979eed7b4d734c7c6c21e1':
 2014-11-03 21:18:44 +00:00
Eric Gilmore
ee870df815 am f38b98f3: am e9324d0f: am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36 
* commit 'f38b98f3b6f91afd62dc7a20a38559c15f8fc80e':
 2014-11-03 21:18:39 +00:00
Joe Fernandez
9586eacf98 am 2fb449e9: am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 automerge: d6ed575 
* commit '2fb449e9190abe7b3181d623091df378bc682a7b':
 2014-11-03 21:17:18 +00:00
Prashant Malani
eaf585a1bb am 80c26ce0: am ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017 -s ours automerge: a8f4b8a -s ours 
* commit '80c26ce0f6893b2c97b88800467332b69d793e4c':
 2014-11-03 21:17:14 +00:00
Ricardo Cervera
c96d62a66a am b50fd5d5: am 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 automerge: 884b473 
* commit 'b50fd5d569d03292fa0b4c4306077efbab87f70e':
 2014-11-03 21:17:11 +00:00
Luan Nguyen
4e4a1ed338 am 879b948e: am acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 automerge: cc8b367 
* commit '879b948e2bfed25877ff89ac316885394139cc11':
 2014-11-03 21:17:07 +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