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

115838 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
e69b7b3474 am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '46a02249d7bde3fb88cc5312f88dab6d1690e20e':
  Import translations. DO NOT MERGE
 2014-02-20 17:59:45 +00:00
Baligh Uddin
554b43a066 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 17:59:40 +00:00
Baligh Uddin
aa20b27472 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 17:55:33 +00:00
Baligh Uddin
e9adafd1b9 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 17:55:23 +00:00
Baligh Uddin
46a02249d7 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 17:55:13 +00:00
Xavier Ducrohet
55542ee644 am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev 
* commit '3e6370425ea3ac4e5d89ce042512913062212ccc':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-02-20 17:42:58 +00:00
Deepanshu Gupta
e92c8542a5 am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '01825b7aa3c864426c78c08c2f6004a8362c2b47':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-02-20 17:42:54 +00:00
Xavier Ducrohet
3e6370425e Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev 2014-02-20 17:41:08 +00:00
Baligh Uddin
6fb89ba641 Import translations. DO NOT MERGE 
Change-Id: I9accaa37043e730ad6ec4aa98901a48e0858b132
Auto-generated-cl: translation import
 2014-02-19 22:16:02 -08:00
Baligh Uddin
dab7a9ed70 Import translations. DO NOT MERGE 
Change-Id: I0c823200179a75e0444f6e86ecc6813a6e662fa0
Auto-generated-cl: translation import
 2014-02-19 22:08:21 -08:00
Baligh Uddin
b3425a65aa Import translations. DO NOT MERGE 
Change-Id: If9205c555286daf7dea68702d2da39752b59def4
Auto-generated-cl: translation import
 2014-02-19 19:42:43 -08:00
Baligh Uddin
da799ef3a0 Import translations. DO NOT MERGE 
Change-Id: I31e5b7b7aa453a0455fd31eca6a11520730a26a7
Auto-generated-cl: translation import
 2014-02-19 18:54:52 -08:00
Baligh Uddin
69046bb06c Import translations. DO NOT MERGE 
Change-Id: I3003f43c32943496e855ba2744a7492232dbd56b
Auto-generated-cl: translation import
 2014-02-19 18:49:33 -08:00
Baligh Uddin
8807558c32 Import translations. DO NOT MERGE 
Change-Id: I3300523019b91cffd6f36d02434c521ab7368f37
Auto-generated-cl: translation import
 2014-02-19 18:45:30 -08:00
Scott Main
24a8e1d0e9 am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit 'af87e19bdbf6b16240dcdbfd31fe4f33eca4e51d':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 02:17:20 +00:00
Scott Main
af87e19bdb Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 2014-02-20 02:14:40 +00:00
Scott Main
8ad4275640 update intent examples for maps 
bug: 12661490
bug: 12957723

Change-Id: Ice25ef430901b155c00d59402c5f9f50dcb48390
 2014-02-19 18:08:33 -08:00
Deepanshu Gupta
01825b7aa3 Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
For these font families, text was always rendered as italic. This
changeset fixes the issue.

Bug: http://b.android.com/57221
Change-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a
(cherry picked from commit e327212adde1136807bbdf052e8cc3861f8a6aba)
 2014-02-19 20:17:47 +00:00
Deepanshu Gupta
13aea18b34 Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
If a style doesn't specify text style (normal/bold/italic/bold-italic)
then default to normal instead of throwing an error.

Bug: http://b.android.com/61358
Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1
(cherry picked from commit 0acfb16dcd95468fe032204f54618e86becfd1eb)
 2014-02-19 20:17:00 +00:00
Mike Lockwood
c62f918e0e UsbDeviceManager: Fix race condition entering USB accessory mode 
When switching USB modes there are often spurious connect and disconnect events
that occur before reenumeration is complete.  There is currently a 1000ms timer
to "debounce" the disconnect events. But with some USB accessories, this timeout
is not long enough, which results in an endless cycle of attempts to enter
USB accessory mode when the phone is connected.

To fix this, we now wait up to 10 seconds for the host to successfully configure
the device when entering USB accessory mode before giving up.
This is separate from the existing debounce timer, so the behavior of the
USB state change broadcasts are not affected.

Bug: 12877769
Change-Id: I7aa61f8a618546d749a7ddfc97bf103029a73d03
 2014-02-19 11:23:19 -08:00
John Spurlock
998735652d am ba231fca: Fix bad @links in PendingIntent.java 
* commit 'ba231fcabfdf8f8bd72dbb428b8d35ae14a1a14d':
  Fix bad @links in PendingIntent.java
 2014-02-19 13:44:14 +00:00
John Spurlock
ba231fcabf Fix bad @links in PendingIntent.java 
Change-Id: I0a0014e17907f5cf16c3536a99e41efa9dafc963
 2014-02-18 13:19:57 -05:00
Dirk Dougherty
257f67249a am 35cb4e49: Doc change: add new samples TOC groups and landing pages. 
* commit '35cb4e49365a8a8da0607c2659399aaad9ea5a1c':
  Doc change: add new samples TOC groups and landing pages.
 2014-02-13 03:44:38 +00:00
Dirk Dougherty
35cb4e4936 Doc change: add new samples TOC groups and landing pages. 
Change-Id: I2f39e82fb79d4f19362d9fe2deafdde5d87873a7
 2014-02-12 19:38:51 -08:00
Scott Main
d5251a387e add android studio to launch procedures 
Change-Id: Ic0d923478babf3de2b0cb31b26d57884ea886d7b
 2014-02-12 17:14:42 -08:00
Dirk Dougherty
55362018c9 am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 
* commit '271c8f12c88e87563ed17f4ad29610037bd300be':
  Doc change: minor edits to support easier extraction of document summaries.
 2014-02-12 23:30:19 +00:00
Dirk Dougherty
271c8f12c8 Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 2014-02-12 23:20:41 +00:00
Joe Fernandez
3885b00ae1 am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit 'f25bc75f591fbb04733b9cc33fabee2293973b8c':
  MediaRouter Developer Guide
 2014-02-12 23:15:50 +00:00
Joe Fernandez
f25bc75f59 Merge "MediaRouter Developer Guide" into klp-docs 2014-02-12 23:13:01 +00:00
Joe Fernandez
70a2adc817 MediaRouter Developer Guide 
staging: http://joefernandez2.mtv.corp.google.com:8210/guide/topics/media/mediarouter.html

Change-Id: I764828066de8b233e61ad8a5d4a102a4d231fa82
 2014-02-12 14:12:15 -08:00
Ricardo Cervera
36547014a3 am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 
* commit '670944aa7272e95ba3ec02b83b2ae4f38ad577ba':
  docs: Added missing elements in uses-feature. Bug: 12913153
 2014-02-12 21:56:29 +00:00
Ricardo Cervera
bff7db19e3 am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs 
* commit '521a54d0cc5288c4467652f4d773f372eebe970b':
  docs: Added notes for Build Tools Revision 19.0.2
 2014-02-12 21:56:27 +00:00
Ricardo Cervera
566e4df8c3 am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs 
* commit 'ca8757bfc5fd506c647ccd1452c53c6ca4fafb81':
  docs: Added Revision 3 of Google APIs System Image.
 2014-02-12 21:56:24 +00:00
Dirk Dougherty
3155825c25 Doc change: minor edits to support easier extraction of document summaries. 
Change-Id: I1a15a1d233464d6c8d35a741c54932412dea28ee
 2014-02-12 13:31:14 -08:00
Ricardo Cervera
670944aa72 Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 2014-02-12 21:05:32 +00:00
Ricardo Cervera
521a54d0cc Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs 2014-02-12 21:04:40 +00:00
Ricardo Cervera
ca8757bfc5 Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs 2014-02-12 21:04:00 +00:00
Ricardo Cervera
10227d9c37 docs: Added Revision 3 of Google APIs System Image. 
Updated Google Play services version to 4.2.42 too.

Change-Id: I1887414760e91808ed0a2574c24dab3598797f32
Review: http://quixote.mtv.corp.google.com:8003/tools/revisions/platforms.html
 2014-02-12 12:59:46 -08:00
Scott Main
a2739fa795 am a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818 
* commit 'a4c5bba07e121569ab504b2191ee576f09407f5b':
  add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
 2014-02-12 16:59:56 +00:00
Scott Main
a4c5bba07e add document about GoogleApiClient and one about GoogleAuthUtil 
also remove the Authorization document from the Google Services
section.
bug:10679818

Change-Id: Ibfade1eca68d89afe30b79d75ca5e38a2b3a84a8
 2014-02-12 08:54:49 -08:00
Dirk Dougherty
37ae70326f am 1654264e: Update generated docs for Google Play Services. 
* commit '1654264edd68adfd4347d12112aa3124f1d0acb9':
  Update generated docs for Google Play Services.
 2014-02-12 03:13:19 +00:00
Dirk Dougherty
1654264edd Update generated docs for Google Play Services. 
Change-Id: I6dab64736cd07b1ffb398d9baab21250552c5e17
 2014-02-11 18:19:13 -08:00
Scott Main
11bb34da5f am 9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs 
* commit '9854f69f75352e473e34410b0b298b7c7f04434a':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
 2014-02-12 01:12:08 +00:00
Scott Main
9854f69f75 Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page" into klp-docs 2014-02-12 01:09:21 +00:00
Katie McCormick
0a96a82bbe am 0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs 
* commit '0cb2c76b66bb7c413221fc0c5ea07b7779c97dea':
  Doc update: clarify best practices.
 2014-02-11 20:16:26 +00:00
Katie McCormick
0cb2c76b66 Merge "Doc update: clarify best practices." into klp-docs 2014-02-11 20:13:34 +00:00
Katie McCormick
49f93486a9 Doc update: clarify best practices. 
Fix for:

b/12515292

Change-Id: I1616d41c052582ff6c82b87cd0282cf1d25bb84d
 2014-02-10 19:06:17 -08:00
Deepanshu Gupta
1c91b1f7a2 am 45dbfcc7: Improve text rendering and measurement. 
* commit '45dbfcc781a3926d22571b6ccfa3f27ec896f119':
  Improve text rendering and measurement.
 2014-02-10 19:47:20 +00:00
Ricardo Cervera
d038afd398 am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs 
* commit '7074f32440a8d6db4512c82e12b9e1c6891a4ce1':
  docs: Fixed ViewPager animation tutorial. Bug: 12815243
 2014-02-10 17:22:23 +00:00
Ricardo Cervera
7074f32440 Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs 2014-02-10 17:19:28 +00:00