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

122571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
97ffe946f1 Import translations. DO NOT MERGE 
Change-Id: I5fab20b0d39b9e396111791a55046a8485f073d9
Auto-generated-cl: translation import
 2014-08-15 12:57:31 -07: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
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
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
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
kmccormick
71f8f1d81f Doc Change: Remove obsolete sample link. 
Fix for:

b/16685592

Change-Id: If15951ee783e8c05b4dfb32983a87a3518cdbe82
 2014-08-12 18:08:58 -07:00
kmccormick
bcdbe1a0fc Merge "Doc Change: remove obsolete links." into klp-modular-docs 2014-08-12 23:14:35 +00:00
kmccormick
cb62407d7a Doc Change: remove obsolete links. 
Fixes for:

b/16494813

Change-Id: I2aaae520cdafadf8707f2fbf38c10588f0de2987
 2014-08-12 17:52:27 -07:00
Quddus Chong
a5365ed9dd am ac605c84: Merge "docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support." into klp-modular-docs 
* commit 'ac605c8488a3092c1451ac29cad35ff2ff9f7f98':
  docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support.
 2014-08-12 22:42:19 +00:00
Quddus Chong
ac605c8488 Merge "docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support." into klp-modular-docs 2014-08-12 20:55:12 +00:00
Quddus Chong
20dad64d03 docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support. 
Change-Id: Ib759f6a187a8a1298d01f8485a8e05e5d9b67e27
 2014-08-12 15:08:05 -07:00
Robert Ly
378b25584f am 41e836a6: Merge "docs: update dashboard" into klp-modular-docs 
* commit '41e836a644b1fa767fdcce629bbb4753e0f5ecd6':
  docs: update dashboard
 2014-08-12 19:45:28 +00:00
Robert Ly
41e836a644 Merge "docs: update dashboard" into klp-modular-docs 2014-08-12 19:21:04 +00:00
Robert Ly
ba5c49dcde docs: update dashboard 
Change-Id: I3a11a4ffbd9e5544c598bdebacd67e236305602f
 2014-08-12 12:26:37 -07:00
Ricardo Cervera
97dbb13647 am 6bb49e4a: Merge "docs: Fixed minor issue with Studio shortcuts" into klp-modular-docs 
* commit '6bb49e4ae629e3740cd3a623fcc115f895f3188c':
  docs: Fixed minor issue with Studio shortcuts
 2014-08-11 15:17:27 +00:00
Ricardo Cervera
6bb49e4ae6 Merge "docs: Fixed minor issue with Studio shortcuts" into klp-modular-docs 2014-08-08 20:34:05 +00:00
Ricardo Cervera
0495f1ef71 docs: Fixed minor issue with Studio shortcuts 
See https://code.google.com/p/android/issues/detail?id=74316
Updated keymap for new files and added note on choosing keymaps.

Change-Id: I3c1e1a8ab0f344040ea2627734f7d5959c842799
 2014-08-08 09:31:13 -07:00
Ricardo Cervera
eab9412b1b am 46baa5ff: Merge "docs: Release notes for ADT 23.0.3" into klp-modular-docs 
* commit '46baa5ff7dadad76fc5503a7c2be6d22eb00da57':
  docs: Release notes for ADT 23.0.3
 2014-08-07 23:17:16 +00:00
Scott Rowe
607c17f99c cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5 
Change-Id: I9838519ad3e0c2fb3957829fc448b1ae6bd1d62b
 2014-08-07 15:54:42 -07:00
Ricardo Cervera
edcf7c5167 Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs 2014-08-06 23:54:36 +00:00
Robert Ly
8e115e6460 Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 2014-08-07 15:00:45 +00:00
Ricardo Cervera
46baa5ff7d Merge "docs: Release notes for ADT 23.0.3" into klp-modular-docs 2014-08-06 23:49:20 +00:00
Ricardo Cervera
e2de5ca8ad docs: Release notes for ADT 23.0.3 
Change-Id: I9e68f4ecaec47b8a139f32773ef9916c3011061b
 2014-08-07 14:49:03 -07:00
Prashant Malani
fed4a5565b Merge "Move wakelock release to handleMessage" into klp-modular-dev 2014-08-06 23:49:20 +00:00
Robert Ly
a1c9af2438 am 6f273458: Merge "docs: remove "developer preview" and point to Android-specific doc" into klp-modular-docs 
* commit '6f273458fb9de10e07f5876e85f9f80592bf52b2':
  docs: remove "developer preview" and point to Android-specific doc
 2014-08-07 21:59:43 +00:00
Ricardo Cervera
35b08bacc4 am edcf7c51: Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs 
* commit 'edcf7c51676e3b4d0481dcdc9c2e128f7f4f2e5d':
  docs: Simplify and update the Signing page. Bug: 16296405
 2014-08-07 16:03:27 +00:00
Robert Ly
23daa44107 am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 
* commit '8e115e6460f5bfe5e682dda6e816b9d8c84bc525':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
 2014-08-07 15:55:10 +00:00
Prashant Malani
7450614a49 Move wakelock release to handleMessage 
There were certain code paths in handleDockStateChange() that were
exiting without releasing the wakelock. So we move the release to the
calling function to prevent stray held wakelocks.

Bug: 16841895

Change-Id: I8ae4d2ab8f775c42a893d3bcdef34321c5f631a6
Signed-off-by: Prashant Malani <pmalani@google.com>
 2014-08-06 22:22:18 -07:00
Robert Ly
6f273458fb Merge "docs: remove "developer preview" and point to Android-specific doc" into klp-modular-docs 2014-08-06 23:49:20 +00:00
Deepanshu Gupta
6ebeefa04c am 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '904d77118bab63139174470ef728ca9a53e75a15':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:51:47 +00:00
Deepanshu Gupta
904d77118b am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '7b561be3a6fedebfce412cecd8c36d6686f6576c':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:45:23 +00:00
Deepanshu Gupta
7b561be3a6 am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '09c3c2edb2391d3ffed9a07ec360b9f75b9f7637':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:37:10 +00:00
Deepanshu Gupta
09c3c2edb2 am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit 'ba31d628621f3d49195d141dabff30a7665f3b50':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:30:06 +00:00
Deepanshu Gupta
ba31d62862 am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit 'db94ea9ed03dbaa0ca075a433a986d7e414e8f8d':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:25:50 +00:00
Deepanshu Gupta
db94ea9ed0 am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit 'f970d2c201649843b8d51d094b865f16b15bc0bc':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:21:54 +00:00
Deepanshu Gupta
f970d2c201 am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '79c3f678d21f6b3c058623217cbe5dd57a553fe8':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:18:04 +00:00
Deepanshu Gupta
79c3f678d2 am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '206c691bfdb3a6b78d35c7481365980dd387b8c9':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:13:18 +00:00
Deepanshu Gupta
206c691bfd am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '72cf03a27a73e91d4a3eabf74e0384b310f4a5b2':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:09:13 +00:00
Deepanshu Gupta
72cf03a27a am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '3a544a81b3d2d529b2995f4b5db2077760d440b5':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:05:38 +00:00
Deepanshu Gupta
3a544a81b3 resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
Change-Id: I1ea220e3e0a81880db68abab87beab56dc4a336c
 2014-08-06 15:00:14 -07:00
Deepanshu Gupta
a232a68d4c resolved conflicts for merge of 5476cfee to jb-mr1-dev 
Change-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4
 2014-08-06 14:41:02 -07:00
Deepanshu Gupta
5476cfee6b am 505c675c: Fix SystemProperties in LayoutLib. 
* commit '505c675c3a536ac7c6ad264eb62542537532119c':
  Fix SystemProperties in LayoutLib.
 2014-08-06 21:28:24 +00:00