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

119289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
bf2226ec7f am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8b297fb6ef42650a1126287aa0b610aa9a503167':
  Import translations. DO NOT MERGE
 2014-02-20 18:06:21 +00:00
Baligh Uddin
699991c8a2 am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '08394af265b02db7a76c4f4f4ae16b9d238e7580':
  Import translations. DO NOT MERGE
 2014-02-20 18:06:17 +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
9edf7a1159 am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev 
* commit '2cb9147fc49e6474eaf30fd833e43df10e42b899':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-02-20 17:49:32 +00:00
Deepanshu Gupta
65521c3cf1 am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit 'ca4b9a77e7d20703287b33b203b2582bd43f7792':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-02-20 17:49:27 +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
Justin Koh
744d3473f8 Merge "Add hardware feature describing a watch." into klp-modular-dev 2014-02-20 17:38:03 +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
d43ad2f35a am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit '4c68c4ed463f7f83d05f86ed11046195829028ed':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 02:23:52 +00: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
Adam Lesinski
4b07b26e86 Merge "Make UsbService optional" into klp-modular-dev 2014-02-19 19:38:34 +00:00
Adam Lesinski
6feaa267a5 Merge "Add fastpath for single signature comparison" into klp-modular-dev 2014-02-19 19:38:17 +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
469301f7ed am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.java 
* commit '9dd87081e4bea9cd48db35fa82b3adeda37a34b5':
  Fix bad @links in PendingIntent.java
 2014-02-19 13:51: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
Justin Koh
b5731f091c Add hardware feature describing a watch. 
Add hardware feature describing a watch so that hardware can specify that
it is a device that is worn on the body (perhaps the wrist).

Change-Id: I9d4cb7e86067f6ad41b39bcc545222b3b0fbf890
 2014-02-18 18:12:24 -08:00
Craig Mautner
71dd1b6343 Set the new SurfaceControl opaque flag. 
Converts surfaces from transparent to opaque and opaque to transparent
without creating a new surface. Uses the new SurfaceControl.setOpaque
method.

Fixes bug 12387406.

Change-Id: I669c064e622e211b00b1585183a488d5b3f4b778
 2014-02-18 15:59:23 -08:00
Craig Mautner
db0f3e825f Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev 2014-02-18 23:56:53 +00:00
Andy McFadden
4f0a80d0b8 Allow "opaque" flag to be updated. DO NOT MERGE 
Added a setOpaque() call and a bunch of comments.

Bug 12387406

Change-Id: Ic066cba926223f22f9bc56a7013987001d9cc795
 2014-02-18 15:54:24 -08:00
Adam Lesinski
f5b3a01e54 Add fastpath for single signature comparison 
PackageManager does not need to create a hash set
when comparing two sets of signatures, where each set
contains one signature. This is the common case for
most applications.

Bug:13029313
Change-Id: I61883d85960db7b376e234d7abae6149c4d20245
 2014-02-18 15:31:41 -08:00
Adam Lesinski
2cb6c60c0d Make UsbService optional 
Tweaked the services Android.mk to build dependencies
when building with mm[m].

Change-Id: I6dad511c652bcacc085f27ede5f8f22a6982c6bd
 2014-02-18 14:57:09 -08:00
Adam Lesinski
3d9bcb90ee Create FEATURE_ constants for print and backup 
Bug:13079822

Change-Id: I6f4b759951d45989e8aad4011fae431ee2ecae0c
 2014-02-18 14:33:00 -08:00
Hui Lu
a24bec32bd Reconnect/teardown proxy network connectivity. 
Change-Id: I9bf6f96883a2151fceef788e65d9a767d0f52c69
 2014-02-18 16:52:36 -05:00
John Spurlock
ba231fcabf Fix bad @links in PendingIntent.java 
Change-Id: I0a0014e17907f5cf16c3536a99e41efa9dafc963
 2014-02-18 13:19:57 -05:00
Jeff Brown
3048191b4c Remove onCreate() method that should not be there. 
Change-Id: I8355dd78f910afa9895d2fa00cb627a0885d9eec
 2014-02-13 23:26:59 -08:00