Commit Graph

4453 Commits

Author SHA1 Message Date
Jean Chalard
11abbdcb78 am 7d8b87f0: Merge "Fix a CTS test" into lmp-preview-dev
* commit '7d8b87f0d9b35694099d5f57777d27f577496960':
  Fix a CTS test
2014-06-12 19:58:08 +00:00
Yohei Yukawa
2a97b54f49 am f09cb58d: Merge "Rename CursorAnchorInfoBuilder with Builder" into lmp-preview-dev
* commit 'f09cb58d5f528665e6e96d8740eeeeab4167e357':
  Rename CursorAnchorInfoBuilder with Builder
2014-06-12 19:58:02 +00:00
Adam Powell
c78f2f7fea am 22e41e9a: Merge "Enable collapsing empty Toolbar-based ActionBars above tabs" into lmp-preview-dev
* commit '22e41e9add1aeb0c8a79741f587c270752a50d16':
  Enable collapsing empty Toolbar-based ActionBars above tabs
2014-06-12 19:57:42 +00:00
Adam Powell
360c1d8922 Enable collapsing empty Toolbar-based ActionBars above tabs
Fixes a regression where Toolbar ActionBars would hold empty space
when previous platform versions would collapse to tabs-only.

Bug 15573337

Change-Id: I6da379d2ed58e8ba8cadcd727606c7fc160ecf91
2014-06-11 19:31:41 -07:00
Yohei Yukawa
13592c623c Merge "Rename CursorAnchorInfoBuilder with Builder" into lmp-preview-dev 2014-06-10 22:36:02 +00:00
Jean Chalard
1f3bb8477b Merge "Fix a CTS test" into lmp-preview-dev 2014-06-10 22:29:12 +00:00
Jean Chalard
0a993100f9 Fix a CTS test
SpannableStringBuilder should throw an exception when the
parameters to #insert and related methods are in the wrong
order.
We'll have to reopen b/9570771 and deal with it separately.

Bug: 14965397
Change-Id: I01847e0010d23f98ad3def8ba030d36570528900
2014-06-11 18:03:05 +09:00
Yohei Yukawa
c46b5f04aa Rename CursorAnchorInfoBuilder with Builder
Inner Builder class should not inherit full class name of outer
class.

BUG: 15516230
Change-Id: I2d56edebb0c85639db57ca5b2aadb22c67fc5926
2014-06-10 14:19:28 +09:00
Alan Viverette
830960cce0 Material theme
BUG: 15467097
Change-Id: I15191362e104a902895418fc615892c21db64c35
2014-06-06 15:48:55 -07:00
Alan Viverette
3cb07a462b DO NOT MERGE Material theme
BUG: 15467097
Change-Id: I15191362e104a902895418fc615892c21db64c35
2014-06-06 14:19:53 -07:00
Raph Levien
748a3779f3 am 455b351b: Merge "Make elegantTextHeight xml attribute public" into lmp-preview-dev
* commit '455b351bba515c3a7e6139368c4110abbf1e4e89':
  Make elegantTextHeight xml attribute public
2014-06-06 00:45:43 +00:00
Raph Levien
e1c4a0d299 Make elegantTextHeight xml attribute public
The elegantTextHeight attribute of TextView was made public through
Java code, but the corresponding attribute wasn't public. This patch
makes it so.

This is a fix for bug 15428791 "elegantTextHeight is hidden (not in
android.R.attr)"

Change-Id: I7011f10ae58fd2e212da9cbaca4a484f011d8fed
2014-06-05 22:30:37 +00:00
Craig Mautner
a0c808bb75 am d842513c: Merge "Launch document sharing into unique activities" into lmp-preview-dev
* commit 'd842513c3df5fd3e46a70ab6798b4d3d20c4ef0b':
  Launch document sharing into unique activities
2014-06-04 22:03:12 +00:00
Adam Powell
27f78dc7f2 am 45366a20: Merge "Fix EdgeEffect clipping and AbsListView\'s use of it" into lmp-preview-dev
* commit '45366a2036483d5beca5b9cffdb5acdae72d787a':
  Fix EdgeEffect clipping and AbsListView's use of it
2014-06-04 21:32:57 +00:00
Craig Mautner
4c6debb767 Merge "Launch document sharing into unique activities" into lmp-preview-dev 2014-06-04 21:13:06 +00:00
Adam Powell
9be22455ac Fix EdgeEffect clipping and AbsListView's use of it
Make sure that we clip the edge glow against the edges of the view and
not against padding. If we're clipping to padding already, this will
happen automatically.

Bug 15020863

Change-Id: I4645c92f2a372d3c9fa8bb5a9fda44c0d82ac4cf
2014-06-04 13:46:55 -07:00
Alan Viverette
7820b7bf5d am 4dd60289: Merge "Fix RadialTimePicker styling" into lmp-preview-dev
* commit '4dd60289af766c9a256b57a3d1a8662131d28230':
  Fix RadialTimePicker styling
2014-06-04 18:45:24 +00:00
Adam Powell
a649e8def9 am 5519852e: Merge "Implement action bar tab mode for Toolbar-based decor action bars" into lmp-preview-dev
* commit '5519852e01a646af65efeee30f5b8e80c2cd87e7':
  Implement action bar tab mode for Toolbar-based decor action bars
2014-06-04 18:45:04 +00:00
Alan Viverette
22b893fde1 Merge commit '096d52fb' into manualmerge
Conflicts:
	api/current.txt

Change-Id: Iaf1f9172a73e74885475c30ffefcb7d0e32a5883
2014-06-04 11:42:06 -07:00
Craig Mautner
2c60de3f6d Launch document sharing into unique activities
If the same item is shared twice (or more) a new activity for
sharing will be launched each time. Previously the first sharing
activity would be reused.

Fixes bug 14903271.

Change-Id: Ib9e618f3d42079836529e86c138a6c999350cac5
2014-06-04 11:06:42 -07:00
Alan Viverette
eb1d3798e3 Fix RadialTimePicker styling
Also sneaks in some whitespace cleanup for PhoneWindow!

Change-Id: I1bc8a889a59d69ae80b6cfbf54d57cd7f8ad4a36
2014-06-03 18:36:03 -07:00
Adam Powell
e002c2fb39 Implement action bar tab mode for Toolbar-based decor action bars
Coordinate between the stacked row, etc. Also fix a silly bug in
Toolbar child views with Gravity.BOTTOM.

Bug 15332084

Change-Id: Ie91b7d5255c63d9befcc65d7939c1523e018809f
2014-06-03 17:58:22 -07:00
Alan Viverette
dcf7b59f84 Update theme colors, fix EditText state transition
BUG: 11218747
BUG: 15200201
Change-Id: I94368897ea9466ae971b25fc80d6ca43433aadd5
2014-06-03 14:43:38 -07:00
Alan Viverette
02a078d088 am 25931ade: Merge "Clean up drawable theming APIs" into lmp-preview-dev
* commit '25931adee5ba954220190f48901bb66c8c9dd462':
  Clean up drawable theming APIs
2014-06-03 17:16:27 +00:00
Alan Viverette
6dbe51b50e Clean up drawable theming APIs
Removes APIs for themed creation of a drawable from a stream, since
that doesn't involve any inflation. Also cleans up tinting methods
left over from previous clean up.

BUG: 15089957
Change-Id: I2af7aa9a6d351ae61b33ee1216c674fae1bffe11
Signed-off-by: Alan Viverette <alanv@google.com>
2014-06-02 16:39:04 -07:00
Adam Powell
535499204b am 16b0baa4: Merge "Further implementation for ToolbarActionBar" into lmp-preview-dev
* commit '16b0baa45bd68bb05863d3a6e92b7e8e0b452cb2':
  Further implementation for ToolbarActionBar
2014-06-02 00:25:41 +00:00
Adam Powell
9558232a2e Merge "Further implementation for ToolbarActionBar" into lmp-preview-dev 2014-06-02 00:23:16 +00:00
Adam Powell
07a74548ae Further implementation for ToolbarActionBar
Integrate activity options menu and inline Toolbars. Fix a series of
small associated bugs.

Activities now (privately) offer several menu-related events directly
to the associated ActionBar. In the future this should help us
untangle some of the menu-based pasta in PhoneWindow.

Bug 15344598

Change-Id: I76211ad17d2bcbb58cf1d88914e855416d084ded
2014-06-01 17:15:42 -07:00
Alan Viverette
c65c7ae635 Merge commit '6682183b' into manualmerge
Conflicts:
	core/res/res/values/public.xml

Change-Id: Ic91db6ee85dcd8a6b13716b600b04c78ceac4b33
2014-06-01 16:44:28 -07:00
Alan Viverette
4d2f2483f6 Fixes hotspot list transitions, update to use a single hotspot
Also updates background and button colors to match spec, removes
dependency on bouncycastle Arrays. Vastly simplifies ripple drawing.
Adds APIs for maximum ripple radius. Makes selectableItemBackground
bounded by default and adds an unbounded version and theme attribute.

BUG: 15315168
BUG: 15314684
BUG: 15314830
BUG: 15316768
BUG: 15333033
BUG: 15344050
Change-Id: Ib0619587ce78e43056b66571bae185e0f1613185
2014-06-01 15:58:04 -07:00
Elliott Hughes
f8abeb8457 resolved conflicts for merge of 04c987a8 to master
Change-Id: I27912e203e4d4e39aef6ffbb58b0934a2796ddfe
2014-05-30 20:13:15 -07:00
Elliott Hughes
04c987a806 am 79067b3c: am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API."
* commit '79067b3cb2f43e62b9a4d46082fb01cbcc513990':
  Move frameworks/base off private libcore.ICU API.
2014-05-31 02:29:47 +00:00
Elliott Hughes
79067b3cb2 am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API."
* commit '5568e0e45fff7ffe5061770cb527b22d09cf5519':
  Move frameworks/base off private libcore.ICU API.
2014-05-31 02:26:36 +00:00
Elliott Hughes
570f44b4ab Move frameworks/base off private libcore.ICU API.
Change-Id: I55355b7ea68174063f31d6bb08a71bcb9dc76d62
2014-05-30 19:20:20 -07:00
Adam Powell
fb50dd580d am 8ce8cb05: Merge "Collapse contentInsets and View margins in Toolbars" into lmp-preview-dev
* commit '8ce8cb05143964700d85067fc88ae914f382f0c4':
  Collapse contentInsets and View margins in Toolbars
2014-05-31 02:00:36 +00:00
Adam Powell
7a32401c2a Collapse contentInsets and View margins in Toolbars
As content insets are meant to help line up the edges of views with
the content in adjacent ViewGroups, collapse individual view margins
with the insets to preserve this property. Margins still define a
minimum spacing between adjacent sibling views or the edges of the
Toolbar container.

Bug 15328526

Change-Id: I786ccdbed6b40930250fa22e2a6d0376d759f2d2
2014-05-30 18:52:37 -07:00
Adam Powell
92bcf31f54 am 338382de: Merge "Fix action bar title TextAppearance usage for Toolbar decor" into lmp-preview-dev
* commit '338382de18d9df699c15eb9adbaaa50d8a6664fd':
  Fix action bar title TextAppearance usage for Toolbar decor
2014-05-30 23:25:23 +00:00
Adam Powell
ebba5d4edd Fix action bar title TextAppearance usage for Toolbar decor
Pass through the appropriate action bar styles for title/subtitle
TextAppearance.

Bug 15345937

Change-Id: I93c648cf60b4a63498d127dbd6eac2c1fae33aa7
2014-05-30 16:19:16 -07:00
Adam Powell
7d330757d9 am ee1a3f16: Merge "Fix for setting Toolbar content descriptions" into lmp-preview-dev
* commit 'ee1a3f1612cb69fe5567bf7cde2496a4774ab8ed':
  Fix for setting Toolbar content descriptions
2014-05-29 19:27:17 +00:00
Adam Powell
8e5372fe93 Fix for setting Toolbar content descriptions
Allow resid 0 as a null content description.

Change-Id: I0663feac229a77d5efffece2bd686de4ee99d840
2014-05-29 12:16:09 -07:00
Adam Powell
88e719fd3e am 49a4961e: Merge "Toolbar factoring and ActionBar functionality integration" into lmp-preview-dev
* commit '49a4961efde042f4921393f59cff86c2b7889c71':
  Toolbar factoring and ActionBar functionality integration
2014-05-28 23:07:25 +00:00
Adam Powell
e021e6ed89 Toolbar factoring and ActionBar functionality integration
Toolbars now can act in the role of ActionBar with the exception of
navigation modes. Expandable action views are now supported as well as
populating menu items from a host window.

Change-Id: If477db9c7ad9f95723f28cf73cbf03a07ce9d6ad
2014-05-28 12:36:38 -07:00
Philip Milne
dea890fa64 More on weights in GridLayout
Chance as little as possible from existing. If weights are defined only a
subset of the views in a layout (the normal case) leave the layout of the
remaining views unaffected.

Change-Id: I27473e303c0666930e2fb515b794df96a8b97272
2014-05-24 21:02:45 -07:00
Philip Milne
4885f2f773 More on adding support for weights to GridLayout
Remove fields that are not needed with view-based allocation.

Change-Id: I23dc75fea47c532ad46e23b7fb14ff8e46c68db1
2014-05-24 06:14:27 +00:00
Philip Milne
9505480ee3 More on weighted space distribution in GridLayout
This CL changes the weight distribution algorithm to act on views rather
than rows/columns. This is a more general mechanism that is simpler to
define.

Change-Id: Ifa5adbe0b0a9a9ae271616321385f8e926aba054
2014-05-23 19:50:40 -07:00
Alan Viverette
de220369c6 am e11794a2: Merge "Update switch, checkbox, radio button, button, and toggle button" into lmp-preview-dev
* commit 'e11794a2c1af70a265b6476ce3f3587814e9f0b3':
  Update switch, checkbox, radio button, button, and toggle button
2014-05-23 17:36:23 +00:00
Alan Viverette
2356c5e69b Update switch, checkbox, radio button, button, and toggle button
Add optical inset support to BitmapDrawable with gravity. Fix optical
inset support in DrawableContainer. Fix visibility change support in
AnimatedStateListDrawable. Adds a whole bunch of missing drawable
support to CheckedTextView.

BUG: 15127013
BUG: 15126976
BUG: 15125529
BUG: 15025806
BUG: 14597955
BUG: 14594498
BUG: 15152746
Change-Id: Id2d99e10838d25b6f927ca1e49996c8da8e78ab1
2014-05-22 22:43:59 -07:00
Philip Milne
87260844af Support for weights in GridLayout
Change-Id: I31993cb7da331e0bcf404e858f2438a579093e7d
2014-05-22 17:41:53 -07:00
Alan Viverette
d6a91b0bb6 Merge "Fix password obscuring in TextView accessibility node" 2014-05-19 23:56:06 +00:00
Alan Viverette
c80ad99a33 TouchFeedbackDrawable is now RippleDrawable
Change-Id: I59f5f04b73089215c6320560556ac21beb03db06
2014-05-19 16:27:31 -07:00