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

153604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
8fa394fa8c Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev 2015-03-04 16:09:29 +00:00
Joe Fernandez
c4418980a0 am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit 'a31378dc49868412a2e632bcc46a44877a9b397f':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:15:29 +00:00
Joe Fernandez
a31378dc49 Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 2015-03-03 06:11:50 +00:00
Andrew Solovay
27f5337841 Minor typo fixes in managed profile Javadoc reference pages. 
See first comment for stage location.

bug: 19389235
Change-Id: I2e1d5169a77e3f4000e73f08d493953ce4eee78c
 2015-03-02 17:22:18 -08:00
Rich Slogar
2cbda290f6 am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs 
* commit '69b58e74e087159ed5950632b4ab3738a841c633':
  docs: sdk tools 24.1 update
 2015-03-03 01:13:36 +00:00
Rich Slogar
69b58e74e0 Merge "docs: sdk tools 24.1 update" into lmp-docs 2015-03-03 01:07:44 +00:00
Deepanshu Gupta
72d75f8d9f Merge "Correct PorterDuff filters." into lmp-dev 2015-03-02 19:40:14 +00:00
Deepanshu Gupta
369ad57b00 Merge "Fix codestyle for switch statements." into lmp-dev 2015-03-02 19:37:32 +00:00
Deepanshu Gupta
10d620ff2c Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev 2015-03-02 19:37:04 +00:00
Joe Fernandez
9b94a53998 am 97a1173b: docs: March 2015 Dashboard update 
* commit '97a1173b63be900ab5aed694e8022c60f3817fa0':
  docs: March 2015 Dashboard update
 2015-03-02 17:09:01 +00:00
Joe Fernandez
97a1173b63 docs: March 2015 Dashboard update 
Change-Id: Icaf390b6e55c216c45730190ab31bec7b746e361
 2015-03-02 09:00:55 -08:00
Rich Slogar
b9157aff78 docs: sdk tools 24.1 update 
Change-Id: I995c1012c22b8b6fa45c4cfd33f90b8b82ddb0eb
 2015-02-27 14:53:42 -08:00
Rich Slogar
50e8b020f6 am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs 
* commit 'a83f64451d55882366491e66c7479f194e0625ea':
  docs: gradle plugin version update
 2015-02-27 22:37:17 +00:00
Rich Slogar
a83f64451d Merge "docs: gradle plugin version update" into lmp-docs 2015-02-27 22:31:33 +00:00
Rich Slogar
5fcfe207fe docs: gradle plugin version update 
b.android 153270

Change-Id: I0c752fdf28181c50924a1ca946b5110f773659dc
 2015-02-27 14:29:24 -08:00
Luan Nguyen
8aa8960edb am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs 
* commit 'a464d409f68ca9a59ac4261edd46866ae2af68bf':
  docs: Add steps to enable adb debugging on Wear device
 2015-02-27 16:37:46 +00:00
Ryosuke Matsuuchi
c1120b459e am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs 
* commit '8f0e9c7593fee981fc4b3831aae76a1f20e236db':
  doc: Add Japanese version of DAC/distribute/ page.
 2015-02-27 16:37:42 +00:00
Andrew Solovay
7f26f2b96a am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal 
* commit 'b5e00e5c3db7fc7121aeff6dc7d20b21740d47e5':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
 2015-02-27 16:37:38 +00:00
Luan Nguyen
a464d409f6 Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs 2015-02-27 15:07:02 +00:00
Ryosuke Matsuuchi
8f0e9c7593 Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs 2015-02-27 03:41:51 +00:00
Deepanshu Gupta
1a10ca7e52 Correct PorterDuff filters. 
1. Remove unused modes - makes the class more manageable, and missing
modes can always be readded from the git history.
2. Reuse the existing BlendComposite instances where possible.
3. Fix incorrect alpha computation for multiply mode.
4. Change the alpha computation for all blend modes to compenstate for
the fact that the color filter image that we create extends beyond the
image it is inteded to be applied to.

Change-Id: Iedebf289a23325ee4c6d406dcad46a9edb1855c7
 2015-02-26 15:02:16 -08:00
Andrew Solovay
b5e00e5c3d docs: Documented new IABv5 sub upgrade/downgrade and manual renewal 
Documented new support for users upgrading/downgrading subscriptions
in the middle of a sub period, and for users manually renewing
before the subscription period ends. Also updated testing docs
to reflect that sandbox now supports testing subscriptions, and
documented new "autoRenewing" field in INAPP_PURCHASE_DATA.

See first comment for doc stage location.

bug: 18982828
bug: 18916814
bug: 18951608
bug: 18908756
Change-Id: I530b57d840ed5aeefe4c6a688a2e59aec41ec7d0
 2015-02-26 14:34:48 -08:00
Deepanshu Gupta
d68448a601 Fix codestyle for switch statements. 
Fix intellij's codestyle settings for indenting switch/case statement.

Change-Id: I905231538fef0fcd7fa4e742f937b8da34f2e30f
 2015-02-26 14:32:30 -08:00
Rich Slogar
299366847f am 0a504745: Merge "docs: 9patch tool update" into lmp-docs 
* commit '0a504745b4f63bd9f1d5e40addf50a6e90b8522d':
  docs: 9patch tool update
 2015-02-26 18:08:39 +00:00
Rich Slogar
0a504745b4 Merge "docs: 9patch tool update" into lmp-docs 2015-02-26 18:02:43 +00:00
Rich Slogar
4110463247 am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs 
* commit 'eedf6ad8ce1e15276311a78488e27388f049b4c0':
  docs: remove exploring sdk link
 2015-02-25 23:17:31 +00:00
Rich Slogar
84994e876e am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs 
* commit 'db2ebca7ed10a4d5d943e414a35d4734b9987e91':
  docs: note to install linux packages v2 update
 2015-02-25 23:17:23 +00:00
Rich Slogar
eedf6ad8ce Merge "docs: remove exploring sdk link" into lmp-docs 2015-02-25 23:12:37 +00:00
Rich Slogar
db2ebca7ed Merge "docs: note to install linux packages v2 update" into lmp-docs 2015-02-25 23:11:24 +00:00
Luan Nguyen
43836ac798 docs: Add steps to enable adb debugging on Wear device 
bug: 19425073
Change-Id: Iead63dfe12c5187c5ed8e452fe7e934402ebd056
 2015-02-25 15:09:29 -08:00
Joe Fernandez
c427b721b6 am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs 
* commit '414188262311ec48235095a5dec622b24f7e69ef':
  docs: Android for Work developer landing page
 2015-02-25 07:59:48 +00:00
Joe Fernandez
4141882623 Merge "docs: Android for Work developer landing page" into lmp-docs 2015-02-25 07:52:30 +00:00
Andrew Solovay
790b1bc864 am d3cd0948: docs: New doc for creating an AfW Work Policy Controller 
* commit 'd3cd0948c8c4662c8711433b756c82fbe2f7a3ad':
  docs: New doc for creating an AfW Work Policy Controller
 2015-02-25 07:42:44 +00:00
Andrew Solovay
d3cd0948c8 docs: New doc for creating an AfW Work Policy Controller 
See first comment for doc stage location.

Change-Id: I0c9c0f849c049d33fc66e2bd8ac5ba284c7b9415
 2015-02-24 23:31:41 -08:00
Joe Fernandez
108ccac1a1 docs: Android for Work developer landing page 
Change-Id: I9886e82bd33357c3fc7296859d70c98747d8c14a
 2015-02-24 17:32:30 -08:00
Andrew Solovay
6ffe105846 am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs 
* commit 'a2ae6c9dbffe76bd5bc452fbd85ae92e5e3b9a5c':
  docs: New "implementing app restrictions" doc
 2015-02-25 01:07:25 +00:00
Rich Slogar
69044ae842 docs: note to install linux packages v2 update 
b.android 155803

Change-Id: Ia41c41be82fcbd09c67425ddbd75405eec095834
 2015-02-24 17:01:58 -08:00
Andrew Solovay
a2ae6c9dbf Merge "docs: New "implementing app restrictions" doc" into lmp-docs 2015-02-25 01:01:56 +00:00
Andrew Solovay
79cb98c6ce docs: New "implementing app restrictions" doc 
New doc on app restrictions, aimed primarily at developers of
enterprise apps. See first comment for doc stage location.

Change-Id: I561780d218c78ae0dc4e4e54d925302c718f96ac
 2015-02-24 16:20:27 -08:00
Chris Craik
f2525ed3f4 am ea2a0648: Explain behavior of boundless ripple projection 
* commit 'ea2a0648a85a059f7235fbae69df87ba511832cf':
  Explain behavior of boundless ripple projection
 2015-02-25 00:18:51 +00:00
Chris Craik
ea2a0648a8 Explain behavior of boundless ripple projection 
Change-Id: I27d5c194750313d5d4e0d9dd541f3157b75340ab
 2015-02-25 00:12:38 +00:00
Deepanshu Gupta
68501b87d2 Better error msg for StateList/Hexadecimal Color. 
Throw a better error message when resolving a hexadecimal color value
but the user gave a Color State List. The two are easy to confuse since
the only way to distinguish between the two is to look at the
definition.

Bug: http://b.android.com/70110
Change-Id: Ic78962bd0674a92296a0fdd0de184cfe4d85a8e4
 2015-02-23 12:00:38 -08:00
Rich Slogar
6de010f600 docs: remove exploring sdk link 
b.android 153523

Change-Id: Iaf4de80196d10d686d5a4bde5ffa4169df2810cd
 2015-02-23 11:37:36 -08:00
Deepanshu Gupta
30a67cd17a Merge "Set forceFramework correctly for included layouts." into lmp-dev 2015-02-23 18:56:27 +00:00
David Friedman
ab0f8ff740 am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit '88e0145fb82b6711527ab173e4dc817e3f430708':
  Fixes several typos.
 2015-02-23 18:06:47 +00:00
David Friedman
8e604689c8 am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit '3c26756aefae228941588042d677424b54167aa7':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:06:43 +00:00
David Friedman
88e0145fb8 Merge "Fixes several typos." into lmp-docs 2015-02-23 18:05:36 +00:00
David Friedman
3c26756aef Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 2015-02-23 18:02:26 +00:00
Deepanshu Gupta
33c1c07796 Set forceFramework correctly for included layouts. 
Bug: http://b.android.com/151326
Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4
 2015-02-23 17:26:12 +00:00
Rich Slogar
a91f6d0003 am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs 
* commit '4a99918b40329e7d041db0de1e1863d688eb1b3b':
  docs: android plugin revisions page v2
 2015-02-21 00:51:05 +00:00