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

163581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Solovay
6d6d0f91bf am 46e881de: am 4eb14e02: am d4c63b98: am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs automerge: 8d5ba01 
* commit '46e881de6110cc09227dba1071a57c81b24250f7':
  docs: Noted that purchaseToken is long and cannot be truncated.
 2015-02-18 00:25:23 +00:00
Rich Sloager
821bb7fdef am 3a69c24f: am dcf68e83: am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge: d225cfc 
* commit '3a69c24fcaa01f276b5a77e05487f9614c3ae246':
  Revert "docs: studio proxy setup"
 2015-02-18 00:25:20 +00:00
Rich Slogar
9f807e7ef2 am 6de1fd98: am 502f303c: am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge: 797c989 
* commit '6de1fd98f73b94c8bd5508b3e3d419d0b5d19621':
  docs: site mipmap folder updates
 2015-02-18 00:25:16 +00:00
Rich Slogar
2740233048 am b7fee4f4: am 6cdde671: am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs automerge: c694604 
* commit 'b7fee4f47c26c39f88e036b0dc368557f7b0cec0':
  docs: studio mipmap update
 2015-02-18 00:25:12 +00:00
Rich Slogar
c9cc2c228b am bd1fb402: am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge: 0f60943 
* commit 'bd1fb4021f790c7f61f2bb64feef1df8f14b1b7f':
  docs: note to install linux packages
 2015-02-18 00:22:40 +00:00
Rich Slogar
958f65057b am f82c88e2: am c48e9bde: am 9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs automerge: 5f31276 
* commit 'f82c88e28eddd5f38b53f66b345c030063bc17fe':
  docs: studio training basics create and run project updates
 2015-02-18 00:22:35 +00:00
Andrew Solovay
46e881de61 am 4eb14e02: am d4c63b98: am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs automerge: 8d5ba01 
* commit '4eb14e0294a675d7350cfe3da01f1c9f37fb2943':
  docs: Noted that purchaseToken is long and cannot be truncated.
 2015-02-18 00:22:28 +00:00
Rich Slogar
bd1fb4021f am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs 
automerge: 0f60943

* commit '0f609432222e9eb946bfaa2bee45301324b97311':
  docs: note to install linux packages
 2015-02-18 00:18:54 +00:00
Rich Sloager
3a69c24fca am dcf68e83: am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge: d225cfc 
* commit 'dcf68e83d6868abb6334c7a1881724f04929e87c':
  Revert "docs: studio proxy setup"
 2015-02-18 00:18:01 +00:00
Rich Slogar
6de1fd98f7 am 502f303c: am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge: 797c989 
* commit '502f303c6108515a86d2826d1e87d474ffdb0945':
  docs: site mipmap folder updates
 2015-02-18 00:17:56 +00:00
Rich Slogar
b7fee4f47c am 6cdde671: am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs automerge: c694604 
* commit '6cdde6718c36851e136e7358ba2ac1fd32f6aae5':
  docs: studio mipmap update
 2015-02-18 00:17:52 +00:00
Rich Slogar
f82c88e28e am c48e9bde: am 9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs 
automerge: 5f31276

* commit '5f3127620255167469fcba3d21334eb23217611d':
  docs: studio training basics create and run project updates
 2015-02-18 00:17:27 +00:00
Andrew Solovay
4eb14e0294 am d4c63b98: am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs 
automerge: 8d5ba01

* commit '8d5ba018266448caeb44637d273f63dbff2956af':
  docs: Noted that purchaseToken is long and cannot be truncated.
 2015-02-18 00:15:58 +00:00
Rich Sloager
dcf68e83d6 am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs 
automerge: d225cfc

* commit 'd225cfc811fd2f4041195b6df1094e2a8a13d3be':
  Revert "docs: studio proxy setup"
 2015-02-18 00:14:42 +00:00
Rich Slogar
502f303c61 am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs 
automerge: 797c989

* commit '797c989e3be0d081098866206b0e5829a7fe2ce2':
  docs: site mipmap folder updates
 2015-02-18 00:13:07 +00:00
Rich Slogar
6cdde6718c am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs 
automerge: c694604

* commit 'c694604ec58fc16f2526c8689b0def0fbcfb6fc7':
  docs: studio mipmap update
 2015-02-18 00:11:42 +00:00
Marco Nelissen
a3404263c0 am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev 
* commit '2f71ee24c5d982ccaa490c7a3e1390473909fbf0':
  Fix NPE
 2015-02-18 00:07:58 +00:00
Rich Slogar
0f60943222 am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs 
* commit 'e0f61e1c516be37125f16f1f0899ea6244d094c2':
  docs: note to install linux packages
 2015-02-18 00:07:55 +00:00
Marco Nelissen
2f71ee24c5 am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev 
* commit 'ffaee8bda9c8d22af17098fec0e6626301d91844':
  Fix NPE
 2015-02-18 00:01:02 +00:00
Rich Slogar
e0f61e1c51 am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs 
* commit '717b4d130f67606c44122c2219ed35996afc360c':
  docs: note to install linux packages
 2015-02-18 00:00:39 +00:00
Rich Slogar
717b4d130f Merge "docs: note to install linux packages" into lmp-docs 2015-02-17 23:54:50 +00:00
Marco Nelissen
ffaee8bda9 Merge "Fix NPE" into lmp-mr1-dev 2015-02-17 23:54:30 +00:00
Rich Slogar
5f31276202 am c48e9bde: am 9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs 
* commit 'c48e9bde6f5ae924dc1f9691da086c0a9077be3a':
  docs: studio training basics create and run project updates
 2015-02-17 23:53:49 +00:00
Rich Slogar
c48e9bde6f am 9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs 
* commit '9911aa51255d26c4299ab612430cd400e9468bcc':
  docs: studio training basics create and run project updates
 2015-02-17 23:47:29 +00:00
Craig Mautner
28de8edb7d am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev 
* commit 'ab8f60e425a90045eca06c09f0274f402b062d8f':
  Do not make ActivityContainer available to apps. DO NOT MERGE
 2015-02-17 23:43:33 +00:00
Rich Slogar
9911aa5125 Merge "docs: studio training basics create and run project updates" into lmp-docs 2015-02-17 23:40:36 +00:00
Craig Mautner
ab8f60e425 am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev 
* commit 'a94e42970d4e664e193cde0cf2700cb7e15961c9':
  Do not make ActivityContainer available to apps. DO NOT MERGE
 2015-02-17 23:36:51 +00:00
Craig Mautner
a94e42970d Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev 2015-02-17 23:30:34 +00:00
Alan Viverette
014442c28e am 0dfae079: am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev 
* commit '0dfae079633764c3b6fceaea38fdc664e0e5a76d':
  Revert "Fixed accessibility for the pin input view on keyguard."
 2015-02-17 22:59:29 +00:00
Andrew Solovay
8d5ba01826 am d4c63b98: am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs 
* commit 'd4c63b98aa25370a1ed4b57199c71413d6e24750':
  docs: Noted that purchaseToken is long and cannot be truncated.
 2015-02-17 22:56:18 +00:00
Alan Viverette
0dfae07963 am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev 
* commit 'd5471a0b2bf938cf83f4abac66a18664d8ca5277':
  Revert "Fixed accessibility for the pin input view on keyguard."
 2015-02-17 22:52:06 +00:00
Andrew Solovay
d4c63b98aa am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs 
* commit 'fd454a579f5a474546db616aa014505cd50865b5':
  docs: Noted that purchaseToken is long and cannot be truncated.
 2015-02-17 22:49:16 +00:00
Alan Viverette
d5471a0b2b Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev 2015-02-17 22:48:05 +00:00
Alan Viverette
157c75e4b5 am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev 
* commit '504c77e1ae2fdd3608cd7878a4b0ba4c9eac91de':
  Fix year picker initial range
 2015-02-17 22:41:15 +00:00
Rich Slogar
c706705325 am 2b29d96f: am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00 
* commit '2b29d96f0718f55429d0140ef9227310f42b228a':
  docs: studio proxy setting setup
  docs: studio proxy setup
 2015-02-17 22:41:11 +00:00
Oliver Woodman
aa5b5b7465 am 1289d522: am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge: a40eb5d 
* commit '1289d522986e44c681bae020cb6dffe1d563b1ed':
  Update ExoPlayer developer guide.
 2015-02-17 22:41:07 +00:00
Andrew Solovay
fd454a579f Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs 2015-02-17 22:41:04 +00:00
Rich Slogar
fa0ac1fd5c am 696ea51a: am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545 
* commit '696ea51a1c7c01061daf8693101e48d5d0701293':
  docs: studio revision 1-1
 2015-02-17 22:41:04 +00:00
Rich Slogar
cb5f052e11 am 4826bed5: am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9 
* commit '4826bed5dbb07bc819db071b02de7c30925ff8a6':
  docs: android plugin for gradle revisions page
 2015-02-17 22:41:00 +00:00
David Friedman
32759833c0 am 40191d8e: am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge: efb69b0 
* commit '40191d8e780724107c87edc5b1cfcea68a1442ca':
  This file is misplaced, and serves no purpose. I am sending it to oblivion.
 2015-02-17 22:40:57 +00:00
Alan Viverette
504c77e1ae am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev 
* commit 'd611fc4ea648e23ed3a6b311a07a5bd8b3e2927c':
  Fix year picker initial range
 2015-02-17 22:36:06 +00:00
Rich Slogar
2b29d96f07 am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00 
* commit '82510fa5a63114e75c0ed154120e0ca92d401524':
  docs: studio proxy setting setup
  docs: studio proxy setup
 2015-02-17 22:36:02 +00:00
Marco Nelissen
0e24cb7fb5 Fix NPE 
Path can be null if sd card was ejected, and we shouldn't make a thumbnail
in that case.

Bug: 19380821
Change-Id: Iee69effdd321622de026ad7b57c74cf9da81a176
 2015-02-17 14:35:37 -08:00
Alan Viverette
d611fc4ea6 Merge "Fix year picker initial range" into lmp-mr1-dev 2015-02-17 22:33:04 +00:00
Oliver Woodman
1289d52298 am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge: a40eb5d 
* commit '2a6bf82e26f5099b6659055c9b5ffce09efaedfd':
  Update ExoPlayer developer guide.
 2015-02-17 22:31:41 +00:00
Rich Slogar
696ea51a1c am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545 
* commit 'dbb32faf33c95b245d75c0dc8d4578a011378f78':
  docs: studio revision 1-1
 2015-02-17 22:31:37 +00:00
Rich Slogar
4826bed5db am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9 
* commit '2d43b7300dfad8bbf54d88e7b315d2ea38023131':
  docs: android plugin for gradle revisions page
 2015-02-17 22:31:33 +00:00
David Friedman
40191d8e78 am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge: efb69b0 
* commit 'a6614a12bbc6715af843d26f66fb32ae854323e6':
  This file is misplaced, and serves no purpose. I am sending it to oblivion.
 2015-02-17 22:31:28 +00:00
Deepanshu Gupta
803499e1db am c2fa5e20: am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge: 0684991 
* commit 'c2fa5e205e617df6b622cb54fac77738e82e6320':
  Add Asset management support for fonts.
 2015-02-17 22:31:24 +00:00
Diego Perez
a0235f8bb9 am d66f2eb2: am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fed 
* commit 'd66f2eb241ba8676ef01f4efd23be5ae62d3a7aa':
  Do not paint shadow if outside of the clip area
 2015-02-17 22:31:21 +00:00