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

118587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
2f5347ee46 am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '1af20cc5764a38d0713a292fd63bf6a628f2f5eb':
  Import translations. DO NOT MERGE
 2014-02-20 18:07:02 +00:00
Baligh Uddin
1af20cc576 am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '554b43a066b6a084dbb9b7dba014de4b12ba1175':
  Import translations. DO NOT MERGE
 2014-02-20 18:03:38 +00:00
Baligh Uddin
5da96060e6 am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f887a67dbd1fd22c16cadc58b8f23bfd4eeba4ef':
  Import translations. DO NOT MERGE
 2014-02-20 18:03:07 +00:00
Baligh Uddin
8b297fb6ef am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8027100fdb13c046838f9af12ef7bf2bc3ad511f':
  Import translations. DO NOT MERGE
 2014-02-20 18:03:05 +00:00
Baligh Uddin
08394af265 am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e69b7b3474c356438fbd65e43438e72ebda0bacb':
  Import translations. DO NOT MERGE
 2014-02-20 18:03:02 +00:00
Baligh Uddin
f887a67dbd am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'aa20b27472552ebc812dfbb3cbe260115ee43db1':
  Import translations. DO NOT MERGE
 2014-02-20 17:59:50 +00:00
Baligh Uddin
8027100fdb am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e9adafd1b95a7934bb813cb168e33a85a762a504':
  Import translations. DO NOT MERGE
 2014-02-20 17:59:47 +00:00
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
2cb9147fc4 am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev 
* commit '55542ee6449bd580f61bc005726b5c87773fbe25':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-02-20 17:46:05 +00:00
Deepanshu Gupta
ca4b9a77e7 am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit 'e92c8542a5cf1160a1b701b9f176af64ba46d68d':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-02-20 17:46:02 +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
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
4c68c4ed46 am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit '24a8e1d0e9a32c571403bfc730ce18dd138a529c':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 02:20:30 +00: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
John Spurlock
9dd87081e4 am 99873565: am ba231fca: Fix bad @links in PendingIntent.java 
* commit '998735652d2449e3ccbac7686b71bf40dca06e94':
  Fix bad @links in PendingIntent.java
 2014-02-19 13:47:52 +00: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
9c50271dc3 am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages. 
* commit '257f67249afb017c9a3d0a79e545da567aa5bd02':
  Doc change: add new samples TOC groups and landing pages.
 2014-02-13 03:47:02 +00: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
Dirk Dougherty
acec746b89 am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 
* commit '55362018c9dfadff5eb1a138a1d90187110c253e':
  Doc change: minor edits to support easier extraction of document summaries.
 2014-02-12 23:34:35 +00: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
5b97ec6fa0 am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit '3885b00ae12df9f56e922ceda12326e922be1414':
  MediaRouter Developer Guide
 2014-02-12 23:19:10 +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
640e0c89c3 am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 
* commit '36547014a3fa62e966739e12ccd31634b17058e9':
  docs: Added missing elements in uses-feature. Bug: 12913153
 2014-02-12 21:59:39 +00:00
Ricardo Cervera
58305f88fd am bff7db19: am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs 
* commit 'bff7db19e3bbd2997490beec671b52e4e925c0a5':
  docs: Added notes for Build Tools Revision 19.0.2
 2014-02-12 21:59:36 +00:00
Ricardo Cervera
ac74a5245b am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs 
* commit '566e4df8c3ff66fae6c343524272d332510e26f4':
  docs: Added Revision 3 of Google APIs System Image.
 2014-02-12 21:59:33 +00: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