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

174613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b20d48fd20 am 014442c2: am 0dfae079: am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev 
* commit '014442c28eae214af56f4c1fe3e0c21d5b091d25':
  Revert "Fixed accessibility for the pin input view on keyguard."
 2015-02-17 23:06:55 +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
Alan Viverette
7286d1ff37 am 157c75e4: am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev 
* commit '157c75e4b55d34d0426d08044130d74c2369be07':
  Fix year picker initial range
 2015-02-17 22:51:53 +00:00
Rich Slogar
65d12bf7f1 am c7067053: am 2b29d96f: am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00 
* commit 'c7067053252413f78edbd6f21618a65a72235542':
  docs: studio proxy setting setup
  docs: studio proxy setup
 2015-02-17 22:51:48 +00:00
Oliver Woodman
ea97005128 am aa5b5b74: am 1289d522: am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge: a40eb5d 
* commit 'aa5b5b7465bf667328d7400dee51f1d93412ef6c':
 2015-02-17 22:51:43 +00:00
Rich Slogar
d9a8bce7e0 am fa0ac1fd: am 696ea51a: am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545 
* commit 'fa0ac1fd5c7489a193f5aad55c5ed1292da8fcc0':
 2015-02-17 22:51:38 +00:00
Rich Slogar
39545001fc am cb5f052e: am 4826bed5: am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9 
* commit 'cb5f052e1179887c0f9cddb1f24120f5f3b75a05':
 2015-02-17 22:51:33 +00:00
David Friedman
480fb3fa91 am 32759833: 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 '32759833c0f8ff8f257f3d0436438e760fafca68':
 2015-02-17 22:51:27 +00:00
Deepanshu Gupta
bd966f8f69 am 803499e1: am c2fa5e20: am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge: 0684991 
* commit '803499e1dbb2206f19751dede54ebfc25ccaa6b2':
 2015-02-17 22:51:19 +00:00
Diego Perez
8a8b00686f am a0235f8b: am d66f2eb2: am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fed 
* commit 'a0235f8bb9b78caa065d1857d435e4a45f5c9bce':
 2015-02-17 22:51:14 +00:00
Deepanshu Gupta
f242e927ba am 79ded2d0: am f12d0233: am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e47416 
* commit '79ded2d035a53135dfd23caaf635b5a9a9f8ddc0':
 2015-02-17 22:51:09 +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
Oliver Woodman
6a71e814a3 am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge: a40eb5d 
automerge: 1289d52

* commit '1289d522986e44c681bae020cb6dffe1d563b1ed':
  Update ExoPlayer developer guide.
 2015-02-17 22:47:16 +00:00
Rich Slogar
0a8713799c am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545 
automerge: 696ea51

* commit '696ea51a1c7c01061daf8693101e48d5d0701293':
  docs: studio revision 1-1
 2015-02-17 22:45:49 +00:00
Rich Slogar
7b3a11802a am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9 
automerge: 4826bed

* commit '4826bed5dbb07bc819db071b02de7c30925ff8a6':
  docs: android plugin for gradle revisions page
 2015-02-17 22:43:17 +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
David Friedman
cdf0774314 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 
automerge: 40191d8

* commit '40191d8e780724107c87edc5b1cfcea68a1442ca':
  This file is misplaced, and serves no purpose. I am sending it to oblivion.
 2015-02-17 22:41:10 +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
Deepanshu Gupta
7bf58d0c55 am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge: 0684991 
automerge: c2fa5e2

* commit 'c2fa5e205e617df6b622cb54fac77738e82e6320':
  Add Asset management support for fonts.
 2015-02-17 22:39:48 +00:00
Diego Perez
412e6439b2 am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fed 
automerge: d66f2eb

* commit 'd66f2eb241ba8676ef01f4efd23be5ae62d3a7aa':
  Do not paint shadow if outside of the clip area
 2015-02-17 22:38:37 +00:00
Deepanshu Gupta
5cc0e76464 am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e47416 
automerge: f12d023

* commit 'f12d02339fefc4111b62715d5c0fb2e58570c34b':
  Changes made by intelliJ 14.1
 2015-02-17 22:36:59 +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
Deepanshu Gupta
79ded2d035 am f12d0233: am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e47416 
* commit 'f12d02339fefc4111b62715d5c0fb2e58570c34b':
  Changes made by intelliJ 14.1
 2015-02-17 22:31:17 +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
c2fa5e205e 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:17 +00:00
Diego Perez
d66f2eb241 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:14 +00:00