Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,391 Commits 3 Branches 0 Tags
8814ec37969656c01218cf80cef0504e7961ba47
Commit Graph

3435 Commits

Author SHA1 Message Date
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
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
Raph Levien
8b17969c64 Fix for bug 7358703 Gmail ANR when trying to compose a message 
When deferring scroll to a point, it's possible the text changed between
the time the scroll was requested to the time layout happens. In this
case, it attempts to scroll to a point past the end of the text buffer,
which created an infinite loop.

This patch clamps the scroll offset to the length of the text, so it
just scrolls to the end in that case, rather than crashing.

Change-Id: I53740d119d588560f5a4d9fb80e38f7057faab89
 2012-10-16 14:32:47 -07:00
Fabrice Di Meglio
4f1e535b8d am 9e520a6d: am d23b26b6: am b858ecd3: Merge "Fix bug #7345139: The First Volume Down Click looses its place on the volume slider" into jb-mr1-dev 
* commit '9e520a6dd4981d9c746b4c5e8f8b6f644570c7d7':
  Fix bug #7345139: The First Volume Down Click looses its place on the volume slider
 2012-10-16 13:31:37 -07:00
Fabrice Di Meglio
9e520a6dd4 am d23b26b6: am b858ecd3: Merge "Fix bug #7345139: The First Volume Down Click looses its place on the volume slider" into jb-mr1-dev 
* commit 'd23b26b6fded61e91903cf2ff5e92092a93d8c84':
  Fix bug #7345139: The First Volume Down Click looses its place on the volume slider
 2012-10-16 13:28:10 -07:00
Fabrice Di Meglio
d23b26b6fd am b858ecd3: Merge "Fix bug #7345139: The First Volume Down Click looses its place on the volume slider" into jb-mr1-dev 
* commit 'b858ecd3a94add574503d4dd21084ad289bc5c27':
  Fix bug #7345139: The First Volume Down Click looses its place on the volume slider
 2012-10-16 13:25:51 -07:00
Fabrice Di Meglio
b858ecd3a9 Merge "Fix bug #7345139: The First Volume Down Click looses its place on the volume slider" into jb-mr1-dev 2012-10-16 13:23:37 -07:00
Fabrice Di Meglio
f37df1b6c2 Fix bug #7345139: The First Volume Down Click looses its place on the volume slider 
- make SeekBar follow layout direction changes
- also fix onSizeChanged() missing call to super class

Change-Id: Ide036e673c5f104b12e7321648ac027547e04065
 2012-10-16 11:38:26 -07:00
Mathias Agopian
d8c4f50981 am 1167b7b9: am dcfe6cee: am 6868d6f3: Revert "Revert "Fix for bug 6050753."" 
* commit '1167b7b9e43878f077478f58e31e268c2e191110':
  Revert "Revert "Fix for bug 6050753.""
 2012-10-15 20:53:21 -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 8e63bcc63f.

Change-Id: I4373b867d756de09cdf6aa0aba9e6ff8f47bcdbc
 2012-10-15 20:45:01 -07:00
Romain Guy
dabcbfe46d am 3e6c9ba6: am cb09dba0: am 69fbc3c0: Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev 
* commit '3e6c9ba6777cec3b3928ddb2b399c957735f7b06':
  Revert "Fix for bug 6050753."
 2012-10-15 20:23:05 -07:00
Raph Levien
f95dfbbcfe am 244f5125: am b9e224cc: am 6f8c1bad: Merge "Fix for bug 7344916 text view flickers when you hit enter" into jb-mr1-dev 
* commit '244f5125abd62e60f6bf91675f3be6d540b818d2':
  Fix for bug 7344916 text view flickers when you hit enter
 2012-10-15 20:22:33 -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
Raph Levien
244f5125ab am b9e224cc: am 6f8c1bad: Merge "Fix for bug 7344916 text view flickers when you hit enter" into jb-mr1-dev 
* commit 'b9e224ccb5604032ee6a11789b4e03c747a15838':
  Fix for bug 7344916 text view flickers when you hit enter
 2012-10-15 20:18:59 -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
69fbc3c089 Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev 2012-10-15 18:45:03 -07:00
Raph Levien
b9e224ccb5 am 6f8c1bad: Merge "Fix for bug 7344916 text view flickers when you hit enter" into jb-mr1-dev 
* commit '6f8c1bad8a7891f50eda2d3d14f774e28b8f8107':
  Fix for bug 7344916 text view flickers when you hit enter
 2012-10-15 18:25:13 -07:00
Raph Levien
f5c1a8798f Fix for bug 7344916 text view flickers when you hit enter 
The flickering was caused by trying to scroll to the cursor position
while the view was in an inconsistent state (text updated to change the
number of lines, but layout not done yet). This patch defers the actual
setting of the cursor until layout is done, when layout is pending.

Change-Id: I8ed3a402beb8058ac7a7f3935afeb946a23308ab
 2012-10-15 17:22:26 -07:00
Romain Guy
8e63bcc63f Revert "Fix for bug 6050753." 
This reverts commit c29f031598.
 2012-10-15 13:24:58 -07:00
Fabrice Di Meglio
58072b573d am df4bcd6a: am b65b5133: am f9307c5c: Merge "Fix bug #7334966 Padding is still broken in RTL languages" into jb-mr1-dev 
* commit 'df4bcd6a36ae2e0248791f35c10f6f100543b2c6':
  Fix bug #7334966 Padding is still broken in RTL languages
 2012-10-12 18:32:29 -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
Adam Powell
90ef752146 am ff99f59f: am 4e5efaef: am 49dbc161: Merge "Revert "Fixed group and child view caching in SimpleExpandableListAdapter."" into jb-mr1-dev 
* commit 'ff99f59f0bd30f6e475bf5adf358acb4d737cc51':
  Revert "Fixed group and child view caching in SimpleExpandableListAdapter."
 2012-10-11 17:52:54 -07:00
Fabrice Di Meglio
0c5c23b3a2 am 4c95bfd5: am 39b0c29e: am ec139240: Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev 
* commit '4c95bfd5ad4d17b6e0e618cd3244ee2d33bcbda1':
  Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
 2012-10-11 17:52:51 -07:00
Satoshi Kataoka
bc58774037 am 95189b92: am 6a1d4b99: am 8e767115: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev 
* commit '95189b92259529997cfa4d15b5ffd060d9f99a51':
  Don't update the text services locale in the main thread
 2012-10-11 17:18:18 -07:00
Adam Powell
ff99f59f0b am 4e5efaef: am 49dbc161: Merge "Revert "Fixed group and child view caching in SimpleExpandableListAdapter."" into jb-mr1-dev 
* commit '4e5efaef793c58ff014265eab7f11c3ded34b2ed':
  Revert "Fixed group and child view caching in SimpleExpandableListAdapter."
 2012-10-11 17:12:47 -07:00
Fabrice Di Meglio
4c95bfd5ad am 39b0c29e: am ec139240: Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev 
* commit '39b0c29e4f6582420518f1124af262865797339d':
  Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
 2012-10-11 17:12:32 -07:00
Satoshi Kataoka
95189b9225 am 6a1d4b99: am 8e767115: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev 
* commit '6a1d4b998cb543093b99dcabffaf849686eea656':
  Don't update the text services locale in the main thread
 2012-10-11 17:10:50 -07:00
Adam Powell
4e5efaef79 am 49dbc161: Merge "Revert "Fixed group and child view caching in SimpleExpandableListAdapter."" into jb-mr1-dev 
* commit '49dbc1617c5e0ea56d5568fdcbfe9a771671567a':
  Revert "Fixed group and child view caching in SimpleExpandableListAdapter."
 2012-10-11 14:37:02 -07:00
Adam Powell
49dbc1617c Merge "Revert "Fixed group and child view caching in SimpleExpandableListAdapter."" into jb-mr1-dev 2012-10-11 14:32:50 -07:00
Adam Powell
77ace2ef69 Revert "Fixed group and child view caching in SimpleExpandableListAdapter." 
This reverts commit b49e4d63d1.

This produced problems with app compatibility. The boolean array
introduced in this patch is never resized and can cause applications
expecting different behavior to crash with index out of bounds
exceptions.

This looks like a good path but it will need to be revisted later.

Bug 7221618
 2012-10-11 14:26:21 -07:00
Fabrice Di Meglio
39b0c29e4f am ec139240: Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev 
* commit 'ec139240480702e80cd56c0309394f7549a993f3':
  Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
 2012-10-11 14:15:00 -07:00
Fabrice Di Meglio
ec13924048 Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev 2012-10-11 14:10:02 -07:00
Satoshi Kataoka
6a1d4b998c am 8e767115: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev 
* commit '8e767115a888b78c5732fe935bd811a7db6bf2e1':
  Don't update the text services locale in the main thread
 2012-10-11 10:44:55 -07:00
Satoshi Kataoka
1eac6b7b05 Don't update the text services locale in the main thread 
This is a revised version of I9f8a81d3c9261a6cfc00292b9f5cb06053b9112d

Bug: 6761326
Change-Id: I43a0a65df6e4b6941bd0dca548c4af20b7e5bf58
 2012-10-12 00:58:24 +09:00
Fabrice Di Meglio
6bf6eb7d5f Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic) 
Part 2

- fix remaining UI widgets by asking layout params resolution when needed

Change-Id: I97c41639da645d77eeda85feec3bbcc7fc1260b9
 2012-10-10 18:38:23 -07:00