Commit Graph

22247 Commits

Author SHA1 Message Date
Jim Miller
07a42cfcd4 am 1771ee34: Merge "Revert "Fix for layout parameter validation bug in GridLayout."" into jb-dev
* commit '1771ee34d1d308193e61a1b75368149f2d06aa6c':
  Revert "Fix for layout parameter validation bug in GridLayout."
2012-05-02 16:02:38 -07:00
Jim Miller
782c04b864 Revert "Fix for layout parameter validation bug in GridLayout."
This reverts commit 8a36e05443 which was causing
keyguard_screen_tab_unlock.xml to have a bad layout.

Change-Id: I50bdc6dbdf8d7b98ef77eae532860d375574213e
2012-05-02 15:50:30 -07:00
Adam Powell
56de329630 am 0cd4f671: Merge "Fix documentation of Activity#navigateUpTo() to describe its actual behavior." into jb-dev
* commit '0cd4f6718b3d9b9d147a28e32bbb3c0f9147d5a9':
  Fix documentation of Activity#navigateUpTo() to describe its actual behavior.
2012-05-02 12:03:31 -07:00
Gilles Debunne
0bab2b068c am 54562cfb: Merge "Better horizontal internal scroll handling in Text." into jb-dev
* commit '54562cfbcd97a3b9d3ac9fb74f7a0d0d4bb9b8a0':
  Better horizontal internal scroll handling in Text.
2012-05-02 12:03:29 -07:00
Chet Haase
dcc8103542 am fe5984f4: Merge "Corrects invalidation logic for layered views" into jb-dev
* commit 'fe5984f43a5be9f95d1febb806f3aee8601c7ff4':
  Corrects invalidation logic for layered views
2012-05-02 12:00:24 -07:00
Adam Powell
0cd4f6718b Merge "Fix documentation of Activity#navigateUpTo() to describe its actual behavior." into jb-dev 2012-05-02 11:59:55 -07:00
Gilles Debunne
54562cfbcd Merge "Better horizontal internal scroll handling in Text." into jb-dev 2012-05-02 11:59:54 -07:00
Chet Haase
fe5984f43a Merge "Corrects invalidation logic for layered views" into jb-dev 2012-05-02 11:56:56 -07:00
Adam Powell
35c064b2e8 Fix documentation of Activity#navigateUpTo() to describe its actual
behavior.

Change-Id: I804fcef5df6f5885b47b7a1c7703ed301bea09b0
2012-05-02 11:38:57 -07:00
Adam Cohen
9edbb23577 am dfed49a2: Merge "Changing app widget "extras" to "options" and another small API Review issue" into jb-dev
* commit 'dfed49a2852e9336e212f6934dcddec7dd743c26':
  Changing app widget "extras" to "options" and another small API Review issue
2012-05-02 11:08:17 -07:00
Chet Haase
810a8676df Corrects invalidation logic for layered views
A bug in the invalidation logic meant that changes to a view
would not cause parents in the view hiearchy that were set to have
a layer (e.g., View.LAYER_TYPE_HARDWARE) to get invalidated properly.
So even though the child view was all set to recreate its display list
according to the property change, the layer in the tree above it would stay
as-is, meaning that the change would not show up on the screen.

Issue #5887530 DropTarget text does not change color with the icon

Change-Id: Ie6eac4f406d172cb437822d9fe76340ab2afaf1c
2012-05-02 10:44:33 -07:00
Adam Cohen
dfed49a285 Merge "Changing app widget "extras" to "options" and another small API Review issue" into jb-dev 2012-05-02 10:38:01 -07:00
Gilles Debunne
fd5bc01f70 Better horizontal internal scroll handling in Text.
Bug 6378843

Corrects CL 183460, which would clip text with a width greater than
twice the TextView's width.

Internal horizontal translation is now handled in a similar way to
vertical scrolling.

Internal scrolling is indeed handled by the TextView, which translates
the canvas and sets the clipping bounds accordingly.

When drawing the internal DL, we tighten the horizontal bounds like we
did for the vertical bounds using top and bottom. As in Touch.java, we
use the getHorizontallyScrolling() method to know if we indeed have to
measure the actual text width.  If there is no horizontal scrolling we
use the TextView's width as a safe upper estimate in order to avoid an
actual computation. Note that horizontal scrolling is typically only
used for long single-lined text, so that the measurement loop is quick.

As a result, the internal DLs represent the entire text, and there is no
need to invalidate them when an internal scrolling takes place. This
behavior replaces the draw-only-what-is-needed we had before, but is
more consistent with what we do for long texts inside of a ScrollView
with no noticeable performance change, even on very long text.

Change-Id: I47c24c0ae988547d4f1e9f87d136225c93a3056d
2012-05-02 10:30:03 -07:00
Matthew Xie
478b2194e3 am e318c9a5: Merge "Check null of address in onDeviceCreated" into jb-dev
* commit 'e318c9a5f1819e953a2c78b32bced3c7fc427dbf':
  Check null of address in onDeviceCreated
2012-05-02 10:17:32 -07:00
Matthew Xie
e318c9a5f1 Merge "Check null of address in onDeviceCreated" into jb-dev 2012-05-02 10:15:00 -07:00
Adam Cohen
d2097ebacf Changing app widget "extras" to "options" and another small API Review issue
-> (issue 6427146), (issue 6427861)

Change-Id: Ib69a9b3717a5b62317ec227936bc3b2fd5954043
2012-05-02 09:32:42 -07:00
satok
c6b939789a am e849230f: Merge "DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition" into jb-dev
* commit 'e849230f444653e692024b4321044cb9f6188919':
  DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition
2012-05-02 01:43:17 -07:00
satok
e849230f44 Merge "DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition" into jb-dev 2012-05-02 01:41:23 -07:00
satok
1bc0a49e3c DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition
Bug: 5137498
Change-Id: Ieb8fd700d193eddaa31b0c5ebd8c7f7885586372
2012-05-02 17:30:45 +09:00
Adam Powell
a60ce98593 am 39f412d8: Merge "API modifications for TaskStackBuilder" into jb-dev
* commit '39f412d8deed2ba46153c8a819bc8635979cec6b':
  API modifications for TaskStackBuilder
2012-05-01 19:14:35 -07:00
Adam Powell
39f412d8de Merge "API modifications for TaskStackBuilder" into jb-dev 2012-05-01 19:10:32 -07:00
Adam Powell
f78a8444a9 API modifications for TaskStackBuilder
Change-Id: Ic9e11caa4541962d32b2c197f4f7b19ee67a0eda
2012-05-01 18:51:40 -07:00
Jeff Brown
c3cca66404 am 0632b35b: Merge "Improve handling of built-in keyboard." into jb-dev
* commit '0632b35b6828cd4324b3d218c2e38f895e819aad':
  Improve handling of built-in keyboard.
2012-05-01 18:41:00 -07:00
Jeff Brown
0632b35b68 Merge "Improve handling of built-in keyboard." into jb-dev 2012-05-01 18:39:00 -07:00
Matthew Xie
02c4b353f7 Check null of address in onDeviceCreated
address can be null that returned from getAddressFromObjectPath.
If it is null case, donot continue  call getRemoteDeviceProperties.
Otherwise it causes null pointer exception and crash the system.
Bug 6338780

Change-Id: Ib190342032ab2ad11c49f44fa6d4b2509a861514
2012-05-01 17:15:10 -07:00
Jeff Sharkey
7534e4b0ba am 19eaf0a7: Merge "Catch CCE when migrating to ClipData." into jb-dev
* commit '19eaf0a74dc4521db4c248504ea1815d052c0b27':
  Catch CCE when migrating to ClipData.
2012-05-01 16:34:54 -07:00
Jeff Brown
daa3753a04 Improve handling of built-in keyboard.
The window manager policy made some incorrect assumptions about the
meaning of the Configuration.keyboard field.  We need to be more
careful about distinguishing between built-in and external keyboards.

Most of this change is to move the determination of the parts of
the Configuration related to input devices into the WindowManagerService
leveraging new features of the InputManagerService to good effect.

Then we plumb through the flag that indicates whether a device
is internal or external so that we can be more particular about
how the lid switch effects changes to the Configuration.

Bug: 6424373
Change-Id: I36a1c22ade35e578955465a25940a33f227b9763
2012-05-01 16:34:20 -07:00
Jeff Sharkey
19eaf0a74d Merge "Catch CCE when migrating to ClipData." into jb-dev 2012-05-01 16:32:38 -07:00
Philip Milne
6b36d0d044 am 3e350304: Merge "Fix for layout parameter validation bug in GridLayout." into jb-dev
* commit '3e350304599eeb627065de75f3bfe3a45f58389e':
  Fix for layout parameter validation bug in GridLayout.
2012-05-01 16:24:46 -07:00
Gilles Debunne
6b578dc30c am 61552bc8: Merge "API fix in CheckedTextView" into jb-dev
* commit '61552bc81f9f0c1aacbeec694ff97978050c6182':
  API fix in CheckedTextView
2012-05-01 16:22:23 -07:00
Philip Milne
3e35030459 Merge "Fix for layout parameter validation bug in GridLayout." into jb-dev 2012-05-01 16:21:15 -07:00
Gilles Debunne
61552bc81f Merge "API fix in CheckedTextView" into jb-dev 2012-05-01 16:19:40 -07:00
Chris Craik
272a51d1be am ad759f95: Merge "fix monkey scrolling crash" into jb-dev
* commit 'ad759f958a8bd87982b3f34d8424d1ac69c20342':
  fix monkey scrolling crash
2012-05-01 16:05:01 -07:00
Chris Craik
ad759f958a Merge "fix monkey scrolling crash" into jb-dev 2012-05-01 16:01:58 -07:00
Chris Craik
5f3c08a411 fix monkey scrolling crash
bug:6336994

Depends on external/webkit change: https://android-git.corp.google.com/g/#/c/186186/

Change-Id: Ib019ca68f6e57f98e30b022949c624bab4695294
2012-05-01 15:53:06 -07:00
Adam Cohen
16f36e8215 am c9ca7f38: Merge "Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)" into jb-dev
* commit 'c9ca7f38bccfa56bbca44998758869ec8c71f4d3':
  Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)
2012-05-01 15:38:35 -07:00
Adam Cohen
c9ca7f38bc Merge "Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)" into jb-dev 2012-05-01 15:36:21 -07:00
Philip Milne
8a36e05443 Fix for layout parameter validation bug in GridLayout.
Bug 6404882.

When a cell has an unspecified row and a column that is specified as greater
than the specified number of columns, GridLayout fails to report or correct
the error and loops indefinitely searching for a valid row to place the cell.

There is a cyclic dependency between the validation of layout parameters
(and allocation of undefined cell indexes) and the maximum column/row counts.
A performance optimization in layout paramter allocation caused this dependency
to be handled in correctly. The problem is fixed in this CL for this bug and
the symmetric problem for rows.

Change-Id: I0392343bc8a721a0ca7163f58f233ba8046c22e2
2012-05-01 15:24:50 -07:00
Jeff Sharkey
dd471e6a6f Catch CCE when migrating to ClipData.
Bug: 6231948
Change-Id: I51bc272d29a17881b3d4908fda549da20aa7e6b3
2012-05-01 13:08:27 -07:00
Adam Cohen
ffc46a5c7c Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)
Change-Id: If60f98c5e1be66ca840cbd4953841ef2c57a012b
2012-05-01 12:58:12 -07:00
Gilles Debunne
2fb40285c7 API fix in CheckedTextView
Bug 6103310

Change-Id: Ic144ed99199a296df3ef1a16f59caff08af58fd9
2012-05-01 12:11:23 -07:00
Gilles Debunne
43b32a1cd4 am 8ed491b7: Merge "API fix, AutoCompleteTextView" into jb-dev
* commit '8ed491b75b08df3944481a9509dea2606a265857':
  API fix, AutoCompleteTextView
2012-05-01 12:01:05 -07:00
Gilles Debunne
dceca730d3 am 1dcd2bfc: Merge "API fix in TextView" into jb-dev
* commit '1dcd2bfcabf565aa860fabc69ef54c8d66128a45':
  API fix in TextView
2012-05-01 12:01:03 -07:00
Gilles Debunne
8ed491b75b Merge "API fix, AutoCompleteTextView" into jb-dev 2012-05-01 11:58:35 -07:00
Gilles Debunne
1dcd2bfcab Merge "API fix in TextView" into jb-dev 2012-05-01 11:58:26 -07:00
Michael Jurka
38abb6bdab am c81a0751: Merge "Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"" into jb-dev
* commit 'c81a075196a6e0feed452b689ef523e156701f95':
  Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"
2012-05-01 11:50:22 -07:00
Michael Jurka
c81a075196 Merge "Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"" into jb-dev 2012-05-01 11:47:36 -07:00
Winson Chung
0b3d3a3a56 Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"
This reverts commit 7ced8f9cab
2012-05-01 11:46:09 -07:00
Dianne Hackborn
6d01aea3ef am a25c8a97: Merge "Add new APIs for permission group flags and priorities." into jb-dev
* commit 'a25c8a97aff5f67a70857e6776bba8b4c517a286':
  Add new APIs for permission group flags and priorities.
2012-05-01 11:18:16 -07:00
Dianne Hackborn
a25c8a97af Merge "Add new APIs for permission group flags and priorities." into jb-dev 2012-05-01 11:15:51 -07:00