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

163725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Craig Mautner
ca0653a424 Do not make ActivityContainer available to apps. DO NOT MERGE 
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.

Fixes bug 19394591.

Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
 2015-02-17 20:41:39 +00:00
Rich Slogar
76dd6aa7f9 Merge "docs: studio revision 1-1" into lmp-docs 2015-02-17 20:37:52 +00:00
Rich Slogar
69223702e4 docs: site mipmap folder updates 
b/12874352

Change-Id: I0b32502c8075740c66f04203110c9bfe8be103f9
 2015-02-17 12:34:35 -08: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
42661cba30 Revert "Fixed accessibility for the pin input view on keyguard." 
Also removes the Klondike from the content description.

This reverts commit c199ef37594b946cb295c29df321e74332ee5408
from change I3dd05fa1714da36795f448718fd70f1cdbfe2584

Bug: 18528774
Change-Id: I8a85076f939a8b78075b5a6322009ebfd78bf8d3
 2015-02-17 21:05:57 +01: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
Griff Hazen
1ad0fe6c36 Always draw the circular emulator overlay with square dimensions 
Bug: 17440607

Change-Id: I37bb99a0185c6269a3a541f0d810c11ff0acfb36
 2015-02-17 10:17:08 -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
Rich Slogar
38f2242e39 docs: studio mipmap update 
Change-Id: Id493c079186585a29a8c6b1ba57d921a7327868d
 2015-02-13 17:17:41 -08:00
Rich Slogar
0726a31f2b docs: studio proxy setting setup 
b/18332702

Change-Id: If3a78fc7b906bb94cfa74fc07b95ef72a84cf825
 2015-02-13 16:44:32 -08:00
Rich Slogar
9bd6de1eac docs: studio revision 1-1 
Change-Id: I7464ace70e9b9e430fd0f03329e20b64b1e1a56a
 2015-02-13 15:19:31 -08:00
Rich Slogar
3150bb78e6 docs: android plugin for gradle revisions page 
Change-Id: I15750eb11f69f9286fdd542c8e5a5e702b1a1255
 2015-02-13 14:58:10 -08:00
Deepanshu Gupta
068499111c am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev 
* commit 'ad879adb65ffa577844738522ab6d7d30aba2ead':
  Add Asset management support for fonts.
 2015-02-13 22:38:23 +00:00
Diego Perez
a912fedbc5 am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev 
* commit '98c3461acd6699ab0448f1785909d0d39cd61b5a':
  Do not paint shadow if outside of the clip area
 2015-02-13 22:38:17 +00:00
Deepanshu Gupta
4e47416012 am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev 
* commit '12c9e4980e889d1c72656a4062f9cee9a0e6f15a':
  Changes made by intelliJ 14.1
 2015-02-13 22:38:07 +00:00
Deepanshu Gupta
ad879adb65 Merge "Add Asset management support for fonts." into lmp-dev 2015-02-13 22:34:36 +00:00
Diego Perez
98c3461acd Merge "Do not paint shadow if outside of the clip area" into lmp-dev 2015-02-13 22:34:16 +00:00