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

117124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Williams
d08d6686c5 resolved conflicts for merge of 94b51810 to master 
Change-Id: Ida818f066b66c356a84c80e5eab0a4e2cf4ebd49
 2013-10-14 10:39:41 -07:00
Baligh Uddin
8f7b859a7d Merge "Import translations. DO NOT MERGE" 2013-10-14 16:22:55 +00:00
Baligh Uddin
7d8b77f036 Import translations. DO NOT MERGE 
Change-Id: Ib9ba58f8e1486581d71443234db99a12f925cf0a
Auto-generated-cl: translation import
 2013-10-14 09:17:56 -07:00
Baligh Uddin
7967b0c141 Merge "Import translations. DO NOT MERGE" 2013-10-14 16:15:14 +00:00
Baligh Uddin
11bb67d6c2 Import translations. DO NOT MERGE 
Change-Id: Ib34e81399bfc7c5867fcc060af7d5487485a2855
Auto-generated-cl: translation import
 2013-10-14 09:13:55 -07:00
Baligh Uddin
0da3dea90c Import translations. DO NOT MERGE 
Change-Id: I734c073236b4d50576d962b23f4b50abfccec16e
Auto-generated-cl: translation import
 2013-10-14 09:12:27 -07:00
Narayan Kamath
12b28ce4e8 Fix minor thread corectness issue in NetworkInfo 
Hold the right lock while copying info from another
NetworkInfo object to prevent changes being made to it
while the copy is in progress.

Change-Id: I1aa2c29e81e045b0359f957352c438e79e692823
 2013-10-14 09:07:40 +00:00
Baligh Uddin
849a41a865 Merge "Import translations. DO NOT MERGE" 2013-10-12 00:27:35 +00:00
Baligh Uddin
1f90779654 Merge "Import translations. DO NOT MERGE" 2013-10-12 00:27:02 +00:00
Baligh Uddin
b48966885e Import translations. DO NOT MERGE 
Change-Id: I11e36ca2c03ecbe1a6c99a8cc4f7e4afed3e5427
Auto-generated-cl: translation import
 2013-10-11 16:34:38 -07:00
Baligh Uddin
e9fe9d729e Import translations. DO NOT MERGE 
Change-Id: I82d4f166b346b10babd67f89f3035426e74db7dd
Auto-generated-cl: translation import
 2013-10-11 16:28:01 -07:00
Baligh Uddin
b8087da933 Import translations. DO NOT MERGE 
Change-Id: I289f527bef7c4274b4161d2e90c8aa82dc9608a9
Auto-generated-cl: translation import
 2013-10-11 16:23:01 -07:00
Matthew Williams
94b518101c am e0a2bdaf: am 32551ae5: Merge "Fix infinite boot-loop bug in SM." into klp-dev 
* commit 'e0a2bdaf61a7a72e92d614f81f86e7fd441b38e4':
  Fix infinite boot-loop bug in SM.
 2013-10-11 14:33:18 -07:00
Matthew Williams
e0a2bdaf61 am 32551ae5: Merge "Fix infinite boot-loop bug in SM." into klp-dev 
* commit '32551ae5197744425d3057dc5d449e7943d35ba2':
  Fix infinite boot-loop bug in SM.
 2013-10-11 14:29:30 -07:00
Matthew Williams
32551ae519 Merge "Fix infinite boot-loop bug in SM." into klp-dev 2013-10-11 21:26:19 +00:00
Jean-Michel Trivi
59ff7bd243 am 09872a35: am fb059f3c: am 7a6ccb87: Merge "Remote volume changes" into klp-dev 
* commit '09872a35cb09fc8dbe97d443d083d6c5b0948b90':
  Remote volume changes
 2013-10-11 14:21:10 -07:00
Jean-Michel Trivi
09872a35cb am fb059f3c: am 7a6ccb87: Merge "Remote volume changes" into klp-dev 
* commit 'fb059f3c412733d962f99577f097e91c2badb10e':
  Remote volume changes
 2013-10-11 14:17:43 -07:00
Jean-Michel Trivi
fb059f3c41 am 7a6ccb87: Merge "Remote volume changes" into klp-dev 
* commit '7a6ccb87290f12203e00cbddcffc2fbee35cebd3':
  Remote volume changes
 2013-10-11 14:14:44 -07:00
Jean-Michel Trivi
7a6ccb8729 Merge "Remote volume changes" into klp-dev 2013-10-11 21:12:22 +00:00
Chris Craik
e6931c14ba am 87e127d5: am 1ae78c07: am c2245e1a: Merge "Workaround fading edge incompatibility with alpha modulation" into klp-dev 
* commit '87e127d5a8d095b58c0d433be31ba04ce31aae98':
  Workaround fading edge incompatibility with alpha modulation
 2013-10-11 14:09:54 -07:00
Chris Craik
87e127d5a8 am 1ae78c07: am c2245e1a: Merge "Workaround fading edge incompatibility with alpha modulation" into klp-dev 
* commit '1ae78c07807e0db300f965bf3b0371f3eddc2d15':
  Workaround fading edge incompatibility with alpha modulation
 2013-10-11 14:06:38 -07:00
Svetoslav
1d4a8bf4c4 am 6346a928: am c8c943a9: am 3691dd06: Merge "Print spooler not starting." into klp-dev 
* commit '6346a9285a3a1a45da4cfda26ea6ed454a87114f':
  Print spooler not starting.
 2013-10-11 14:02:49 -07:00
Chris Craik
1ae78c0780 am c2245e1a: Merge "Workaround fading edge incompatibility with alpha modulation" into klp-dev 
* commit 'c2245e1ac7b4419936e9891113d9c1e7ea7d65d4':
  Workaround fading edge incompatibility with alpha modulation
 2013-10-11 14:00:31 -07:00
Svetoslav
6346a9285a am c8c943a9: am 3691dd06: Merge "Print spooler not starting." into klp-dev 
* commit 'c8c943a93044f63e27b725901568dc62a84606a8':
  Print spooler not starting.
 2013-10-11 13:59:39 -07:00
Chris Craik
c2245e1ac7 Merge "Workaround fading edge incompatibility with alpha modulation" into klp-dev 2013-10-11 20:57:34 +00:00
Svetoslav
c8c943a930 am 3691dd06: Merge "Print spooler not starting." into klp-dev 
* commit '3691dd063f297162facebf723ac53831126395b5':
  Print spooler not starting.
 2013-10-11 13:56:59 -07:00
Svetoslav
3691dd063f Merge "Print spooler not starting." into klp-dev 2013-10-11 20:55:01 +00:00
Matthew Williams
632515b9d0 Fix infinite boot-loop bug in SM. 
Bug:11064918
If the ContentResolver sync API is used with the empty ("")
string as a provider, the ContentService will throw an RTE.
This cl addresses all the entry points of the API that could
allow this, as well as adds an ifEmpty check at the point of
failure.
Also removed RTE throws from public functions(no point in
crashing the phone).

Change-Id: I57427d12a6cafb3e6d7a32ca0c10b05315b20580
 2013-10-11 13:18:22 -07:00
Craig Mautner
2ae3a71820 am 6b2a6a11: am b1ce68f5: am 09cb9bdc: Merge "Add test for topmost home stack activity being home." into klp-dev 
* commit '6b2a6a1140d4144c2771dc44fa765268446243d4':
  Add test for topmost home stack activity being home.
 2013-10-11 12:59:58 -07:00
Chris Craik
7bcde5009d Workaround fading edge incompatibility with alpha modulation 
bug:11121809

Fading edges, such as drawn by a scrolling marquee TextView, don't
behave correctly when their view is modulated, as done by the view
system when alpha is set on a view that returns false from
hasOverlappingRendering.

To work around this, always return true from hasOverlappingRendering
if a TextView has horizontal fading edges enabled.

Change-Id: I64c9b8c653aa1d9ca320292306fd24333e3ee225
 2013-10-11 12:55:42 -07:00
Craig Mautner
6b2a6a1140 am b1ce68f5: am 09cb9bdc: Merge "Add test for topmost home stack activity being home." into klp-dev 
* commit 'b1ce68f5a4064d6c57cdc13e4708a0ee6bf5b970':
  Add test for topmost home stack activity being home.
 2013-10-11 12:55:36 -07:00
Scott Main
80fd2d5e43 am 0234285b: am d5786ca0: am 1001cf21: am eae969c1: am 439c4b47: am c0da3f1d: media-formats.html: clarify WebP availability 
* commit '0234285b43e8e899e9b0bcdeb4965d2e3bfdfb05':
  media-formats.html: clarify WebP availability
 2013-10-11 12:55:31 -07:00
Jeff Sharkey
c69cf32252 am 416165f4: am ce05cbc5: am 6e19feb4: Merge "Treat dates near epoch as unknown." into klp-dev 
* commit '416165f4313ac2deea430030ff44d9da0388b8bc':
  Treat dates near epoch as unknown.
 2013-10-11 12:55:26 -07:00
Craig Mautner
d2bb1dd031 am 7bc5cdc0: am 4732660a: am ab3276dd: Merge "Make an exception for screenshot optimization." into klp-dev 
* commit '7bc5cdc0e9ef61438135243db83ab426fa97acae':
  Make an exception for screenshot optimization.
 2013-10-11 12:55:23 -07:00
Craig Mautner
b1ce68f5a4 am 09cb9bdc: Merge "Add test for topmost home stack activity being home." into klp-dev 
* commit '09cb9bdcc8949605e5a26ab50ac73970d1092978':
  Add test for topmost home stack activity being home.
 2013-10-11 12:52:24 -07:00
Scott Main
0234285b43 am d5786ca0: am 1001cf21: am eae969c1: am 439c4b47: am c0da3f1d: media-formats.html: clarify WebP availability 
* commit 'd5786ca0a6773f0aa6dbccbf1f894cccb8c2cfc9':
  media-formats.html: clarify WebP availability
 2013-10-11 12:50:17 -07:00
Jeff Sharkey
416165f431 am ce05cbc5: am 6e19feb4: Merge "Treat dates near epoch as unknown." into klp-dev 
* commit 'ce05cbc5ec52417f1f927be2b3d9b93e0881a4d9':
  Treat dates near epoch as unknown.
 2013-10-11 12:50:12 -07:00
Craig Mautner
7bc5cdc0e9 am 4732660a: am ab3276dd: Merge "Make an exception for screenshot optimization." into klp-dev 
* commit '4732660a50f3373812e8ae55cbda264d469bfded':
  Make an exception for screenshot optimization.
 2013-10-11 12:50:05 -07:00
Craig Mautner
09cb9bdcc8 Merge "Add test for topmost home stack activity being home." into klp-dev 2013-10-11 19:50:03 +00:00
Svetoslav
54adee86af Print spooler not starting. 
1. In my previous change I fixed a typo in the Java constant with
   intent action to launch the print dialog but failed to updated
   the print spooler manifest.

2. Removed dead code - the user id is no longer needed since the
   spooler is an app that runs per user. Every user has its spooler.
   This code was not referenced from anywhere.

3. Added a default icon to the print spooler.

4. Fixed a bug where if the print history is empty the UI goes
   to the all pritners activity.

bug:11059554

Change-Id: If74c23b418a8c67620ba14435ee7f3b2c4527099
 2013-10-11 12:39:47 -07:00
Scott Main
d5786ca0a6 am 1001cf21: am eae969c1: am 439c4b47: am c0da3f1d: media-formats.html: clarify WebP availability 
* commit '1001cf21ed98d7be4485a764eda5b74012bed7b7':
  media-formats.html: clarify WebP availability
 2013-10-11 12:37:53 -07:00
Scott Main
1001cf21ed am eae969c1: am 439c4b47: am c0da3f1d: media-formats.html: clarify WebP availability 
* commit 'eae969c17a6507c6985b5d9be1f6e0523766f6dd':
  media-formats.html: clarify WebP availability
 2013-10-11 12:32:48 -07:00
Scott Main
eae969c17a am 439c4b47: am c0da3f1d: media-formats.html: clarify WebP availability 
* commit '439c4b4783ec9e800e9a6fd6fc38dd393c41b77b':
  media-formats.html: clarify WebP availability
 2013-10-11 12:30:43 -07:00
Scott Main
439c4b4783 am c0da3f1d: media-formats.html: clarify WebP availability 
* commit 'c0da3f1d60f99c3188906d429ed38edbdd934f12':
  media-formats.html: clarify WebP availability
 2013-10-11 12:27:13 -07:00
Jeff Sharkey
ce05cbc5ec am 6e19feb4: Merge "Treat dates near epoch as unknown." into klp-dev 
* commit '6e19feb4f3da02916754636d3ade340dcd5412d5':
  Treat dates near epoch as unknown.
 2013-10-11 12:23:35 -07:00
Jeff Sharkey
6e19feb4f3 Merge "Treat dates near epoch as unknown." into klp-dev 2013-10-11 19:18:51 +00:00
Scott Main
c0da3f1d60 media-formats.html: clarify WebP availability 
Lossless and transparency support were added in JB-MR1

CL copied from https://critique.corp.google.com/#review/53655564

Change-Id: I2c568525ff7c7a540328e41a57b6f16647733e4e
 2013-10-11 12:03:12 -07:00
Craig Mautner
760b2314d9 Add test for topmost home stack activity being home. 
And restarts home if test fails.

Fixes bug 11118615.

Change-Id: I3b6c544d479b467f10febff512798c2db8e32f74
 2013-10-11 11:57:07 -07:00
Craig Mautner
4732660a50 am ab3276dd: Merge "Make an exception for screenshot optimization." into klp-dev 
* commit 'ab3276ddd902b44a81fc6973c5256b6e7e027fd1':
  Make an exception for screenshot optimization.
 2013-10-11 11:45:08 -07:00
Craig Mautner
ab3276ddd9 Merge "Make an exception for screenshot optimization." into klp-dev 2013-10-11 18:41:45 +00:00