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

153667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quddus Chong
f990241a74 am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs 
* commit 'abde3d83f86af44e2beedc2fc10bfc23a405a5d9':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.
 2015-03-18 23:37:03 +00:00
Quddus Chong
abde3d83f8 Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs 2015-03-18 23:29:44 +00:00
Andrew Solovay
278538193c am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs 
* commit '78bbfe049c5e7a0c2f7ac8fe39f45b11d9099a55':
  docs: Removed sentence fragments.
 2015-03-18 22:35:59 +00:00
Andrew Solovay
6fd36f11be am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit 'ae279bd5b03f472d4bd1427365009269db9fe5e3':
  docs: Fixed typo (spurious quotation mark).
 2015-03-18 22:35:49 +00:00
Andrew Solovay
dbec5ae69a am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit '0aef0abf3d3366c09a89d3132ff2ce5979988fc1':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-18 22:35:45 +00:00
Andrew Solovay
78bbfe049c Merge "docs: Removed sentence fragments." into lmp-docs 2015-03-18 22:27:08 +00:00
Andrew Solovay
ae279bd5b0 Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 2015-03-18 22:26:05 +00:00
Andrew Solovay
0aef0abf3d Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 2015-03-18 22:23:13 +00:00
Andrew Solovay
43100d3203 docs: Removed sentence fragments. 
These fragments were left over from the edit process for the original
CL (http://ag/586972). The paragraph they belong to was removed.

See first comment for doc stage location.

bug: 19793140
Change-Id: Iafa30c4036c57ba00b534d619cd1fa4135f60175
 2015-03-18 11:56:20 -07:00
Rich Slogar
2fc33a008c am ddc44153: docs: downloads for sdk 24.1.2 
* commit 'ddc44153295174e8195286c21d7edcd3962b3661':
  docs: downloads for sdk 24.1.2
 2015-03-18 17:13:55 +00:00
Rich Slogar
ddc4415329 docs: downloads for sdk 24.1.2 
b.android 160727

Change-Id: I112badc736ce4b85fabe0b702a2b24800ee589bd
 2015-03-17 17:20:09 -07:00
Quddus Chong
180b835480 docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785. 
Change-Id: Iea6a787896d22ec29702fc7370d9ad702af051b7
 2015-03-16 15:48:18 -07:00
Deepanshu Gupta
ada8590547 Fix AppCompat action bar theming. 
Use themed context to inflate the action bar when AppCompat is used.
Also fix minor issues exposed as a result.

 - Set project callback when LayoutInflater is created by
   LayoutInflater.from(context).
 - Remove duplication of code to get base context from context wrapper.

Bug: http://b.android.com/159711
Change-Id: I379ba2ba71c0ef547460987c3aa5db521c7de967
 2015-03-16 11:45:00 -07:00
Deepanshu Gupta
2e4d932457 Fix NoActionBar themes rendering. 
Also fix some warnings.

Bug: http://b.android.com/159780
Change-Id: I64fd4259b802722af7a271f51d5943018ed11e9e
 2015-03-13 14:28:14 -07:00
Andrew Solovay
a83fd76089 docs: Fixed typo (spurious quotation mark). 
See first comment for stage location.

bug: 18612085
Change-Id: I4c29a087621d1c62596838d30b2654ee136cecd1
 2015-03-13 13:52:04 -07:00
Andrew Solovay
a8b5b2512f docs: Fixed broken image link, and broke long lines in code samples 
While I had gridview open (per the bug), I also checked the other
files in that directory for broken image links (in case this stemmed
from a doc reorg). I didn't find any broken images, but I did find
a couple of code samples that unnecessarily had horizontal scroll
bars, so I fixed those.

See first comment for doc stage location.

bug: 19611361
Change-Id: I983a09aaee5e2b1747376748c1aa46341c31a3c2
 2015-03-13 12:46:37 -07: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
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
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
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
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
Luan Nguyen
eeb79d104f am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 
* commit '9a7238d8f5bd4ec90c2b887808ea26e5f55d0154':
  Revert "docs: Update auto landing and design page image assets"
 2015-03-11 16:35:32 +00:00
Luan Nguyen
9a7238d8f5 Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 2015-03-11 16:25:33 +00:00
Luan Nguyen
36b8a59a6d Revert "docs: Update auto landing and design page image assets" 
This reverts commit 7859590acd229b66c1953d3d4ed9538261d6b898.

Change-Id: Iab71d4a2ce0eb6dbbab685433a7c991015402e19
 2015-03-11 16:20:52 +00:00
Craig Mautner
60a907e60c Correct docs to specify leading slash in paths. 
The guide documentation for the manifest data element contains a
grammar that implies leading slashes are not required for the path
part of a URI string. Also the path documentation does not mention
the need for a leading slash.

Grammar from documentation:
<scheme>://<host>:<port>/[<path>|<pathPrefix>|<pathPattern>]
                        ^
                        |
Included "/" -----------+

All internal usages of path, pathPrefix, and pathPattern, have a /
starting out the string and these attributes don't work without that
/.

This change updates the grammar and the documentation for the path
attributes.

Fixes bug 19540035

Change-Id: I931a25fd1c10c01eaa32a7cfa82cca256b129efb
 2015-03-10 15:52:35 -07:00
Luan Nguyen
24b4e5729e am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs 
* commit '0fc17c37a514a80073631dffa381ec07caed93cf':
  docs: Update auto landing and design page image assets
 2015-03-10 19:22:37 +00:00
Rich Slogar
08ddf132bf am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
* commit '0c1076b270bd718cab4b89acc96f6cbbbd1e9774':
  docs: eclipse revisions update
 2015-03-10 19:22:33 +00:00
Luan Nguyen
0fc17c37a5 Merge "docs: Update auto landing and design page image assets" into lmp-docs 2015-03-10 19:18:54 +00:00
Rich Slogar
0c1076b270 Merge "docs: eclipse revisions update" into lmp-docs 2015-03-10 19:15:10 +00:00
Rich Slogar
05298d0fd5 docs: eclipse revisions update 
Change-Id: I163f9ef9d8cd0c4e4fe5d7a19b76e239af2ee2d3
 2015-03-10 11:46:49 -07:00
Andrew Solovay
66b4b3179b am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" 
* commit '0a3f9c7dd26ba31e75552db6ec0eb27cb7267c00':
  docs: Revisions to "Providing Messaging for Auto"
 2015-03-10 01:29:29 +00:00
Luan Nguyen
7859590acd docs: Update auto landing and design page image assets 
Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819
 2015-03-09 14:06:33 -07:00
Andrew Solovay
0a3f9c7dd2 docs: Revisions to "Providing Messaging for Auto" 
Added a workflow section and "important classes", and tightened up the
rest of the doc to (hopefully) make it all clearer. See first comment
for doc stage location.

Change-Id: Ifa8db66768a096ae1059ddf17760fee8d74c7c6e
 2015-03-09 12:51:06 -07:00
Rich Slogar
f51020eaaa am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs 
* commit '6e1cbe43957b18f471f82682b5df999578230230':
  docs: android plugin for gradle release 1.1.3 release notes
 2015-03-09 19:34:32 +00:00
Rich Slogar
6e1cbe4395 Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs 2015-03-09 19:29:37 +00:00
Luan Nguyen
2fcc438f76 am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs 
* commit '6a96a77814a89836ba0a85335479c6b3ea9aec33':
  docs: Add new partners to Wear index page
 2015-03-09 14:52:45 +00:00
Luan Nguyen
6a96a77814 Merge "docs: Add new partners to Wear index page" into lmp-docs 2015-03-09 14:47:33 +00:00
Rich Slogar
d5322338d8 docs: android plugin for gradle release 1.1.3 release notes 
Change-Id: If7ee333e83e0be60c864021e068f024694eb3dd1
 2015-03-06 16:17:56 -08:00
Eric Gilmore
beed933206 am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs 
* commit '0bceaacf4221a5b302d12fc085744bb54cbbdd6e':
  Reworking geofencing training to new API and sample.
 2015-03-06 19:20:45 +00:00
Eric Gilmore
0bceaacf42 Merge "Reworking geofencing training to new API and sample." into lmp-docs 2015-03-06 19:14:28 +00:00
Eric Gilmore
a0e3eb7ba2 Reworking geofencing training to new API and sample. 
Change-Id: Ibc9e2561cd93e73eab87a78f4aabe64ae9c8a0b3
 2015-03-06 10:50:59 -08:00
Glenn Kasten
36d008c5ae am 5afdc97f: Fix USB typos 
* commit '5afdc97f2e41845e7ddf512814771d4cdf134171':
  Fix USB typos
 2015-03-06 16:25:58 +00:00
Glenn Kasten
5afdc97f2e Fix USB typos 
Change-Id: Iefa610a81e9155dcfc687c514611bb7dbba5d7f9
(cherry picked from commit 9e86f6139b62dbc87b7ea97cedf847c847657829)
 2015-03-06 16:15:15 +00:00
Eric Gilmore
e17b0a14cc am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs 
* commit '87499b275bc7a8d4a12a3134646769a5c6c34829':
  Re-fixing link, and removing trailing white space.
 2015-03-05 22:34:58 +00:00