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

79773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
a9becd0099 am c03f0a15: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'c03f0a15578223208b48c1d946872d22a233ede4':
  Import translations. DO NOT MERGE
 2012-07-12 12:04:49 -07:00
Ying Wang
c03f0a1557 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-07-12 12:02:35 -07:00
Ying Wang
d792ef71cb Import translations. DO NOT MERGE 
Change-Id: I11573dc6817d3ef1756ecb6c889e83129317d239
Auto-generated-cl: translation import
 2012-07-12 12:00:03 -07:00
Ying Wang
d7b7c2cead am 23edefc6: Import translations. DO NOT MERGE 
* commit '23edefc6c6d12dd84ff6b7bd8694b50abf0cc158':
  Import translations. DO NOT MERGE
 2012-07-12 11:46:49 -07:00
Ying Wang
23edefc6c6 Import translations. DO NOT MERGE 
Change-Id: I115e6356599b76597f52d5f0006d61f4324ae48b
Auto-generated-cl: translation import
 2012-07-12 11:41:58 -07:00
Wink Saville
1b003ef05f Merge "Create telephony-common and mms-common" into jb-dev-plus-aosp 2012-07-11 16:55:11 -07:00
Wink Saville
a639b311e9 Create telephony-common and mms-common 
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
   frameworks/opt/mms

telephony-common was created by moving some of
   frameworks/base/telephony
to:
   frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
 2012-07-11 16:02:08 -07:00
Joe Fernandez
204a102222 am 82c81550: Merge "docs: ADK 2012 IDE for Windows download link update, plus minor content fixes/updates" into jb-dev 
* commit '82c815500e7d73befd85df4ceca04ae00814d9c1':
  docs: ADK 2012 IDE for Windows download link update, plus minor content fixes/updates
 2012-07-11 15:53:35 -07:00
Joe Fernandez
82c815500e Merge "docs: ADK 2012 IDE for Windows download link update, plus minor content fixes/updates" into jb-dev 2012-07-11 15:50:35 -07:00
Joe Fernandez
d2d6c09a85 docs: ADK 2012 IDE for Windows download link update, plus minor content fixes/updates 
Change-Id: I53fed5504b6d77185dc9715afcd3bdf0bc9182a8
 2012-07-11 15:26:09 -07:00
Craig Mautner
64ab8fcd6f am dcddea95: Merge "Handle keyguard visibility states separately. DO NOT MERGE" into jb-dev 
* commit 'dcddea95301641e3dc9692ed7d70127085458a24':
  Handle keyguard visibility states separately. DO NOT MERGE
 2012-07-11 15:18:14 -07:00
Craig Mautner
dcddea9530 Merge "Handle keyguard visibility states separately. DO NOT MERGE" into jb-dev 2012-07-11 15:15:00 -07:00
Craig Mautner
f333f5f67a Handle keyguard visibility states separately. DO NOT MERGE 
Previous to this change the forceHiding variable was a boolean. This
change recognizes the different configurations of the keyguard by
defining separate states for forceHiding and testing for window
visibility differently in each state.

Fixes bug 6786114.

Change-Id: I3460c45ea6da772a4ff76bb016de7aa4b051a673
 2012-07-11 14:38:29 -07:00
Katie McCormick
7e7674489f am d5cd8904: Merge "Doc change: New TTL error code." into jb-dev 
* commit 'd5cd89049b801e669960890863f1fa7f4a6e61d9':
  Doc change: New TTL error code.
 2012-07-11 14:15:12 -07:00
Katie McCormick
d5cd89049b Merge "Doc change: New TTL error code." into jb-dev 2012-07-11 14:12:13 -07:00
Ying Wang
0ddea75be4 am 04ca8e57: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '04ca8e577859235a68fa9a5268af528d547310be':
  Import translations. DO NOT MERGE
 2012-07-11 13:57:43 -07:00
Ying Wang
04ca8e5778 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-07-11 13:55:33 -07:00
Justin Ho
e7c08bcd48 am 87f86e64: Merge "Replace AndroidEmoji.ttf for UI optimization" into jb-dev 
* commit '87f86e640e1192e9cc37e25393ccdff7862acdd8':
  Replace AndroidEmoji.ttf for UI optimization
 2012-07-11 13:25:53 -07:00
Justin Ho
87f86e640e Merge "Replace AndroidEmoji.ttf for UI optimization" into jb-dev 2012-07-11 13:22:27 -07:00
Ying Wang
2ba281577a Import translations. DO NOT MERGE 
Change-Id: Idabf12464d73bf707daf0f870de2349731b574e2
Auto-generated-cl: translation import
 2012-07-11 12:51:31 -07:00
Katie McCormick
507c3129eb Doc change: New TTL error code. 
Change-Id: I99844d28243e0d6592219f532db08855d73f338e
 2012-07-11 10:25:13 -07:00
Justin Ho
b64e0f971d am 1b637fba: Merge "Remove gradients from navbar glow highlights." into jb-dev 
* commit '1b637fbad4de204f737e2617da04eed7b334e945':
  Remove gradients from navbar glow highlights.
 2012-07-11 07:38:02 -07:00
Justin Ho
1b637fbad4 Merge "Remove gradients from navbar glow highlights." into jb-dev 2012-07-11 07:35:37 -07:00
Xavier Ducrohet
54059cd38d am 15c15eaa: Merge "Replace LruCache implementation for layoutlib. do not merge." into jb-dev 
* commit '15c15eaac51c0c375d18fb70cd1bd066d87b034e':
  Replace LruCache implementation for layoutlib. do not merge.
 2012-07-10 18:38:21 -07:00
Xavier Ducrohet
15c15eaac5 Merge "Replace LruCache implementation for layoutlib. do not merge." into jb-dev 2012-07-10 18:34:40 -07:00
Raph Levien
23316a1ef8 am 00139b22: Merge "Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE" into jb-dev 
* commit '00139b2238562780d66c2ebb8a0675fbe7d896b7':
  Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE
 2012-07-10 18:07:27 -07:00
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