Scott Main
4fbbea09ff
am 1878bef2: Merge "docs: adjustments to correct text alignment" into jb-dev
...
* commit '1878bef2c455e11b6166326130d422a1c10ee1b1':
docs: adjustments to correct text alignment
2012-07-16 15:50:01 -07:00
Dirk Dougherty
9a5456a0e5
am 63c3117e: Merge "Doc change: API diffs for 16." into jb-dev
...
* commit '63c3117e275e54707606eeb9bf6aa0955919c80c':
Doc change: API diffs for 16.
2012-07-16 15:46:49 -07:00
Scott Main
1878bef2c4
Merge "docs: adjustments to correct text alignment" into jb-dev
2012-07-16 15:46:35 -07:00
Dirk Dougherty
63c3117e27
Merge "Doc change: API diffs for 16." into jb-dev
2012-07-16 15:44:07 -07:00
Scott Main
65363a864e
docs: adjustments to correct text alignment
...
Change-Id: Iaec7412d56431713cd6976f76bf1ab4e06efb1ce
2012-07-16 15:40:59 -07:00
Adam Cohen
a46cdc04fa
am c80f72f7: Merge "Fixing issue where you couldn\'t set null RemoteViews for a widget" into jb-dev
...
* commit 'c80f72f75e8d5b5fa85b694b64510fad74ea345d':
Fixing issue where you couldn't set null RemoteViews for a widget
2012-07-16 15:33:19 -07:00
Adam Cohen
c80f72f75e
Merge "Fixing issue where you couldn't set null RemoteViews for a widget" into jb-dev
2012-07-16 15:29:44 -07:00
Katie McCormick
f1e43f76e2
am eb672796: Merge "Doc update: GCM doc cleanup, continued." into jb-dev
...
* commit 'eb6727963713137a0f68f02207f057ebec597691':
Doc update: GCM doc cleanup, continued.
2012-07-16 15:14:15 -07:00
Katie McCormick
eb67279637
Merge "Doc update: GCM doc cleanup, continued." into jb-dev
2012-07-16 15:11:45 -07:00
Katie McCormick
60c8f99619
Doc update: GCM doc cleanup, continued.
...
Change-Id: Ia668bc6b80b5d53c9fa815db888e75d8efbbc772
2012-07-16 14:55:53 -07:00
Adam Cohen
e582746621
Fixing issue where you couldn't set null RemoteViews for a widget
...
-> As noted here: http://code.google.com/p/android/issues/detail?id=35014
Change-Id: Id5d1c47b6961d4b448453d8b16700801c0137f2b
2012-07-16 13:56:17 -07:00
Ying Wang
6d1e7ca30e
am 6b7b9b4a: Import translations. DO NOT MERGE
...
* commit '6b7b9b4abe3a55a5349951f64a348826e90996c9':
Import translations. DO NOT MERGE
2012-07-16 11:50:32 -07:00
Ying Wang
6b7b9b4abe
Import translations. DO NOT MERGE
...
Change-Id: I90c2a81acb707d11c4268ed78c8c06871370faa6
Auto-generated-cl: translation import
2012-07-16 11:29:20 -07:00
Dirk Dougherty
7b756e6246
Doc change: API diffs for 16.
...
Change-Id: Id6c4f7f1f7d869847de580d8b2431b37e69260b4
2012-07-16 11:02:25 -07:00
Romain Guy
4094fb3c5b
am 8d170421: Merge "Fix wrong condition."
...
* commit '8d1704215e80ebec61f6d77c503d83b32d881096':
Fix wrong condition.
2012-07-16 01:55:55 -07:00
Romain Guy
8d1704215e
Merge "Fix wrong condition."
2012-07-16 00:57:42 -07:00
SeongJae Park
8108e9f8cd
Fix wrong condition.
...
Should check width and height, not width and width.
Change-Id: Ie84d3605b2a7a0f4776adb876608ea92f56817c4
2012-07-14 14:18:51 +09:00
Ying Wang
d304e8bfc7
am df523ec5: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'df523ec5780aece1f63ce05a0ae57773fef50fbf':
Import translations. DO NOT MERGE
2012-07-13 13:41:02 -07:00
Romain Guy
01f03dc389
am 0a386ffa: Text shadow alpha handling incorrect DO NOT MERGE
...
* commit '0a386ffac026e259c408b77c2dd2cc5d2e22b5f8':
Text shadow alpha handling incorrect DO NOT MERGE
2012-07-13 13:41:00 -07:00
Ying Wang
df523ec578
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-07-13 13:39:39 -07:00
Romain Guy
0a386ffac0
Text shadow alpha handling incorrect
...
DO NOT MERGE
External bug: http://code.google.com/p/android/issues/detail?id=34879
This is a regression from ICS.
This CL also fixes a bug where a View's alpha would be applied twice.
Change-Id: I13a1546228f44d4c169259414b6fa103a6e4a0fa
2012-07-13 12:24:09 -07:00
Chet Haase
6bcfe893d4
am 0f8e402e: Force invalidates on non-visible views. DO NOT MERGE
...
* commit '0f8e402e954c6e37102fa70f81a1d8ec47156338':
Force invalidates on non-visible views. DO NOT MERGE
2012-07-13 12:16:46 -07:00
Ying Wang
3b1ca7888c
Import translations. DO NOT MERGE
...
Change-Id: Iac7759bb253431f5b75c246938a3cc3a726c8439
Auto-generated-cl: translation import
2012-07-13 11:41:59 -07:00
Chet Haase
0f8e402e95
Force invalidates on non-visible views. DO NOT MERGE
...
An optimization prunes invalidates on views which are not inside their
parent's bounds. This works in most cases, but it is possible to run
a situation where a view has been invalidated (and is thus waiting to
be redrawn), but the pruning logic ensures that that draw call
will not happen. Further, when/if the view comes into the bounds
of its parent again, it may still not be redrawn, because now future
invalidates on the view are noop'd because it is already in an invalidated
state (and thus will not propagate invalidates up the hierarchy).
The fix is to remove the optitmization. This will cause some overhead
sending the invalidation request up to the view root, but this
overhead is minimal (and only extra for cases of out-of-bounds views),
and the more expensive part of rendering these views will still not be done
since the view root will avoid re-drawing the hierarchy when the dirty
rectangle is empty.
Issue #6813661 offscreen views don't get invalidated properly (may remain invisible when returning onscreen)
Change-Id: Ic4b439540084a7163be9afc585bea6560d073280
2012-07-12 14:40:28 -07:00
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