Commit Graph

6468 Commits

Author SHA1 Message Date
Siyamed Sinir
0923b063c4 Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c am: 8ae06f6f3a
am: 68d3077e9a

* commit '68d3077e9a11c96d118834563fa283b3ead4f1a7':
  setTransformationMethod should reset mTextDir

Change-Id: I46a1f5e356992bd08ba440fce0e15b952541d547
2016-05-20 18:07:06 +00:00
Siyamed Sinir
68d3077e9a Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c
am: 8ae06f6f3a

* commit '8ae06f6f3a4fa787ddab9859bc680e63b38686aa':
  setTransformationMethod should reset mTextDir

Change-Id: Ib0c29292f24c049acb3c61baf68ae3df970610c1
2016-05-20 18:02:39 +00:00
Siyamed Sinir
df9dee869c Merge "setTransformationMethod should reset mTextDir" into nyc-dev 2016-05-20 17:46:27 +00:00
Siyamed Sinir
d55be2b9d5 setTransformationMethod should reset mTextDir
When transformation method is set via API, text direction heuristics has
to be reset since for PasswordTransformationMethod it is set to LTR. Not
resetting it causes inconsistencies with the remaining of the TextView.

Bug: 28562779
Change-Id: I225e35e39bde60d4296852ff17b107d5b7b99f8a
2016-05-19 18:30:38 -07:00
The Android Automerger
1ec2fd72ce stephenli@ manually merge many commits up to '032dcff'
* commit '032dcff': (22 commits)
  Remove outdated google services links.
  Fix misc-macro-parentheses warnings in services jni.
  Fix misc-macro-parentheses warnings in hwui and graphic jni.
  Fix misc-macro-parentheses warnings in aapt and androidfw.
  docs: Update to column widths for Complications table
  Fix a11y crash when window layer isn't unique.
  Never set resized while not drag resizing for pinned stack.
  While turning OFF do not honor ON requests.
  Fix GATT autoConnect race condition
  Fix GATT autoConnect race condition
  Fix RTL issue in delete dialog.
  Incorporate feedback on new wallpaper-related APIs
  Mapping up/down of legacy Gps vs. Gnss Status
  Fixed a bug where the chronometer was invisible
  Fixed a bug where the chronometer wasn't updating the time
  Update BlockedNumberContract javadocs.
  [RenderScript] Fix ScriptIntrinsicBlur documentation.
  Update documentation about copyTo and copyFrom.
  DO NOT MERGE Cherry pick libpng usage fixes
  Start the Wear Time System Service with SystemServer
  ...
2016-05-19 23:51:32 +00:00
Selim Cinek
8e8aa4ec4d Merge "Fixed a bug where the chronometer wasn\'t updating the time" into nyc-dev
am: 0676196be2

* commit '0676196be2657fdf265fa7ad1eae3eecf1bbfebc':
  Fixed a bug where the chronometer wasn't updating the time

Change-Id: I16327b27bcfce8eaeb18cbddd420bb134cff1e45
2016-05-19 20:45:20 +00:00
TreeHugger Robot
0676196be2 Merge "Fixed a bug where the chronometer wasn't updating the time" into nyc-dev 2016-05-19 20:39:34 +00:00
Michael Wright
ce290a75f2 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I03543851263b7e9e2f84b179d66d3d269c48bf6c
2016-05-19 15:12:29 +00:00
TreeHugger Robot
a1e0cebf3a Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 2016-05-19 15:03:36 +00:00
Selim Cinek
a2a0171e7c Fixed a bug where the chronometer wasn't updating the time
When the countdown was set to true and the chronometer was set to
count down it wasn't updating the time, which is now fixed.

Change-Id: I4887d9eb09193c5636070edee9ba1bd13b9a23b5
Fixes: 28829131
2016-05-18 16:59:07 -07:00
Sunny Goyal
64148406d1 Merge "Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply." into nyc-mr1-dev am: d2d8e9b228
am: fcdbde4caa

* commit 'fcdbde4caa547087d82830647517c411e216626f':
  Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply.

Change-Id: Ia4cd711147fa865a18177f98b792181d71c71acd
2016-05-18 23:24:36 +00:00
Sunny Goyal
d2d8e9b228 Merge "Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply." into nyc-mr1-dev 2016-05-18 23:13:00 +00:00
Sunny Goyal
49e6695c5c Store the appropriate layout id for the infrated view, so that
it can be used for verification during reapply.

Bug: 28815495
Change-Id: I8516661ef97f529851069331a6c2bb64429c7766
2016-05-18 16:11:11 -07:00
Yohei Yukawa
af15c8bcae Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681
am: bf4c8f730b

* commit 'bf4c8f730b167e5ee65ed7c59dfa1d7867b63fcc':
  Move LocaleList to avoid layering violation.

Change-Id: I78fee5269f7428e34b196573575784fc15cb1372
2016-05-18 02:25:10 +00:00
Yohei Yukawa
23cbe85610 Move LocaleList to avoid layering violation.
Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.

Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
2016-05-17 16:42:58 -07:00
Michael Wright
f9d9ce7705 DO NOT MERGE Rename PointerIcon and Pointer Capture APIs
This is a response to API council feedback.

Bug: 26830970
Change-Id: Ia2d284b5c1ab8365bedfdc37d129be4b8146036b
2016-05-17 18:02:32 +01:00
Alan Viverette
1782b8e7db Merge "Use standalone capitalization for month labels" into nyc-dev am: 895241170b am: cee6b62ce8
am: a9c50001aa

* commit 'a9c50001aa0928f879d29c2dbbdd67591d510c47':
  Use standalone capitalization for month labels

Change-Id: I34b06d007ffb330576278865cf7935e2f3f9cab6
2016-05-16 19:49:56 +00:00
Alan Viverette
c3e5a82691 Use standalone capitalization for month labels
Bug: 28020439
Change-Id: I85169a78142a43ff2348e0b561a7aa995544a65e
2016-05-16 13:35:56 -04:00
Ian Rogers
9ac4734714 Merge "Remove @Nullable from primitive/void types." 2016-05-12 18:53:05 +00:00
Alan Viverette
554b420568 Merge "Remove extra logging in DatePicker" into nyc-dev am: c952b035b2 am: a6c89dd6a0
am: 4f440347f5

* commit '4f440347f5df680e982dc530c50c763b1fa438f3':
  Remove extra logging in DatePicker

Change-Id: Ic299258ab626085c28277e9e67a81c7f6c76186f
2016-05-12 15:07:32 +00:00
Alan Viverette
c952b035b2 Merge "Remove extra logging in DatePicker" into nyc-dev 2016-05-12 14:57:58 +00:00
Yigit Boyar
10536069c1 Merge changes I6e3f4da2,I8acfbd1a into nyc-dev am: 1a97cbd4ca am: c8777a833a
am: cac41c969f

* commit 'cac41c969f9c465b99e74d8ca87eb0d1237c4c52':
  Fully detach unused scrap views
  Remove detached headers

Change-Id: I6cd68f318a4110322c109a32a49d67cb2a7e0d14
2016-05-12 00:42:13 +00:00
Yigit Boyar
1a97cbd4ca Merge changes I6e3f4da2,I8acfbd1a into nyc-dev
* changes:
  Fully detach unused scrap views
  Remove detached headers
2016-05-11 22:32:05 +00:00
Alan Viverette
efb8e576a9 Remove extra logging in DatePicker
Issue seems to be fixed now, don't need the extra logging.

Bug: 27310206
Change-Id: Ibf53d056e9c5144729dae02c72050aebd90e4343
2016-05-11 17:10:13 -04:00
Robert Carr
73c227d1de Merge "PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS" into nyc-dev am: a625b0b597 am: e49ecf58e9
am: e23f0f9f0f

* commit 'e23f0f9f0fefc06efcfcd5e44decdd7384496c05':
  PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS

Change-Id: I14da04a61d5db39379712ccb83023e103b09e4bf
2016-05-11 16:54:18 +00:00
Robert Carr
bf9e17b181 PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS
If we intend to clip to the screen we can't pass NO_LIMITS.
Luckily the default behavior for LAYOUT_IN_PARENT_FRAME is to not
clip to the parent frame, so we don't have to do anything except
update our local flag we use for explicit size calculations.

Bug: 28194524
Change-Id: I1465efce7f5412cf646bccd83e23a4b049f4dbc4
2016-05-10 13:56:21 -07:00
Yigit Boyar
9afbf9ceb7 Fully detach unused scrap views
This CL fixes a bug in list view where an unused
scrap view would stay in temporarily detached
state until it is re-used.
It is an invalid state for a view and to fix
that issue, I've changed AbsListView to fully
detached scrap views at the end of a layout
pass and also treat them as regular new views once
they are re-used after being fully detached.

Bug: 28672259
Change-Id: I6e3f4da29f8cbca32787862402f5c21f674a7145
2016-05-10 10:49:39 -07:00
Ian Rogers
81c18e6f99 Remove @Nullable from primitive/void types.
Erroneous use of @Nullable caught by error prone.
Bug: 27723540

Change-Id: Ida76b2fd221142980da5c018e57c96cc6920ebc0
2016-05-10 09:46:09 -07:00
Yigit Boyar
b742b87a6b Remove detached headers
ListView was leaving header and footer views
in the detached state, which is a problem because
no view should be left in that state after a layout
calculation. This was also causing the view to never
received detached-from-window callback if
the ListView is detached while the header is not
visible.

This CL fixes an issue by traversing fixed views
and removing the ones that match the criteria.
To keep the behavior as similar as possible,
we still do not call startTmpDispatch on
fixed views unless we'll remove them.

Bug: 24490656
Change-Id: I8acfbd1a9d9b8b24c1c4b7692ef82cfe0f4d43a8
2016-05-09 11:45:57 -07:00
Alan Viverette
48fd9ed7d7 Merge "Cancel animation and jump to current state if not animating picker" into nyc-dev am: d8c38b892b am: 3f9d17fbe1
am: 93b15870d5

* commit '93b15870d52e9115225b5cc1c9b7fb78b2b9500b':
  Cancel animation and jump to current state if not animating picker

Change-Id: Ic72675504ac72cd1b19ec8049fd56b3f54401b72
2016-05-09 14:22:20 +00:00
Alan Viverette
32f7dab282 Cancel animation and jump to current state if not animating picker
Bug: 28629631
Change-Id: I0e1b3c2f2c774e027f2df8c9ab75c7a89bd2ddb7
2016-05-06 15:31:23 -04:00
Siyamed Sinir
b4b8740aed Request re-layout after setText if layout width is 0
When TextView is in a layout with weight params (i.e. LinearLayout) and
the width is set to 0, do not try to prevent requestLayout.

Bug: 27995311
Change-Id: I6f98f0ac8260bfa98147157f5b73e87308c7efab
2016-05-05 16:48:52 -07:00
Alan Viverette
4b5f0abb5f Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev am: 3a3fb73c75 am: ff71f781a3
am: 91aefd574c

* commit '91aefd574c24ac84f77319163249156baa2fab2b':
  Revert "Always assign leftover pixels to last weighted child"

Change-Id: I020369fa95fc497d3551678b815dba50d64085a6
2016-05-05 19:03:37 +00:00
Alan Viverette
61c41bf617 Revert "Always assign leftover pixels to last weighted child"
This reverts commit cc26636f08.

Bug: 27690033
Change-Id: Ib7084dd8961cd486de4e6b13e36da7be887b1835
2016-05-05 17:54:36 +00:00
Alan Viverette
363a5d1f2a Merge "Always assign leftover pixels to last weighted child" into nyc-dev am: a11c21b412 am: 9204810e66
am: 8902b96225

* commit '8902b962250439c5a0f80b3cca4c39bc9ee0fa73':
  Always assign leftover pixels to last weighted child

Change-Id: Ib229a7cc5550942eb094c8d549711129af8594a0
2016-05-05 02:34:30 +00:00
Alan Viverette
cc26636f08 Always assign leftover pixels to last weighted child
Bug: 27690033
Change-Id: Ibee51d49d3f7aa923750ce330df2e1aa2156f2bd
2016-05-04 16:59:38 -04:00
Keisuke Kuroyanagi
0a9e750483 Merge "Show drag handles after finishing batch edit if needed." into nyc-dev am: be1cd9f5ce am: 5496ec1875
am: 8615fdf80c

* commit '8615fdf80c2c09d3d4d956cf8ba9271331c631a5':
  Show drag handles after finishing batch edit if needed.

Change-Id: I6461dfd0a53a23d54cc2e9cbac7ba429f67d4a2f
2016-05-04 00:44:30 +00:00
Keisuke Kuroyanagi
be1cd9f5ce Merge "Show drag handles after finishing batch edit if needed." into nyc-dev 2016-05-04 00:22:58 +00:00
Siyamed Sinir
8cd69a4c48 Merge "Revert "Request re-layout after setText if layout width is 0"" into nyc-dev am: c18009e6dd am: 553aae2501
am: 668504731e

* commit '668504731ee79e4b0248a868fa229546823ae020':
  Revert "Request re-layout after setText if layout width is 0"

Change-Id: I9511aced9abc8d8c250959069bfe8a862eb29689
2016-05-03 21:37:58 +00:00
Siyamed Sinir
c18009e6dd Merge "Revert "Request re-layout after setText if layout width is 0"" into nyc-dev 2016-05-03 21:22:18 +00:00
Siyamed Sinir
1f575b890e Revert "Request re-layout after setText if layout width is 0"
This reverts commit 375366cb2d. 

Bug: 28523980
Change-Id: Ib4dd00eabaf7b5630b18373cc1d7bec61c0e155d
2016-05-03 20:35:35 +00:00
Keisuke Kuroyanagi
990b78d96e Merge "Adjust touch position for handles using window coordinate." into nyc-dev am: f2f8e65f98 am: cd425fa2b6
am: c8196bf536

* commit 'c8196bf5364b7a99379bdb8c5bfebc4b3fa376d9':
  Adjust touch position for handles using window coordinate.

Change-Id: I620bcae3dd995465a4485823b60d85e9a15dfcc0
2016-05-03 02:37:09 +00:00
Keisuke Kuroyanagi
f2f8e65f98 Merge "Adjust touch position for handles using window coordinate." into nyc-dev 2016-05-03 02:29:07 +00:00
Keisuke Kuroyanagi
c6fad96b59 Show drag handles after finishing batch edit if needed.
Drag handles are blocked from being shown if batch edit mode is active
when onPreDraw is called; however, IME can start and end batch edit
mode regardless of onPreDraw timing.
As a result, drag handles are sometimes not shown even if selection is
created and text action mode is started.

With this CL, drag handles are shown after finishing batch edit mode
if the handles were blocked from being shown in the above case.

Bug: 28366507
Change-Id: I7f099d0626bee70a63bb14bc75eefc2551a52d53
2016-05-02 15:11:41 +09:00
Alan Viverette
9ad9ff2d4c Merge "Maintain internal consistency for TimePickerClockDelegate hour" into nyc-dev am: 7544ac22e4 am: acddbbcb21
am: 65f6b02623

* commit '65f6b026239eff382a5a2385f1b9fa9251269bf3':
  Maintain internal consistency for TimePickerClockDelegate hour

Change-Id: I10366582f980d2892ea5ffcfd23331653be8e023
2016-04-29 15:29:42 +00:00
Kirill Grouchnikov
9df0846498 Aligning behavior of LinearLayout divider APIs
Consistency for:
* Early return on calling setter with the current state
* Calling setWillNotDraw when divider is configured with drawable
and visible
* Calling requestLayout to trigger a relayout pass

Also fix a bug that wouldn't show end divider when all non-GONE
children have 0 width/height.

Bug: 28398719
Bug: 28404367
Change-Id: I16796c74a52ac4c3041390c75add2ec3c33bea8b
2016-04-28 15:22:47 -04:00
Alan Viverette
2a993b4f6d Maintain internal consistency for TimePickerClockDelegate hour
Hour was not updated correctly when a new hour was selected using the
radial picker or when AM/PM was changed, which prevented programmatic
calls from working.

Bug: 28398738
Change-Id: I0c1ffd9f9e569d980e72e74dc62568a56930afc4
2016-04-28 12:56:09 -04:00
Andrei Stingaceanu
2f69c097d9 Merge "Fix ListView losing scroll position" into nyc-dev am: adde076 am: c3176ea
am: 0946a58

* commit '0946a5805c1b4ad6c9782574e2ebfaaf1b27819c':
  Fix ListView losing scroll position

Change-Id: I2f2effa5e276e33311ed40824b292065be71c4ab
2016-04-28 09:32:59 +00:00
Clara Bayarri
adde076fcb Merge "Fix ListView losing scroll position" into nyc-dev 2016-04-28 09:20:47 +00:00
Keisuke Kuroyanagi
e2a3b1edd9 Adjust touch position for handles using window coordinate.
Touch position is adjusted in HandleView#onTouchEvent to snap to
ideal offset.
Previously, screen coordinate was used for input, but window
coordinate is used for the ideal offset. As a result, window adjusted touch
position will be adjusted to improper position and a handle being
dragged will get moved to unintended line.

Bug: 22308836

Change-Id: I4a5a3cc695a874c85aa341f06ffcba8b7f5e318c
2016-04-28 12:55:18 +09:00