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

160877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Jensen
b335d20628 Fix javadoc braces for ConnectivityManager.EXTRA_NETWORK. 
Change-Id: I5ad30a34f96e9e99a557b5bae9a30bfc08c89620
 2015-03-13 14:06:12 -04:00
Luan Nguyen
217a435665 am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 
* commit 'a8bdd2f341ded0f2096e2750d176873e3e9e89c7':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
 2015-03-13 17:57:02 +00:00
Luan Nguyen
a8bdd2f341 am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 
* commit '42bb44dbf5bffc5d3fcf89eacfd5c561dbe8095c':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
 2015-03-13 17:49:46 +00:00
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
Craig Mautner
c5ee610da5 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:38:53 +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
Nathan Harold
8ee14a2448 Merge "Adding hidden isWifiCallingEnabled() and isVolteEnabled()" into lmp-mr1-wfc-dev 2015-03-12 21:37:45 +00:00
Roozbeh Pournader
1ef2b92b74 am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list. 
automerge: c984826

* commit 'c98482663674cfae7e3640cd1dbd263d467f536d':
  Move Noto Sans Tai Le to the end of the font fallback list.
 2015-03-12 17:54:19 +00:00
Roozbeh Pournader
c984826636 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:41:20 +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 70f0a4365bbffd016470807c9dbd7e9c1ea2df9d)
 2015-03-12 15:45:32 +00:00
Deepanshu Gupta
fbabcb0bee am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev 
automerge: 713e7cc

* commit '713e7cc8c04a3486c99ad8c5af1adfd877f59798':
  Tools attribute improvements for RecyclerView LayoutManager.
 2015-03-12 02:05:06 +00:00
Rich Slogar
d5e957c9e9 am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs 
automerge: 3a5a410

* commit '3a5a410bca766aa7d48a6538df02e692ac693035':
  docs: build image updates
 2015-03-12 02:04:57 +00:00
Deepanshu Gupta
713e7cc8c0 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:45:25 +00:00
Deepanshu Gupta
c44430a368 Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev 2015-03-12 01:16:45 +00:00
Nathan Harold
42eadcdf34 Adding hidden isWifiCallingEnabled() and isVolteEnabled() 
Change-Id: Ic33f8c50dfb2d81b2bdc149629724e3972aad09e
 2015-03-11 18:08:08 -07:00
Deepanshu Gupta
2561d87602 am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 
automerge: 5c69ca2

* commit '5c69ca2b6d9e33fa84c78355d68215d88c6f23b2':
  Fix cyclic dependency in BlendComposite and BlendingMode.
 2015-03-12 01:03:46 +00:00
Deepanshu Gupta
ad04942485 am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev 
automerge: 49d3c36

* commit '49d3c36134f818e06dc6c71d462ee8369c73c195':
  Fix rare NPE in BridgeContext.
 2015-03-12 01:03:39 +00:00
Deepanshu Gupta
746db9cfbf am 71518174: Merge "Fix project settings." into lmp-mr1-dev 
automerge: 4abf088

* commit '4abf0885d7411e92ea0345686781e663a00fc1ba':
  Fix project settings.
 2015-03-12 01:03:31 +00:00
Deepanshu Gupta
4f221f0b6a am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev 
automerge: 26f672a

* commit '26f672a94cdc7cf8ff04745cc1a42b0e2acdf9e4':
  Add RecyclerView support.
 2015-03-12 01:03:23 +00:00
Rich Slogar
3a5a410bca 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:36 +00:00
Deepanshu Gupta
5c69ca2b6d 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:53:12 +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
Quddus Chong
3be3344c28 am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs 
automerge: 766889e

* commit '766889e9e27256c5772ee9f0eabe80444e9586d4':
  docs: Added overview page and Javadocs for the Android Testing Support Library.
 2015-03-12 00:51:43 +00:00
Deepanshu Gupta
49d3c36134 am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev 
* commit 'b3cfb334893a0b302cd6a0a998f27ca2e8ba7f9d':
  Fix rare NPE in BridgeContext.
 2015-03-12 00:46:14 +00:00
Deepanshu Gupta
4abf0885d7 am 71518174: Merge "Fix project settings." into lmp-mr1-dev 
* commit '71518174fcd57c85d1e38f1794c44b763baff286':
  Fix project settings.
 2015-03-12 00:46:10 +00:00
Deepanshu Gupta
26f672a94c am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev 
* commit 'b171be1a54a6a0fe416916ff91e41362b8bb4873':
  Add RecyclerView support.
 2015-03-12 00:46:07 +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
Quddus Chong
766889e9e2 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-12 00:41:08 +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 1a10ca7e526736b4fd143f7c9f3b29643c0062a4

Bug: http://b.android.com/159708
Change-Id: I6add5be3a933bbe4f8d888906e2aa1b2e35d045a
 2015-03-11 17:04:21 -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
Tyler Gunn
068085b35d Fix emergency callback number not shown for incoming calls. 
- Adding new Connection/Call capability: CAPABILITY_SHOW_CALLBACK_NUMBER.
- Used in Telephony to indicate on an incoming call that the callback
number should be shown.

Bug: 18689292
Change-Id: I1ab3baf9f0d5a22c4b01e6504e88d496182e01c7
 2015-03-11 20:16:19 +00:00
Luan Nguyen
86d4da3aa1 am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 
automerge: e32c162

* commit 'e32c162a40d55cca897b3572098fa0d552d20be9':
  Revert "docs: Update auto landing and design page image assets"
 2015-03-11 19:26:09 +00:00
Luan Nguyen
e32c162a40 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:13:06 +00:00