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

4521 Commits

Author SHA1 Message Date
Dave Burke
b1f434c16e am 744b4dca: am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev 
* commit '744b4dca34e605b80e553a34327067abc862a320':
  Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
 2012-10-18 21:07:52 -07:00
Dave Burke
744b4dca34 am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev 
* commit '09a5321c60c02d944684abb98e0daec9dd810fab':
  Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
 2012-10-18 21:05:29 -07:00
Dave Burke
09a5321c60 Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev 2012-10-18 21:02:13 -07:00
Dave Burke
579e14016c Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" 
This reverts commit 57fca90ac65ecfe97acd4c93d442c3db8f815e11

Change-Id: I21b007a7d150a4c23f25a706cdba5cb86198198f
 2012-10-18 20:41:55 -07:00
Fabrice Di Meglio
4c2db5f2a5 am 8de328c9: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev 
* commit '8de328c996a9f3a8f5ca3ea8e7c47421dd09b9aa':
  Fix missing @hide on ViewGroup.resolveLayoutParams()
 2012-10-18 16:27:09 -07:00
Fabrice Di Meglio
8de328c996 am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev 
* commit '45c77ca0f6afd568ff6d149e17fb43c684e51722':
  Fix missing @hide on ViewGroup.resolveLayoutParams()
 2012-10-18 16:24:08 -07:00
Fabrice Di Meglio
1e0ed6b232 Fix missing @hide on ViewGroup.resolveLayoutParams() 
- as we dont need this to be public

Change-Id: Ib8de262eec26d4785b13875d59599369b06a067d
 2012-10-18 16:06:52 -07:00
Fabrice Di Meglio
2a902caab2 am 193229a5: am 0437302f: Merge "Fix the build" into jb-mr1-dev 
* commit '193229a52a732f537e1f062426d1cc8d774bd2c7':
  Fix the build
 2012-10-18 15:43:02 -07:00
Fabrice Di Meglio
193229a52a am 0437302f: Merge "Fix the build" into jb-mr1-dev 
* commit '0437302f164f3eb1ba6a359ef5b3cd857facbbe4':
  Fix the build
 2012-10-18 15:40:24 -07:00
Fabrice Di Meglio
3cb8d26bb0 Fix the build 
- was missing a "make update-api" pass

Change-Id: I004a1650cf7946e0e8bd36d75dab81bbca80443c
 2012-10-18 15:34:30 -07:00
Justin Ho
22bd3726be am 76a01424: am 871a6d7d: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '76a0142477e3ebda381d717572b21b355c172c26':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 16:03:11 -07:00
Justin Ho
76a0142477 am 871a6d7d: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '871a6d7d4fb3bffaff37e45f0b4f5e3c862239d2':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 16:00:37 -07:00
Justin Ho
0efebf0af4 am c35f7650: am 4db31657: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 
* commit 'c35f76508eed905e06954cf8955065909b2039a7':
  This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
 2012-10-17 16:00:31 -07:00
Justin Ho
c35f76508e am 4db31657: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 
* commit '4db3165793a837ffc8197184fbc13ef2217e3dfc':
  This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
 2012-10-17 15:58:52 -07:00
Justin Ho
871a6d7d4f Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 2012-10-17 15:55:15 -07:00
Justin Ho
4e360f0600 Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." 
This reverts commit f49d835dfe1bd21920ff8a48cbdfb9c1fd632fd9

Change-Id: If0093f23d6458e53619220fbf0aa5f844ad2c790
 2012-10-17 15:54:20 -07:00
Justin Ho
4db3165793 Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 2012-10-17 15:53:02 -07:00
Justin Ho
f49d835dfe This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height. 
This reverts commit 57fca90ac65ecfe97acd4c93d442c3db8f815e11

Change-Id: I0fe25056cd54b8852b32ae4621e048d3f5c7d555
 2012-10-17 15:50:48 -07:00
Fabrice Di Meglio
86a8b25114 am d8989364: am e9a33c60: Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev 
* commit 'd89893642f81f854455da601e4735d226cf95214':
  Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware
 2012-10-17 11:23:55 -07:00
Fabrice Di Meglio
d89893642f am e9a33c60: Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev 
* commit 'e9a33c6098f51c687665adbed799860df2569ad0':
  Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware
 2012-10-17 11:21:01 -07:00
Fabrice Di Meglio
e9a33c6098 Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev 2012-10-17 11:18:13 -07:00
Justin Ho
472702687d am 8598646e: am 144d4055: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '8598646e5b93e8adf4bcd2489365900d2a4776c6':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 10:56:33 -07:00
Justin Ho
8598646e5b am 144d4055: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '144d405511e9ed685568e50db87b22cc42b6a252':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 10:53:43 -07:00
Justin Ho
144d405511 Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 2012-10-17 10:50:39 -07:00
Justin Ho
57fca90ac6 Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." 
This reverts commit dcf59629beed8182759a1068ab8ee997935bef82

Change-Id: I27426a0ffe993973ffb0b05ce1ed3afe73fcd87d
 2012-10-17 10:47:39 -07:00
Fabrice Di Meglio
cf12897cf5 Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware 
- set the Configuration's layout direction in ViewRootImpl instead of PhoneWindow$DecorView
- then remove unecessary API on ListPopupWindow for passing the layout direction

Change-Id: Ia2c6e4aa8cb82aed9b088bc3b8004ea0a1ded1f3
 2012-10-16 20:59:04 -07:00
Jim Miller
ef512f03e3 am cccf85c2: am 8e614501: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 
* commit 'cccf85c287aea85121b15280bf3a89a2b7d3926b':
  This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
 2012-10-16 19:28:28 -07:00
Jim Miller
cccf85c287 am 8e614501: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 
* commit '8e6145013a6533ca6a33e03c8a5e45ad2de431e4':
  This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
 2012-10-16 19:26:00 -07:00
Jim Miller
8e6145013a Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 2012-10-16 19:22:37 -07:00
Romain Guy
b7b30eb057 am fa71ba2c: am 1b85122b: Merge "Add API to enable mipmaps on Bitmap Bug #7353771" into jb-mr1-dev 
* commit 'fa71ba2c847622c0b23321477b3914f4a4cdd536':
  Add API to enable mipmaps on Bitmap Bug #7353771
 2012-10-16 19:11:13 -07:00
Romain Guy
fa71ba2c84 am 1b85122b: Merge "Add API to enable mipmaps on Bitmap Bug #7353771" into jb-mr1-dev 
* commit '1b85122bd22c4528679ae8bd67077dfc2fdf1847':
  Add API to enable mipmaps on Bitmap Bug #7353771
 2012-10-16 19:08:48 -07:00
Jim Miller
dcf59629be This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height. 
Revert "Revert "Revert "Fix for bug 6050753."""

This reverts commit 6868d6f349610c15256471cc3d5fa708cbfd5f1d

Change-Id: I8843d92dba14c82f06d9ee59517cf11b2abbbf04
 2012-10-16 19:01:32 -07:00
Romain Guy
713e1bb9df Add API to enable mipmaps on Bitmap 
Bug #7353771

This API can be used when scaling large images down to a small size
to get nicer looking results.

Change-Id: If09087eed36077eee5355f6047a3ca67747d7d9e
 2012-10-16 18:44:09 -07:00
Mathias Agopian
1167b7b9e4 am dcfe6cee: am 6868d6f3: Revert "Revert "Fix for bug 6050753."" 
* commit 'dcfe6ceef05c1566a8fc80b758b830c39df01bbd':
  Revert "Revert "Fix for bug 6050753.""
 2012-10-15 20:51:00 -07:00
Mathias Agopian
dcfe6ceef0 am 6868d6f3: Revert "Revert "Fix for bug 6050753."" 
* commit '6868d6f349610c15256471cc3d5fa708cbfd5f1d':
  Revert "Revert "Fix for bug 6050753.""
 2012-10-15 20:47:56 -07:00
Mathias Agopian
6868d6f349 Revert "Revert "Fix for bug 6050753."" 
Emergency revert -- fix reboot loop.

This reverts commit 8e63bcc63fd002231f8391af8982eeb235d096c8.

Change-Id: I4373b867d756de09cdf6aa0aba9e6ff8f47bcdbc
 2012-10-15 20:45:01 -07:00
Romain Guy
3e6c9ba677 am cb09dba0: am 69fbc3c0: Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev 
* commit 'cb09dba0b80ff51e0a481959c5f0056f7a292ea7':
  Revert "Fix for bug 6050753."
 2012-10-15 20:19:28 -07:00
Romain Guy
cb09dba0b8 am 69fbc3c0: Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev 
* commit '69fbc3c089e3399ebd94cc3a7ba846f426a7b32d':
  Revert "Fix for bug 6050753."
 2012-10-15 18:47:46 -07:00
Romain Guy
8e63bcc63f Revert "Fix for bug 6050753." 
This reverts commit c29f031598811486d83f418fd08fbfe1fc41788a.
 2012-10-15 13:24:58 -07:00
Fabrice Di Meglio
df4bcd6a36 am b65b5133: am f9307c5c: Merge "Fix bug #7334966 Padding is still broken in RTL languages" into jb-mr1-dev 
* commit 'b65b5133e7590e68053bbf4530b31b7206c7b984':
  Fix bug #7334966 Padding is still broken in RTL languages
 2012-10-12 18:29:59 -07:00
Fabrice Di Meglio
b65b5133e7 am f9307c5c: Merge "Fix bug #7334966 Padding is still broken in RTL languages" into jb-mr1-dev 
* commit 'f9307c5c00bd3e8338bd478fec67a0190d515558':
  Fix bug #7334966 Padding is still broken in RTL languages
 2012-10-12 18:28:33 -07:00
Fabrice Di Meglio
84ebb35f39 Fix bug #7334966 Padding is still broken in RTL languages 
- do correct resolution and reset propagation for all RTL properties (padding and drawables included)
- fix CheckedTextView padding too

Change-Id: Ie603683a2324b2a6ef2c03633d01d5726c883b90
 2012-10-12 15:54:10 -07:00
Jonathan Dixon
73030434e5 am 207b5e17: am 402099f7: Merge "Unhide setPictureListener" into jb-mr1-dev 
* commit '207b5e1722dc9349c694285d65a24955b630b54b':
  Unhide setPictureListener
 2012-10-11 17:13:35 -07:00
Jonathan Dixon
207b5e1722 am 402099f7: Merge "Unhide setPictureListener" into jb-mr1-dev 
* commit '402099f7861f306c2dd7c561bdc19b8f65d79b65':
  Unhide setPictureListener
 2012-10-11 15:44:17 -07:00
Jonathan Dixon
96a1b3cf67 Unhide setPictureListener 
The replacement isn't available yet, so we need to leave this in for now.

BUG: 7332831
Change-Id: I311c44c45ef71461572afbe4060d134cdaefd3ae
 2012-10-11 14:00:50 -07:00
Fabrice Di Meglio
f4a1dad63d am 5b04d032: am b8021a88: Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev 
* commit '5b04d0320b877693fe10f70773657585c1c4aa58':
  Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
 2012-10-10 17:32:47 -07:00
Fabrice Di Meglio
5b04d0320b am b8021a88: Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev 
* commit 'b8021a88e5c00ebd985a348b56af29c95a178a90':
  Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
 2012-10-10 17:29:52 -07:00
Fabrice Di Meglio
b8021a88e5 Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev 2012-10-10 17:26:41 -07:00
Fabrice Di Meglio
2918ab6c32 Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int) 
- rename to LayoutParams.resolveLayoutDirection(int)
- upate 17.txt too

Change-Id: I54fe28dc47cfdb65ef0b5b0244dabbe1d675c781
 2012-10-10 16:47:51 -07:00
Jeff Sharkey
50035e8396 am 89be4267: am 03bd101b: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev 
* commit '89be4267d0a23ca258af607291bc4f905f963185':
  Move lockscreen to using haptic feedback setting.
 2012-10-10 16:32:36 -07:00