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

160592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
d0e40040eb am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev 
* commit 'ffaee8bda9c8d22af17098fec0e6626301d91844':
  Fix NPE
 2015-02-18 00:01:16 +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
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
c9f7a17ac7 am a94e4297: (-s ours) 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:35 +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
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
12c2d3fecf 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:14 +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
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
Alan Viverette
bed5a61fd0 am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev 
* commit 'd611fc4ea648e23ed3a6b311a07a5bd8b3e2927c':
  Fix year picker initial range
 2015-02-17 22:36:00 +00:00
Rich Slogar
6490ad4ae5 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:35:56 +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
c987508df7 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:36 +00:00
Rich Slogar
e343c3c7b2 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:32 +00:00
Rich Slogar
b4f80926b5 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:27 +00:00
David Friedman
4e1206bcd2 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:21 +00:00
Rich Slogar
82510fa5a6 am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs 
automerge: fa40f00

* commit 'fa40f0072f4eb24d0e2b641bf7b4235e99362c1e':
  docs: studio proxy setting setup
  docs: studio proxy setup
 2015-02-17 22:28:45 +00:00
Rich Sloager
d225cfc811 am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs 
* commit 'd75a68339af547b89068e1e4fe78d34c9b11f38e':
  Revert "docs: studio proxy setup"
 2015-02-17 22:27:44 +00:00
Oliver Woodman
2a6bf82e26 am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs 
automerge: a40eb5d

* commit 'a40eb5db455ebb225a7ff0afa244256079d8cf20':
  Update ExoPlayer developer guide.
 2015-02-17 22:27:16 +00:00
Rich Slogar
dbb32faf33 am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs 
automerge: bff1545

* commit 'bff1545a3e6a3c296a8ffcefb5f1141f9a21c5d1':
  docs: studio revision 1-1
 2015-02-17 22:25:53 +00:00
Rich Slogar
2d43b7300d am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs 
automerge: cb73fb9

* commit 'cb73fb90443a3a3fee645aa3f01d38b19f108377':
  docs: android plugin for gradle revisions page
 2015-02-17 22:24:38 +00:00
Deepanshu Gupta
06aad89cf2 am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge: 0684991 
* commit '0a300b897711bfa39e0d30e2fa61664f01fb58d8':
  Add Asset management support for fonts.
 2015-02-17 22:24:27 +00:00
Diego Perez
2e7db07b7a am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fed 
* commit 'a0fb87a3b831e8eb4e4f7e03fc170cf8f93a2161':
  Do not paint shadow if outside of the clip area
 2015-02-17 22:24:24 +00:00
Deepanshu Gupta
88542b8a6b am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e47416 
* commit '221d732005b04b5f979d2e03e8ebe00160e52ca3':
  Changes made by intelliJ 14.1
 2015-02-17 22:24:20 +00:00
David Friedman
a6614a12bb 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 'efb69b003e24757fbf04f219a61a4a71adada3a2':
  This file is misplaced, and serves no purpose. I am sending it to oblivion.
 2015-02-17 22:22:50 +00:00
Deepanshu Gupta
0a300b8977 am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev 
automerge: 0684991

* commit '068499111c173fdd9869e7dbe5b9de857aca1c2d':
  Add Asset management support for fonts.
 2015-02-17 22:21:11 +00:00
Rich Slogar
797c989e3b am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs 
* commit 'd72bea9dea10a956bf9b92de71e2dc046e7eae90':
  docs: site mipmap folder updates
 2015-02-17 22:20:51 +00:00
Rich Slogar
c694604ec5 am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs 
* commit '43fb9e42df4754a7d2646898d384a369d329197c':
  docs: studio mipmap update
 2015-02-17 22:20:46 +00:00
Rich Sloager
d75a68339a am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs 
* commit '099ce51393721424a7cc1fbd29fe59a1970a55ed':
  Revert "docs: studio proxy setup"
 2015-02-17 22:20:43 +00:00
Diego Perez
a0fb87a3b8 am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev 
automerge: a912fed

* commit 'a912fedbc5fba99fb75884a1941d58170822ceb4':
  Do not paint shadow if outside of the clip area
 2015-02-17 22:19:43 +00:00
Deepanshu Gupta
221d732005 am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev 
automerge: 4e47416

* commit '4e47416012b8cb88d564a04a29c0b79a28b9e529':
  Changes made by intelliJ 14.1
 2015-02-17 22:18:35 +00:00
Rich Slogar
d72bea9dea am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs 
* commit '40132ee15afbc45858b637410aecb861da60878a':
  docs: site mipmap folder updates
 2015-02-17 22:13:51 +00:00
Rich Slogar
43fb9e42df am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs 
* commit '3c3b780caea0bec62904a83f385f5a865fb259a7':
  docs: studio mipmap update
 2015-02-17 22:13:48 +00:00
Rich Sloager
099ce51393 Merge "Revert "docs: studio proxy setup"" into lmp-docs 2015-02-17 22:13:45 +00:00
Rich Slogar
fa40f0072f am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs 
* commit '9c9a3afb95dcac7bf356edf25c8d86187ea59afd':
  docs: studio proxy setting setup
  docs: studio proxy setup
 2015-02-17 22:13:37 +00:00
Rich Sloager
383dacc738 Revert "docs: studio proxy setup" 
This reverts commit c3e0107ce30aa676011bf7ea0daa9c8db750f024.

Change-Id: I7edf925fe51a79284a3e7a94d60174308fa56d4b
 2015-02-17 22:10:27 +00:00
Rich Slogar
40132ee15a Merge "docs: site mipmap folder updates" into lmp-docs 2015-02-17 22:08:42 +00:00
Rich Slogar
3c3b780cae Merge "docs: studio mipmap update" into lmp-docs 2015-02-17 22:06:46 +00:00
Rich Slogar
9c9a3afb95 am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs 
* commit '8823b93d5c32bb7a8c757022ce055ca53b71171f':
  docs: studio proxy setting setup
  docs: studio proxy setup
 2015-02-17 22:06:21 +00:00
Rich Slogar
8823b93d5c Merge changes If3a78fc7,Ifbe3f03a into lmp-docs 
* changes:
  docs: studio proxy setting setup
  docs: studio proxy setup
 2015-02-17 22:02:45 +00:00
Alan Viverette
2a90fa6d94 Fix year picker initial range 
BUG: 19410328
Change-Id: I2a2952eb58eb856f93b7af2f49e08abe71078aa9
 2015-02-17 21:11:36 +00:00