Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
163,478 Commits 3 Branches 0 Tags
157c75e4b55d34d0426d08044130d74c2369be07
Commit Graph

163478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Deepanshu Gupta
f12d02339f 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:09 +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
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
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 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
Oliver Woodman
a40eb5db45 am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs 
* commit '533149d54f881e07f36c2fd62c861942542340fc':
  Update ExoPlayer developer guide.
 2015-02-17 20:59:50 +00:00
Oliver Woodman
533149d54f am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs 
* commit 'fe3e71befacc5d0777eb0c7099dd910197cfb6b6':
  Update ExoPlayer developer guide.
 2015-02-17 20:53:13 +00:00
Rich Slogar
bff1545a3e am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs 
* commit '8c124744b625f547a5ba15cbb442c605f109bae0':
  docs: studio revision 1-1
 2015-02-17 20:49:44 +00:00
Oliver Woodman
fe3e71befa Merge "Update ExoPlayer developer guide." into lmp-docs 2015-02-17 20:48:50 +00:00
Oliver Woodman
a2e9e27f4c Update ExoPlayer developer guide. 
This is a minimal update, just to fix things that are broken
or no longer make sense as of the v1.2.0 release.

Change-Id: If519709c91c975d96b62e2dd28e18e2105735c2b
 2015-02-17 20:47:17 +00:00
Rich Slogar
8c124744b6 am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs 
* commit '76dd6aa7f9d36183f44654eb45dc304abe8b7caf':
  docs: studio revision 1-1
 2015-02-17 20:42:44 +00:00
Rich Slogar
76dd6aa7f9 Merge "docs: studio revision 1-1" into lmp-docs 2015-02-17 20:37:52 +00:00
Rich Slogar
cb73fb9044 am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs 
* commit 'd285664399f8f68750e75707a35046e3c9592a2d':
  docs: android plugin for gradle revisions page
 2015-02-17 20:26:46 +00:00
Rich Slogar
d285664399 am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs 
* commit '4abf87f134fa81460e018bb7130e88639281e1ce':
  docs: android plugin for gradle revisions page
 2015-02-17 20:19:59 +00:00
Rich Slogar
4abf87f134 Merge "docs: android plugin for gradle revisions page" into lmp-docs 2015-02-17 20:16:09 +00:00
Adrian Roos
7131a7d64e am d245ad24: am 024fd0c6: Disable color view animations when stable insets change 
* commit 'd245ad24f5e6e8c7b302689467b12718c94f4ced':
  Disable color view animations when stable insets change
 2015-02-17 18:46:40 +00:00
Adrian Roos
d245ad24f5 am 024fd0c6: Disable color view animations when stable insets change 
* commit '024fd0c6051e01579018fad0c1a56e9e47b195df':
  Disable color view animations when stable insets change
 2015-02-17 18:40:01 +00:00
Adrian Roos
024fd0c605 Disable color view animations when stable insets change 
Prevents color view from showing up on phones when
the orientation changes to landscape. Previously, the
animation was only prevented when the stable inset of a
bar became nonzero; now we disable animations whenever
the nonzeroness changes.

Bug: 19353466
Change-Id: I31b4103fe984d158a98cd446ac2ddbe15a408e49
 2015-02-17 10:24:52 -08:00
Geoff Mendal
0a786f5f22 am f27b9850: (-s ours) Import translations. DO NOT MERGE 
* commit 'f27b98508492ebad1e183cb052df0327d47693b4':
  Import translations. DO NOT MERGE
 2015-02-16 17:07:07 +00:00
Geoff Mendal
f27b985084 Import translations. DO NOT MERGE 
Change-Id: Ied71409f62ba67cdab855f04d60e154653822611
Auto-generated-cl: translation import
 2015-02-16 08:08:12 -08:00
David Friedman
efb69b003e am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs 
* commit '53ec037f9eb0e29f958faa334cf23c35f079eb85':
  This file is misplaced, and serves no purpose. I am sending it to oblivion.
 2015-02-14 02:50:49 +00:00
David Friedman
53ec037f9e am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs 
* commit '03efba0e3a64cf4b0084bed056c24fbe8a2030c9':
  This file is misplaced, and serves no purpose. I am sending it to oblivion.
 2015-02-14 02:42:44 +00:00
David Friedman
03efba0e3a Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs 2015-02-14 02:36:34 +00:00
Filip Gruszczynski
88a9a2a46e Merge "Support for faster brightness response to light changes." into lmp-mr1-modular-dev 2015-02-14 02:21:42 +00:00