Commit Graph

2795 Commits

Author SHA1 Message Date
Amith Yamasani
988b832b34 am 503b2e5a: am 44e3f88f: Merge "Javadoc improvements in SearchView per API review." into jb-dev
* commit '503b2e5ae1b83e5595b47a8d376db6b89b059b87':
  Javadoc improvements in SearchView per API review.
2012-05-08 11:29:57 -07:00
Amith Yamasani
503b2e5ae1 am 44e3f88f: Merge "Javadoc improvements in SearchView per API review." into jb-dev
* commit '44e3f88f2f80c7dfbe36c22878d129251ba13165':
  Javadoc improvements in SearchView per API review.
2012-05-07 11:35:47 -07:00
Amith Yamasani
44e3f88f2f Merge "Javadoc improvements in SearchView per API review." into jb-dev 2012-05-07 11:33:16 -07:00
satok
cb9309d04c am 50956b2d: Merge "DO NOT MERGE. Backport If36b8a69e7fa22e837c99d Fix the issue that the spell check doesn\'t start when the user changes the cursor position by touch" into jb-dev
* commit '50956b2dc473126fd04341388df9f244fd22f77e':
  DO NOT MERGE. Backport If36b8a69e7fa22e837c99d Fix the issue that the spell check doesn't start when the user changes the cursor position by touch
2012-05-07 02:35:26 -07:00
satok
8589474d26 DO NOT MERGE. Backport If36b8a69e7fa22e837c99d Fix the issue that the spell check doesn't start when the user changes the cursor position by touch
Change-Id: I1535eae23efc42660b9d1e6dbfba6c800b0302b2
2012-05-07 18:30:17 +09:00
satok
2bc427e436 Fix the issue that the spell check doesn't start when the user changes the cursor position by touch
Change-Id: If36b8a69e7fa22e837c99d58c66321cb649b3c2d
2012-05-07 18:19:04 +09:00
Dianne Hackborn
c77218e6b0 am 25fc66b8: am 7bfa1457: Merge "Finish up issue #6249094: Display permissions based on relevance to private data" into jb-dev
* commit '25fc66b898a35796af65ec7e3eb9b1584588e063':
  Finish up issue #6249094: Display permissions based on relevance to private data
2012-05-06 17:55:04 -07:00
Dianne Hackborn
25fc66b898 am 7bfa1457: Merge "Finish up issue #6249094: Display permissions based on relevance to private data" into jb-dev
* commit '7bfa14570e3e43ae8595400353853acdd7cea37c':
  Finish up issue #6249094: Display permissions based on relevance to private data
2012-05-06 17:52:23 -07:00
Dianne Hackborn
7bfa14570e Merge "Finish up issue #6249094: Display permissions based on relevance to private data" into jb-dev 2012-05-06 17:49:53 -07:00
Dianne Hackborn
99222d212f Finish up issue #6249094: Display permissions based on relevance to private data
Added bitmaps for permission group icons.  We had to pick either
icons for a dark or light background, and it had to be light for
settings, so the installer theme has gone back to dark.

Tweaked the permission groups to match the icons.

Redid the group priorities to make them correct (they were written
with higher priorities being less important).

Fixed bug where priority was not being used for system apps.

Change-Id: Ia3d3f0c1614a11b4cfd11682ce9e6c9f87d75c06
2012-05-06 17:45:13 -07:00
Svetoslav Ganov
b75436066d am f9c4734b: am 464676bc: Merge "Showing default activity in activity chooser view only if enough space." into jb-dev
* commit 'f9c4734b307129e52832c2024e916157c71265c4':
  Showing default activity in activity chooser view only if enough space.
2012-05-06 17:22:29 -07:00
Svetoslav Ganov
f9c4734b30 am 464676bc: Merge "Showing default activity in activity chooser view only if enough space." into jb-dev
* commit '464676bcb41e2948bd8243ed5a4a910328908789':
  Showing default activity in activity chooser view only if enough space.
2012-05-06 17:19:44 -07:00
Svetoslav Ganov
464676bcb4 Merge "Showing default activity in activity chooser view only if enough space." into jb-dev 2012-05-06 17:17:34 -07:00
Romain Guy
4fa22f0b4d am 95b0c45b: am aaa71475: Merge "Remove unnecessary framework allocations" into jb-dev
* commit '95b0c45b06d9a053f9050e0f0ef1171a18ae0711':
  Remove unnecessary framework allocations
2012-05-06 13:34:34 -07:00
Romain Guy
95b0c45b06 am aaa71475: Merge "Remove unnecessary framework allocations" into jb-dev
* commit 'aaa7147595346fdd398e2932817e075acbb8e497':
  Remove unnecessary framework allocations
2012-05-06 13:31:15 -07:00
Romain Guy
ab4c4f4ff7 Remove unnecessary framework allocations
These allocations were frequently triggered by the home screen. This change
removes dozens of allocations during page scrolls on home.

Change-Id: I7289efa28ecf5bd62459042b10062aa9cf0432dd
2012-05-06 13:11:24 -07:00
Svetoslav Ganov
340e2611de Showing default activity in activity chooser view only if enough space.
1. While a default target is very convenient, having two targets for the
   widget on a phone takes too much space and the apps do not have room
   to add other essential affordances to the action bar. Making the default
   activity show only of the screen is large enough - the action bar
   accommodates at least four targets i.e. 500dip.

2. Fixed a bug where changing the backing model of an ActivityChooserView
   when the view is not shown did not remove the observer for the old
   model, hence the View can get into a state where it responds to changes
   of two models while presenting only one. Also in such a case the view
   would leak since the singleton model will keep a handle to it.

3. Updated the documentation of share action provider to explain how a
   a developer can change the backing history file and refresh the UI
   based on the historical data in that file.

bug:6447692

Change-Id: Id5c9e54cd5df322ded8574ba028cb680e628243b
2012-05-05 17:49:16 -07:00
Svetoslav Ganov
1c80179039 am 81c0f9df: am 35d79991: Merge "API REVIEW: android.widget.CalendarView" into jb-dev
* commit '81c0f9df0b45dd083db55afce52fdb001c21e8f4':
  API REVIEW: android.widget.CalendarView
2012-05-04 17:25:32 -07:00
Svetoslav Ganov
81c0f9df0b am 35d79991: Merge "API REVIEW: android.widget.CalendarView" into jb-dev
* commit '35d79991d5c97270f6c34d0da8879ea4c3984f80':
  API REVIEW: android.widget.CalendarView
2012-05-04 17:22:20 -07:00
Svetoslav Ganov
414efc3b5f API REVIEW: android.widget.CalendarView
1. Making sure that the comment blocks for methods setting/getting
   resource attributes include links to the related attribute
   documentation.

bug:6442803

Change-Id: If8acedfedf02400eee3f61ca3029325c05a5fb86
2012-05-04 16:54:06 -07:00
Adam Powell
235554e845 am da6f2b54: am 9c982340: Merge "Fix LinearLayout measureWithLargestChild for wrap_content views" into jb-dev
* commit 'da6f2b54caedee4c5e9af86d49e6c95aee054340':
  Fix LinearLayout measureWithLargestChild for wrap_content views
2012-05-04 16:35:54 -07:00
Adam Powell
da6f2b54ca am 9c982340: Merge "Fix LinearLayout measureWithLargestChild for wrap_content views" into jb-dev
* commit '9c98234095a6894621d1c71e1c9e523c70f0f067':
  Fix LinearLayout measureWithLargestChild for wrap_content views
2012-05-04 15:03:36 -07:00
Adam Powell
9c98234095 Merge "Fix LinearLayout measureWithLargestChild for wrap_content views" into jb-dev 2012-05-04 15:01:14 -07:00
Adam Powell
eabc919844 Fix LinearLayout measureWithLargestChild for wrap_content views
Bug 6442795

When the measureWithLargestChild setting is enabled, LL used to
measure the full container taking the largest child rule into account,
but the child views were not properly remeasured for AT_MOST
measurespecs. Correct this.

Fix measureWithLargestChild for height

Change-Id: Ieb91114bc2ae65f9104337bd6d16a7d9e559571d
2012-05-04 14:54:14 -07:00
Amith Yamasani
3d3e7a5816 Javadoc improvements in SearchView per API review.
Bug: 6442174

Added attr refs to 2 methods.

Change-Id: I9b5f93e8e921a7260fdc25c8134e655f09a1ffb7
2012-05-04 14:47:25 -07:00
Fabrice Di Meglio
fc6ef88a3d am 8396830d: Merge "Hide RTL related APIs - DO NOT MERGE" into jb-dev
* commit '8396830d8fedc08c0a9de36bcce3c8b65691729f':
  Hide RTL related APIs - DO NOT MERGE
2012-05-04 13:21:59 -07:00
Fabrice Di Meglio
66388dcb09 Hide RTL related APIs - DO NOT MERGE
- fix bug #6441155 API review: @hide RTL layout APIs

Change-Id: I13c5ea5f579cecffed9d517f06180ab0576cd26a
2012-05-04 13:15:12 -07:00
Dianne Hackborn
a112461fdc am 610f310b: Merge "New permissions UI." into jb-dev
* commit '610f310b199ec0d93cb6e78106b029d7269015df':
  New permissions UI.
2012-05-03 19:05:24 -07:00
Dianne Hackborn
0e128bb2e0 New permissions UI.
Had to keep around a little of the old API for the device
admin settings UI to continue to use.

Change-Id: I84c5666a7f3fec0495eae196a0ffc2223c9e6f82
2012-05-03 19:00:23 -07:00
Adam Powell
b8eba14f13 am 43b8fd76: Merge "Fix nested cross-scrolling for ScrollView/HorizontalScrollView" into jb-dev
* commit '43b8fd76c03fe4d3c46919e98af91a18176c2654':
  Fix nested cross-scrolling for ScrollView/HorizontalScrollView
2012-05-03 11:02:56 -07:00
Adam Powell
43b8fd76c0 Merge "Fix nested cross-scrolling for ScrollView/HorizontalScrollView" into jb-dev 2012-05-03 11:00:53 -07:00
Adam Powell
b3e02c44d5 Fix nested cross-scrolling for ScrollView/HorizontalScrollView
Bug 6429006

Disallow intercepting touch events for parents of
ScrollView/HorizontalScrollView when scrolling begins. Properly
respect touch slop when the child of a ScrollView does not accept
touch events.

Change-Id: I2ce503ad5104d450829ed58cd2748c9163e020d3
2012-05-02 22:14:13 -07:00
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
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
Gilles Debunne
54562cfbcd Merge "Better horizontal internal scroll handling in Text." into jb-dev 2012-05-02 11:59:54 -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
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
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
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