79797 Commits

Author SHA1 Message Date
Junichi Monma
514bdc3b6e Replace AndroidEmoji.ttf for UI optimization
Bug: 6785630
Change-Id: Ie236c59704138263831930e3682a7ee9ac2f84b1
2012-07-11 10:06:56 +09:00
Raph Levien
00139b2238 Merge "Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE" into jb-dev 2012-07-10 18:05:12 -07:00
Daniel Sandler
25a916d6bc Remove gradients from navbar glow highlights.
Should reduce unsightly banding.

Bug: 6789484
Change-Id: I1bd552d571651ff614a867c2e52b8532b6e22749
2012-07-10 21:01:55 -04:00
Yu Shan Emily Lau
413b5c19a6 am 10366b93: Merge "Remove the unnecssary intent call." into jb-dev
* commit '10366b93157718ed8621f5af087e7a771191b41a':
  Remove the unnecssary intent call.
2012-07-10 16:49:31 -07:00
Yu Shan Emily Lau
10366b9315 Merge "Remove the unnecssary intent call." into jb-dev 2012-07-10 16:47:09 -07:00
Yu Shan Emily Lau
e60393ae71 Remove the unnecssary intent call.
Change-Id: Ia0a460ca8532ccb2f4b0f0205d192b1ba907b5b6
2012-07-10 16:45:38 -07:00
Wink Saville
1408b9c5b3 am d2246930: Merge "Preserve retryCount when retrying." into jb-dev
* commit 'd22469302707d87ee56d7a30dd8b38e671ee0179':
  Preserve retryCount when retrying.
2012-07-10 16:40:09 -07:00
Wink Saville
8461680fab am e87c71f8: Merge "When reconnecting disassociate dc and apnContext." into jb-dev
* commit 'e87c71f8c1db547831e8f91be765a6eecee27342':
  When reconnecting disassociate dc and apnContext.
2012-07-10 16:40:01 -07:00
Wink Saville
d224693027 Merge "Preserve retryCount when retrying." into jb-dev 2012-07-10 16:38:44 -07:00
Wink Saville
e87c71f8c1 Merge "When reconnecting disassociate dc and apnContext." into jb-dev 2012-07-10 16:38:09 -07:00
Fabrice Di Meglio
8e136f85f7 Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE
The mPos field in the MeasuredText object is relative to the start of
the text (mTextStart), but the pos passed in by the caller of the
setPos() method is relative to the character sequence. When spans
overlap break boundaries and the paragraph doesn't start at 0, the
result is an out of bounds error. This fix uses the correct offset.

Change-Id: I64ef06df0eb06f75aedd25de97e9f347eeb52979
2012-07-10 14:30:45 -07:00
Katie McCormick
585228d33b am 2a17520f: Merge "Doc update: GCM doc cleanup." into jb-dev
* commit '2a17520fbaf2ca38c04702bacfe443d7a24b4b91':
  Doc update: GCM doc cleanup.
2012-07-10 14:30:15 -07:00
Katie McCormick
2a17520fba Merge "Doc update: GCM doc cleanup." into jb-dev 2012-07-10 14:27:42 -07:00
Katie McCormick
7cd6dcd2f8 Doc update: GCM doc cleanup.
Change-Id: Ie84a6ebdd12a05c8dbe1fff97539aea90c93554c
2012-07-10 14:07:08 -07:00
Romain Guy
6d2999a048 am 90752485: Properly resize paletted bitmaps when adjusting for density
* commit '907524851af0d656ba049311f7535a4ba5d2b1d2':
  Properly resize paletted bitmaps when adjusting for density
2012-07-10 13:26:49 -07:00
Romain Guy
907524851a Properly resize paletted bitmaps when adjusting for density
If an app used a GIF file in the wrong density bucket, the auto-scaling
code would not properly resize the bitmap.

This issue affects third party applications, here is the external bug
report:

http://code.google.com/p/android/issues/detail?id=34619

DO NOT MERGE

Change-Id: I7f99b28ad6e6c28bdbcb29bbbadcb215268ff710
2012-07-10 13:16:46 -07:00
Xavier Ducrohet
54a18ef7ad Replace LruCache implementation for layoutlib. do not merge.
The android version depends on a custom version of LinkedHashMap
which is not present on desktop VMs. This new implementation is done
in a way that minimizes the difference between the two.

Also some minor fixes.

(cherry picked from commit 01b6c755dbcf24e71192dc44757e2eea2a426091)

Change-Id: Idc7bca820e472e281a3024a5b610fd55606cf428
2012-07-10 12:51:30 -07:00
Ying Wang
b8c5df8562 am 40a4ab13: Import translations. DO NOT MERGE
* commit '40a4ab130a3e3c99afb1a57e9aa30de03a89b51e':
  Import translations. DO NOT MERGE
2012-07-10 12:36:11 -07:00
Ying Wang
40a4ab130a Import translations. DO NOT MERGE
Change-Id: I8e0e293c98a3659ef6e9a07c3a62e0056f5ea4cb
Auto-generated-cl: translation import
2012-07-10 12:15:26 -07:00
Adam Powell
b0f356579e am 1ab2edbc: Merge "Fix bug in parsing attributes for MediaRouteButton" into jb-dev
* commit '1ab2edbcff94d53856a87010e35ffa50ce4c0502':
  Fix bug in parsing attributes for MediaRouteButton
2012-07-09 14:15:56 -07:00
Adam Powell
1ab2edbcff Merge "Fix bug in parsing attributes for MediaRouteButton" into jb-dev 2012-07-09 14:13:54 -07:00
Romain Guy
13a3a87fa7 am dc99555d: Merge "Pass SearchView suggestion cursor exception to Log."
* commit 'dc99555d61d50820b398096bb774ee56b2500476':
  Pass SearchView suggestion cursor exception to Log.
2012-07-06 23:52:55 -07:00
Romain Guy
dc99555d61 Merge "Pass SearchView suggestion cursor exception to Log." 2012-07-06 23:18:19 -07:00
Jake Wharton
73af451694 Pass SearchView suggestion cursor exception to Log.
When an error in fetching a column occurs in your suggestions cursor
adapter this will ensure the stacktrace is logged to provide more
context about what failed.

Change-Id: Iafe4918caebb9b0fb712b758b2d3ace329fd2512
2012-07-06 23:15:49 -07:00
Scott Main
d5f7d9b59d am 15796e52: Merge "docs: add largeHeap attribute to app manifest doc external issue 33967" into jb-dev
* commit '15796e52df1626ae27a6a88c6e905fd3b80868c9':
  docs: add largeHeap attribute to app manifest doc external issue 33967
2012-07-03 19:41:56 -07:00
Scott Main
15796e52df Merge "docs: add largeHeap attribute to app manifest doc external issue 33967" into jb-dev 2012-07-03 19:39:26 -07:00
Scott Main
31f38d692c am e469e74f: docs: new sitemap text file
* commit 'e469e74fd339efcfe88b56780f4380b0d1dd2ce8':
  docs: new sitemap text file
2012-07-03 19:32:42 -07:00
Scott Main
e469e74fd3 docs: new sitemap text file
Change-Id: Ia28407054216997126873bb855d55c9caeeb05b4
2012-07-03 19:29:45 -07:00
Scott Main
01e1b832d7 docs: add largeHeap attribute to app manifest doc
external issue 33967

Change-Id: I69e5d3da78098842c4710708f4d389637dd0fe6b
2012-07-03 18:21:00 -07:00
Scott Main
480785dabb am fd516987: docs: misc bugs from external tracker
* commit 'fd516987de29a48425da5ee5aace5be40adcc674':
  docs: misc bugs from external tracker
2012-07-03 18:15:19 -07:00
Scott Main
fd516987de docs: misc bugs from external tracker
Change-Id: I02d0d82c220401ac3a1ca180e8331a0f6dcd9e50
2012-07-03 18:08:19 -07:00
Scott Main
7b5488d85d am 099fd80f: docs: add throws notice for isPlaying per external issue 33610
* commit '099fd80f984b8493de58bdda8ea05563261b0af2':
  docs: add throws notice for isPlaying per external issue 33610
2012-07-03 17:39:25 -07:00
Scott Main
099fd80f98 docs: add throws notice for isPlaying
per external issue 33610

Change-Id: Ibd778cb4ecc5f1717fa007ac069a7b3660ec4794
2012-07-03 17:32:23 -07:00
Joe Malin
33715d1434 am 4c633ea6: Merge "DOC CHANGE: AOSP33968 Typo" into jb-dev
* commit '4c633ea6f28711d168f690f7443c9523451bdbab':
  DOC CHANGE: AOSP33968 Typo
2012-07-03 15:15:59 -07:00
Joe Malin
4c633ea6f2 Merge "DOC CHANGE: AOSP33968 Typo" into jb-dev 2012-07-03 15:12:46 -07:00
Joe Malin
fd29e8a58f DOC CHANGE: AOSP33968 Typo
Change-Id: I05de2666db6074c84caf540658aad96e6a4805d5
2012-07-03 14:34:16 -07:00
Joe Malin
14f84873c5 am 8d5efa6a: Merge "DOC CHANGE: AOSP 33831 - Typo" into jb-dev
* commit '8d5efa6a8c68f53198b35d01ce64857ae1bf7946':
  DOC CHANGE: AOSP 33831 - Typo
2012-07-03 14:27:28 -07:00
Joe Malin
8d5efa6a8c Merge "DOC CHANGE: AOSP 33831 - Typo" into jb-dev 2012-07-03 14:24:26 -07:00
Scott Main
da4b6db999 am 8ab2dfb2: Merge "docs: fix urls on homepage for offline docs" into jb-dev
* commit '8ab2dfb293133fa0033a1df9bcf7efb926b421d0':
  docs: fix urls on homepage for offline docs
2012-07-03 14:12:27 -07:00
The Android Open Source Project
7e2f39043d Reconcile with jb-release
Change-Id: I2bd087f75ee99d101e38d0e7b62d0aa701283107
2012-07-03 14:09:24 -07:00
Scott Main
8ab2dfb293 Merge "docs: fix urls on homepage for offline docs" into jb-dev 2012-07-03 14:09:17 -07:00
Joe Malin
67970e8aa0 DOC CHANGE: AOSP 33831 - Typo
Change-Id: I394fd5394baf9615463533157e06699478460ceb
2012-07-03 13:54:29 -07:00
Scott Main
88eee9972e docs: fix urls on homepage for offline docs
Change-Id: Ifa1da094ee6482c7324ec5a8b50d245d505390b9
2012-07-03 13:19:45 -07:00
The Android Automerger
c292a619c7 merge in jb-release history after reset to jb-dev 2012-07-03 12:53:52 -07:00
Daniel Sandler
97270ce8ce am 5d0c689b: Merge "Logs to track bug 6765842." into jb-dev
* commit '5d0c689b9b98be1b9be4d535ddb6f73142fd9b25':
  Logs to track bug 6765842.
2012-07-03 12:12:35 -07:00
The Android Open Source Project
1a4f71b2d4 Reconcile with jb-release
Change-Id: Ic8cef33354ceb00868f939950089574353e76ce3
2012-07-03 12:11:48 -07:00
Daniel Sandler
5d0c689b9b Merge "Logs to track bug 6765842." into jb-dev 2012-07-03 12:10:19 -07:00
Scott Main
7034ed833f am 5a883824: Merge "docs: fix document issue 27549" into jb-dev
* commit '5a883824a2e97e0ccb08b4fe30accde6542f3f39':
  docs: fix document issue 27549
2012-07-03 11:54:11 -07:00
Scott Main
5a883824a2 Merge "docs: fix document issue 27549" into jb-dev 2012-07-03 11:51:30 -07:00
Daniel Sandler
fdbac77e82 Logs to track bug 6765842.
It looks like we can get into a state where the notification
panel gets un-expanded, leaving an unsightly mess where your
status bar should be.

This change adds some additional info to the dumpsys output.

Bug: 6765842
Change-Id: Iecf2480bc7bdf5bb737863c0cbf9ad07d8523c0c
2012-07-03 14:35:05 -04:00