Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,750 Commits 3 Branches 0 Tags
d98e7c1df774eb86a67310f5cbc0dbdd91f33c19
Commit Graph

164750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luan Nguyen
42bb44dbf5 Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 2015-03-13 17:42:15 +00:00
Griff Hazen
a093802171 Allow emulator to select a window outset bottom 
And clean up some copied around code.

Bug: 17440607

Change-Id: I5cf9c58b49110c4be1a77dc9c410fedc6b99aef3
 2015-03-13 10:01:41 -07:00
Luan Nguyen
534b83dc4b cherrypick from lmp-docs docs: Update auto landing and design page image 
assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819

Change-Id: I05d519595997683e88aaaa84ec76b353c3985aa7
 2015-03-13 09:19:43 -07:00
Craig Mautner
5be1afedd8 am 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '7151b1ef4213207103a669602d6bb9502bc22a13':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:46:51 +00:00
Craig Mautner
7151b1ef42 am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '98560bdf87ad5f97054b13d3c92954132584c7f7':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:37:32 +00:00
Craig Mautner
98560bdf87 am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit 'bfcc60a3f03ff25dccb5277626da213b1e254ccd':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:29:21 +00:00
Craig Mautner
bfcc60a3f0 am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '2825a9c618840c1cf3d59806a794674f12a7c7c6':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:22:33 +00:00
Craig Mautner
2825a9c618 am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '470ad0fa1c0a4047c0a4c3d132a9ec3106e447ba':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:17:36 +00:00
Craig Mautner
470ad0fa1c Merge "Correct docs to specify leading slash in paths." into lmp-docs 2015-03-13 00:09:31 +00:00
Vinod Krishnan
569635c57d Make Theme.Micro point to Theme.Material 
Bug: 18768870

Change-Id: I8dc8d1b539425da9ae7aaa71fa4de685dd1e75f0
 2015-03-12 11:24:46 -07:00
Roozbeh Pournader
07e01e07bb am 11b6e235: am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list. 
* commit '11b6e2358aac68691f016fca07ee82be3e815f2b':
  Move Noto Sans Tai Le to the end of the font fallback list.
 2015-03-12 17:52:54 +00:00
Roozbeh Pournader
11b6e2358a am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list. 
* commit 'db56b5a681b097f7649937e8ad4d73c1e560fb3b':
  Move Noto Sans Tai Le to the end of the font fallback list.
 2015-03-12 17:43:42 +00:00
Roozbeh Pournader
db56b5a681 Move Noto Sans Tai Le to the end of the font fallback list. 
This is to make sure the East Asian punctuation shared between CJK languages
and Tai Le are rendered from the CJK fonts when no language is specified
for the text, or CJK text is rendered in a non-CJK locale.

Also remove the old comment about 64k glyphs limit.

Bug: 19355391
Change-Id: Ic2cbc79cecf9539ace8a432f373685eeff81e106
(cherry picked from commit 70f0a4365b)
 2015-03-12 15:45:32 +00:00
Deepanshu Gupta
a4ed5e9411 am e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev 
* commit 'e770c5e45a139d709976f8c1dbb821733968b5a8':
  Tools attribute improvements for RecyclerView LayoutManager.
 2015-03-12 01:55:16 +00:00
Deepanshu Gupta
e770c5e45a am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev 
* commit 'c44430a36813dc4afb6000279254e578bc5d0391':
  Tools attribute improvements for RecyclerView LayoutManager.
 2015-03-12 01:41:57 +00:00
Deepanshu Gupta
c44430a368 Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev 2015-03-12 01:16:45 +00:00
Rich Slogar
1a27a3fb4e am 46005888: am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs 
* commit '4600588868b7df38084915793db8eeb38e90ca5a':
  docs: build image updates
 2015-03-12 01:07:20 +00:00
Deepanshu Gupta
65215edd7a am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 
* commit 'f0d324e531e395674f71b3944623bd17fe74b372':
  Fix cyclic dependency in BlendComposite and BlendingMode.
 2015-03-12 00:59:39 +00:00
Rich Slogar
4600588868 am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs 
* commit '0146922a6fee8af01ffd6ea201cbb6de0dbd4ed8':
  docs: build image updates
 2015-03-12 00:59:35 +00:00
Deepanshu Gupta
f0d324e531 am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 
* commit '71ba12308e338595d8068ff788bb5c8abfcfe515':
  Fix cyclic dependency in BlendComposite and BlendingMode.
 2015-03-12 00:52:53 +00:00
Rich Slogar
0146922a6f am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs 
* commit '633f482907d6c9cce672341f0d0a4d6c5c2b7f78':
  docs: build image updates
 2015-03-12 00:52:49 +00:00
Rich Slogar
633f482907 am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs 
* commit '7256fb4fdd088cd0a827452cbdd8bd243da00881':
  docs: build image updates
 2015-03-12 00:45:40 +00:00
Deepanshu Gupta
71ba12308e am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 
* commit 'efc09c644fa4e8354d54485aab6c0b18868284eb':
  Fix cyclic dependency in BlendComposite and BlendingMode.
 2015-03-12 00:45:40 +00:00
Deepanshu Gupta
c7fc094d31 am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev 
* commit 'd44af6108b18f3de05ed3f61d056d9c5b36ff8be':
  Fix rare NPE in BridgeContext.
 2015-03-12 00:45:35 +00:00
Deepanshu Gupta
a695f87db7 am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev 
* commit 'fa3c665019ace11140b3c5677d02c9711fc4d86d':
  Fix project settings.
 2015-03-12 00:45:31 +00:00
Deepanshu Gupta
05cba2f8ac am 338a5a88: am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev 
* commit '338a5a88fe8ecf8a724fcfaa2888a7c0fe53cb34':
  Add RecyclerView support.
 2015-03-12 00:45:27 +00:00
Deepanshu Gupta
d44af6108b am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev 
* commit 'b3cfb334893a0b302cd6a0a998f27ca2e8ba7f9d':
  Fix rare NPE in BridgeContext.
 2015-03-12 00:39:25 +00:00
Deepanshu Gupta
fa3c665019 am 71518174: Merge "Fix project settings." into lmp-mr1-dev 
* commit '71518174fcd57c85d1e38f1794c44b763baff286':
  Fix project settings.
 2015-03-12 00:39:21 +00:00
Deepanshu Gupta
338a5a88fe am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev 
* commit 'b171be1a54a6a0fe416916ff91e41362b8bb4873':
  Add RecyclerView support.
 2015-03-12 00:39:16 +00:00
Deepanshu Gupta
efc09c644f am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 
* commit '78660423900fa255cc83b85320e98d5184be393b':
  Fix cyclic dependency in BlendComposite and BlendingMode.
 2015-03-12 00:38:45 +00:00
Rich Slogar
7256fb4fdd am a6b0ddb7: Merge "docs: build image updates" into lmp-docs 
* commit 'a6b0ddb7f1437d67538364f16dedb61f7966c653':
  docs: build image updates
 2015-03-12 00:38:38 +00:00
Rich Slogar
a6b0ddb7f1 Merge "docs: build image updates" into lmp-docs 2015-03-12 00:34:10 +00:00
Deepanshu Gupta
7866042390 Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 2015-03-12 00:32:55 +00:00
Deepanshu Gupta
b3cfb33489 Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev 2015-03-12 00:32:32 +00:00
Deepanshu Gupta
71518174fc Merge "Fix project settings." into lmp-mr1-dev 2015-03-12 00:31:54 +00:00
Deepanshu Gupta
b171be1a54 Merge "Add RecyclerView support." into lmp-mr1-dev 2015-03-12 00:31:50 +00:00
Deepanshu Gupta
0412b317ac Tools attribute improvements for RecyclerView LayoutManager. 
1. Change tools attribute for layout manager from layoutManagerType to
LayoutManager.
2. Support classnames in the tools attribute.

This change doesn't try to supprt arbitrary classnames for now. The
reason for this is that the new layoutlib API is supposed to contain a
new method for inflating custom classes that are not views. This will
allow us to throw better error messages. Without the new API, trying for
different constructors, will result in a error messages being logged.

Change-Id: I3a31359c06b7452bfd973c3e5e54f9038acccfaa
 2015-03-11 17:26:48 -07:00
Deepanshu Gupta
5521f65ecb Fix cyclic dependency in BlendComposite and BlendingMode. 
Introduced in commit 1a10ca7e52

Bug: http://b.android.com/159708
Change-Id: I6add5be3a933bbe4f8d888906e2aa1b2e35d045a
 2015-03-11 17:04:21 -07:00
Quddus Chong
0d258a93ad am 737d3cc0: am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs 
* commit '737d3cc07996aec1a2f264d242e016a4ccbc4857':
  docs: Added overview page and Javadocs for the Android Testing Support Library.
 2015-03-11 23:47:54 +00:00
Quddus Chong
737d3cc079 am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs 
* commit '77eb85e14fb37a67af2eaf120e1c866dee64ad2c':
  docs: Added overview page and Javadocs for the Android Testing Support Library.
 2015-03-11 23:42:06 +00:00
Rich Slogar
5fe44955cf docs: remove studio proguard settings from play services 
b/19641719

Change-Id: Id3d9e2db10fc5264b11f41a8359dc05511af7634
 2015-03-11 16:37:39 -07:00
Quddus Chong
77eb85e14f am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs 
* commit 'c706a980e426ea0e0b6aaee5530516b1a16c3755':
  docs: Added overview page and Javadocs for the Android Testing Support Library.
 2015-03-11 23:30:58 +00:00
Quddus Chong
c706a980e4 am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs 
* commit 'a236a49edec87cd24fe683550c0ab83be3dcbf07':
  docs: Added overview page and Javadocs for the Android Testing Support Library.
 2015-03-11 23:24:37 +00:00
Quddus Chong
a236a49ede am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs 
* commit '47426f1c190b17548eabb50fad3945844f1a7363':
  docs: Added overview page and Javadocs for the Android Testing Support Library.
 2015-03-11 23:16:59 +00:00
Quddus Chong
47426f1c19 Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs 2015-03-11 23:11:03 +00:00
Quddus Chong
489218c3ed docs: Added overview page and Javadocs for the Android Testing Support Library. 
Change-Id: I645d3a302ce0d1d4cd389c6a58709a11a0426aed
 2015-03-11 16:08:24 -07:00
Deepanshu Gupta
85d72c4535 Fix rare NPE in BridgeContext. 
Also fixed some deprecation warnings.

Change-Id: I2fa00996dab0b008b9ca07a5382a059e5780529d
 2015-03-11 15:56:30 -07:00
Luan Nguyen
872a731e59 am a0f20621: am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 
* commit 'a0f20621f1943dfc545e1c2cee3ed6b9c321f61b':
  Revert "docs: Update auto landing and design page image assets"
 2015-03-11 19:19:31 +00:00
Luan Nguyen
a0f20621f1 am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 
* commit 'dd7d025b97aa09723f1695f23b85d1d926cb7ea1':
  Revert "docs: Update auto landing and design page image assets"
 2015-03-11 19:12:53 +00:00
Luan Nguyen
dd7d025b97 am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 
* commit 'ca0db1a0ec0fc0456ec4180d7b0bbac7e43dffec':
  Revert "docs: Update auto landing and design page image assets"
 2015-03-11 19:07:52 +00:00