Commit Graph

3473 Commits

Author SHA1 Message Date
Fabrice Di Meglio
ea5e56ad9c am d31f0ab9: am 9d662c77: am 68b14054: Merge "Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"" into jb-mr1-dev
* commit 'd31f0ab93f4f35a7ca6df6d428db2a5fd3d6750a':
  Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"
2012-10-29 17:14:54 -07:00
Fabrice Di Meglio
46e62fe398 am 024e70c8: am dd80335e: am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
* commit '024e70c8156a0fa2d702ff2fba4a38c1f6b68f98':
  Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
2012-10-29 17:13:23 -07:00
Fabrice Di Meglio
d31f0ab93f am 9d662c77: am 68b14054: Merge "Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"" into jb-mr1-dev
* commit '9d662c77650a1cee9d05ad93743684482eeba935':
  Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"
2012-10-29 14:23:43 -07:00
Fabrice Di Meglio
024e70c815 am dd80335e: am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
* commit 'dd80335edde688794db3260bcea7f732430abaf1':
  Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
2012-10-29 14:22:04 -07:00
Fabrice Di Meglio
9d662c7765 am 68b14054: Merge "Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"" into jb-mr1-dev
* commit '68b14054b96571d4009c6c5a9b4c3413d908a523':
  Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"
2012-10-29 14:01:51 -07:00
Fabrice Di Meglio
dd80335edd am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
* commit '07ce0ca265274c5ba95e6ec3e0950e38b8ce97ea':
  Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
2012-10-29 13:55:46 -07:00
Fabrice Di Meglio
68b14054b9 Merge "Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"" into jb-mr1-dev 2012-10-26 18:01:55 -07:00
Fabrice Di Meglio
bb4b601673 Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"
This reverts commit 6bf6eb7d5f.
and also fbc21e126f

I have also removed all unnecessary calls to resolveLayoutDirection(int). This is possible as
we are resolving layout params on every child of a ViewGroup as of commit
fcc3348f61

Change-Id: I262a375b03fcc3c9261cbe2edebb6ec42ec2e186
2012-10-26 17:13:33 -07:00
Fabrice Di Meglio
1957d281ea Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
- check layout direction previous value in the onResolveDrawables(int) callback
- dont do any Drawables resolution if we cannot resolve the layout direction
- also remove unnecessary call to resolveRtlPropertiesIfNeeded() in ViewGroup when
  adding a child as the call to resolveRtlPropertiesIfNeeded() will be done into
  the measure() call itself later

Change-Id: I62237af3d307dfea203f7f2865551d1c61a0e0b8
2012-10-26 10:55:02 -07:00
Adam Powell
b09aadeda5 am a23f69a8: am 86e0d95d: Merge "Reattach header view after DPAD scroll."
* commit 'a23f69a8782e0edeff815cfb5275f2864fc1d19e':
  Reattach header view after DPAD scroll.
2012-10-23 15:03:55 -07:00
Adam Powell
a23f69a878 am 86e0d95d: Merge "Reattach header view after DPAD scroll."
* commit '86e0d95de1007d339af467c1484b09878ee528fc':
  Reattach header view after DPAD scroll.
2012-10-23 15:01:43 -07:00
Adam Powell
86e0d95de1 Merge "Reattach header view after DPAD scroll." 2012-10-23 14:04:19 -07:00
Fabrice Di Meglio
da391700c9 resolved conflicts for merge of e549a602 to master
Change-Id: I37dc0e48321d4baea49d77b6ef22bca19dcb0d9b
2012-10-19 12:49:30 -07:00
Fabrice Di Meglio
e549a602a3 am af26ac31: am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
* commit 'af26ac3130c0e956e28443d6e42212b02d4da611':
  Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
2012-10-19 11:38:18 -07:00
Fabrice Di Meglio
af26ac3130 am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
* commit '398a6713c355cf59af071e944268aec7c0096b5a':
  Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
2012-10-19 11:36:12 -07:00
Fabrice Di Meglio
398a6713c3 Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev 2012-10-19 11:33:01 -07:00
Dave Burke
0b9b415632 am b1f434c1: 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 'b1f434c16eefb028ef441ba40df8abe1e087a4eb':
  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:09:48 -07:00
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 57fca90ac6

Change-Id: I21b007a7d150a4c23f25a706cdba5cb86198198f
2012-10-18 20:41:55 -07:00
Fabrice Di Meglio
b003e28c1d Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
- set the popup layout direction depending on the anchor view's layout direction
(if not defined before)
- make first pass of ViewRootImpl.performTraversals() and configuration update
not override any layout direction that could have been set before

Change-Id: I8e86ca805f0caf52c058d06aa7861df56fb862e6
2012-10-18 18:02:56 -07:00
Justin Ho
f114945269 am 22bd3726: 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 '22bd3726be37a24e956d962d61657d8a3d54c985':
  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:06:15 -07:00
Justin Ho
5c555f39fb am 0efebf0a: 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 '0efebf0af4c21b9d02c9c06b67867a554e0b35ea':
  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:29 -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 f49d835dfe

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 57fca90ac6

Change-Id: I0fe25056cd54b8852b32ae4621e048d3f5c7d555
2012-10-17 15:50:48 -07:00
Fabrice Di Meglio
7cfd0a2809 am 86a8b251: am d8989364: am e9a33c60: Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev
* commit '86a8b25114fbc033c474a214699ad77a9140af5e':
  Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware
2012-10-17 11:26:41 -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
8814ec3796 am 47270268: 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 '472702687d174c126752259485b83c39f3eb2801':
  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:58:21 -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 dcf59629be

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
f7b77f1285 am ef512f03: 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 'ef512f03e3a10b39e82c9029d9d7623915ac8850':
  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:30:18 -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
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 6868d6f349

Change-Id: I8843d92dba14c82f06d9ee59517cf11b2abbbf04
2012-10-16 19:01:32 -07:00
Raph Levien
886d159aa8 am 17732ff1: am 142155b5: am 3377b404: Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev
* commit '17732ff107706d1e816d45307594e8b73f8bb01b':
  Fix for bug 7358703 Gmail ANR when trying to compose a message
2012-10-16 14:52:03 -07:00
Raph Levien
17732ff107 am 142155b5: am 3377b404: Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev
* commit '142155b5cec5dfbde4a875828505cd1434df0d2b':
  Fix for bug 7358703 Gmail ANR when trying to compose a message
2012-10-16 14:49:29 -07:00
Raph Levien
142155b5ce am 3377b404: Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev
* commit '3377b404b82403c4c137c699088eb09c4b806dba':
  Fix for bug 7358703 Gmail ANR when trying to compose a message
2012-10-16 14:46:41 -07:00