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

125453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Hall
87978406b4 am df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL 
* commit 'df7af46a4c034410dd1544415c3dcf19edef82e3':
  VirtualDisplayAdapter: Set the transaction surface even if NULL
 2014-08-19 16:31:17 +00:00
Jesse Hall
df7af46a4c VirtualDisplayAdapter: Set the transaction surface even if NULL 
Bug: 17116728
Change-Id: I55e4a2e575cfd3788fbdb90b050dac486976c1b6
 2014-08-19 09:18:40 -07:00
Andrew Solovay
eb60d0f193 am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit '94174ff788cc6a4f79e2026d7d0995f75246a2de':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-18 21:19:37 +00:00
Andrew Solovay
94174ff788 am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit '8319455afca3dc4c8f799d7752dfa44780cf8855':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-18 21:08:17 +00:00
Ricardo Cervera
cce5036cb0 am 88a1f40c: am fb1f5bde: docs: Removing radio from music intents 
* commit '88a1f40c5d6111c74feb8e3022ffdccbf489a2e4':
  docs: Removing radio from music intents
 2014-08-18 19:38:16 +00:00
Ricardo Cervera
88a1f40c5d am fb1f5bde: docs: Removing radio from music intents 
* commit 'fb1f5bdef03844547152f921dcaa044269b5a0cb':
  docs: Removing radio from music intents
 2014-08-18 19:28:02 +00:00
Ricardo Cervera
fb1f5bdef0 docs: Removing radio from music intents 
Change-Id: Iaf645d692b247994dd8c12835c387ff296b26019
 2014-08-18 12:13:04 -07:00
Ricardo Cervera
f960409f3b am 72ca94ee: am d0842384: docs: Updated links for Android Studio 0.8.6 
* commit '72ca94ee29c71541b7628c44f44ef5cddff9a6e9':
  docs: Updated links for Android Studio 0.8.6
 2014-08-18 16:49:18 +00:00
Ricardo Cervera
72ca94ee29 am d0842384: docs: Updated links for Android Studio 0.8.6 
* commit 'd0842384cb9d6a19f129434457c88de64f2b0b06':
  docs: Updated links for Android Studio 0.8.6
 2014-08-18 16:40:01 +00:00
Ricardo Cervera
d0842384cb docs: Updated links for Android Studio 0.8.6 
Change-Id: Ic01263930b94232445704c03854414bd07ca4c33
 2014-08-18 09:03:59 -07:00
Deepanshu Gupta
da9baa15bf am d519f742: am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK 
* commit 'd519f7424fd2faad371e7678b3dc11114fa5222f':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-16 06:04:07 +00:00
Deepanshu Gupta
d519f7424f am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK 
* commit 'b6c923a2dfd86eb56a8f83d5a27f21996331e436':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-16 05:53:49 +00:00
Deepanshu Gupta
b6c923a2df am 59eedf52: Layoutlib: Update wifi and battery icon for KK 
* commit '59eedf528ca29a32b6d7f358f5076929f8fbb164':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-16 05:45:42 +00:00
Andrew Solovay
8319455afc Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 2014-08-16 04:01:11 +00:00
Deepanshu Gupta
a4ceb9e64c am 32faabbe: Layoutlib: Update wifi and battery icon for KK 
* commit '32faabbe14252397b35516caa9c0d0245bfcc719':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-16 02:23:56 +00:00
Deepanshu Gupta
32faabbe14 Layoutlib: Update wifi and battery icon for KK 
Change-Id: Ic5c80e83366bb7672049a6bf726d11cf6717f400
(cherry picked from commit 59eedf528ca29a32b6d7f358f5076929f8fbb164)
 2014-08-16 01:11:26 +00:00
Deepanshu Gupta
59eedf528c Layoutlib: Update wifi and battery icon for KK 
Change-Id: Ic5c80e83366bb7672049a6bf726d11cf6717f400
 2014-08-15 18:03:43 -07:00
Baligh Uddin
7969be0bb8 am 5c7015d7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '5c7015d764e55d60100670fad5d3c0ca40adebf5':
  Import translations. DO NOT MERGE
 2014-08-15 22:35:51 +00:00
Baligh Uddin
fc5f24d874 am db511f23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'db511f2372fb542baa83838d9552d249a8c2f164':
  Import translations. DO NOT MERGE
 2014-08-15 22:35:47 +00:00
Baligh Uddin
bd42c307c4 am e2541778: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'e2541778bfe330449612c02661257318f69916bd':
  Import translations. DO NOT MERGE
 2014-08-15 22:35:43 +00:00
Baligh Uddin
0039271391 am a519df6a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'a519df6a42ed2937544b7a0e8aa831507fe3c09e':
  Import translations. DO NOT MERGE
 2014-08-15 22:35:39 +00:00
Baligh Uddin
5b63492976 am 3f374ac1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '3f374ac15c99468abee39489c23dfa3f571689b1':
  Import translations. DO NOT MERGE
 2014-08-15 22:35:35 +00:00
Baligh Uddin
129ad0e15b am ad6b1426: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'ad6b1426f3cc912c2a30b59270a4b9c38fd7d3c6':
  Import translations. DO NOT MERGE
 2014-08-15 22:20:17 +00:00
Baligh Uddin
062feaf395 am 2f53238f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '2f53238fe440d8615d8874e2fb23535c29b47aec':
  Import translations. DO NOT MERGE
 2014-08-15 22:20:13 +00:00
Baligh Uddin
b2df3e40d5 am 97ffe946: (-s ours) Import translations. DO NOT MERGE 
* commit '97ffe946f1e9aa961e3278f84b344a4a93b02210':
  Import translations. DO NOT MERGE
 2014-08-15 22:20:09 +00:00
Baligh Uddin
97ffe946f1 Import translations. DO NOT MERGE 
Change-Id: I5fab20b0d39b9e396111791a55046a8485f073d9
Auto-generated-cl: translation import
 2014-08-15 12:57:31 -07:00
Baligh Uddin
5c7015d764 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-08-15 18:58:28 +00:00
Baligh Uddin
e23e034927 Import translations. DO NOT MERGE 
Change-Id: If5eb069144f64cf69d3ddcbd88889d1246454569
Auto-generated-cl: translation import
 2014-08-15 13:27:39 -07:00
Baligh Uddin
db511f2372 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-08-15 18:58:28 +00:00
Baligh Uddin
402fc0e1e3 Import translations. DO NOT MERGE 
Change-Id: I94dbc9375f9a15c97f12401af60a6c81e66de121
Auto-generated-cl: translation import
 2014-08-15 13:28:46 -07:00
Baligh Uddin
e2541778bf Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-08-15 18:58:28 +00:00
Baligh Uddin
59f7f946e2 Import translations. DO NOT MERGE 
Change-Id: I6d810b2fcb9d8c57a8295b5ce1c09e12ce8e0184
Auto-generated-cl: translation import
 2014-08-15 13:34:28 -07:00
Baligh Uddin
a519df6a42 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-08-15 18:58:28 +00:00
Baligh Uddin
9215c1bc03 Import translations. DO NOT MERGE 
Change-Id: I7e2a571e43209bd9e7e70d31b3a6f013863f9063
Auto-generated-cl: translation import
 2014-08-15 13:36:47 -07:00
Baligh Uddin
3f374ac15c Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-08-15 18:51:08 +00:00
Baligh Uddin
3157fd7cac Import translations. DO NOT MERGE 
Change-Id: I88f939f51003a025d090c9986b048305e35731ae
Auto-generated-cl: translation import
 2014-08-15 13:37:46 -07:00
Baligh Uddin
ad6b1426f3 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-08-15 18:48:25 +00:00
Baligh Uddin
f28012ecda Import translations. DO NOT MERGE 
Change-Id: I48f1cf9f9f70a4c55824e11179d9aba227dbfa70
Auto-generated-cl: translation import
 2014-08-15 12:52:49 -07:00
Baligh Uddin
2f53238fe4 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-08-15 18:48:25 +00:00
Baligh Uddin
d87180a699 Import translations. DO NOT MERGE 
Change-Id: If3392df7c8c0f86bc7c70a4cbdc452832703732a
Auto-generated-cl: translation import
 2014-08-15 12:54:24 -07:00
Andrew Solovay
7f09366b6a docs: Documented new fields returned by getSkuDetails(). 
Per bug b/9221265, documented new price_amount_micros and
price_currency_code fields.

Doc is staged to:

http://asolovay.mtv:9265/google/play/billing/billing_reference.html#getSkuDetails

bug: 9221265
Change-Id: I06798692b3329e5e0d1fe3aaf215d9c97f2363c0
 2014-08-13 17:38:47 -07:00
Andrew Solovay
48ec6673c6 docs: Fixed error in code sample. 
The code sample for GooglePlayServicesUtil.getErrorDialog had an
error, per bug report from the community. Staged the fixed doc to

http://asolovay.mtv:9860/training/location/retrieve-current.html#CheckServices

Aron, it looks like you've edited GooglePlayServicesUtil.java so I
hoped you could give it a +1. If not you, can you suggest someone?

bug: 17009860
Change-Id: Id5cbf13d2b771cfe168f1b4cb1abd5e339f1ac60
 2014-08-13 15:15:33 -07:00
kmccormick
7b708ec317 am 0672ea6f: am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs 
* commit '0672ea6f3f9f5a8dfcea75b405eb83057746e4e9':
  Doc Change: Remove obsolete sample link.
 2014-08-13 18:50:43 +00:00
kmccormick
0672ea6f3f am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs 
* commit 'a0197180e76bad29a4b6eaed5c43cd922bc1803d':
  Doc Change: Remove obsolete sample link.
 2014-08-13 18:43:20 +00:00
kmccormick
919176239f am 37bdcbbb: am bcdbe1a0: Merge "Doc Change: remove obsolete links." into klp-modular-docs 
* commit '37bdcbbba2db31f0efb8aa900ba7ce81a710e08c':
  Doc Change: remove obsolete links.
 2014-08-13 17:09:15 +00:00
kmccormick
37bdcbbba2 am bcdbe1a0: Merge "Doc Change: remove obsolete links." into klp-modular-docs 
* commit 'bcdbe1a0fcb9c24cdc4ee402f29f279ef2b9e7fa':
  Doc Change: remove obsolete links.
 2014-08-13 17:05:01 +00:00
Robert Ly
84f00277b1 am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs 
* commit '9ada140fc1a8cb6dabc0b0951249cb7a46578c37':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
 2014-08-13 16:12:37 +00:00
Robert Ly
9ada140fc1 am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs 
* commit 'efbbb18241c8b74a2813b48af2aeff8f03fbe8e7':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
 2014-08-13 16:07:40 +00:00
Robert Ly
efbbb18241 Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs 2014-08-12 23:14:48 +00:00
kmccormick
a0197180e7 Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs 2014-08-12 23:14:35 +00:00