Commit Graph

6436 Commits

Author SHA1 Message Date
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
Alan Viverette
9cd773733c Merge "Always account for divider height when calculating list height" into nyc-dev am: fab88ea am: 958f6002
am: de613b2

* commit 'de613b2860b9ba3c916061876a3bf2fdd8123662':
  Always account for divider height when calculating list height

Change-Id: I1abfe8823e029d3c52c629a32b351f6b9985d134
2016-04-27 23:25:31 +00:00
Alan Viverette
fea4013499 Always account for divider height when calculating list height
List items are always positioned using the divider height, even if there
is no divider drawable, so we should account for that when calculating
list height.

Bug: 28402970
Change-Id: I14b8d3b04a369749ff4b7e6f1e6e003ac08f6b7f
2016-04-27 16:31:33 -04:00
The Android Automerger
8bdf39e19c Manually merge branch 'nyc-mr1-dev-plus-aosp' to fix automerger blockage b/28407115 2016-04-27 17:58:24 +00:00
Phil Weaver
7a61d6031b Merge "Fix crash with a11y set text with text filters." into nyc-dev 2016-04-27 16:49:27 +00:00
Andrei Stingaceanu
cf38110526 Fix ListView losing scroll position
Restrict restoring the selected position when AdapterView
gets restored for Spinner instances only.

Bug: 26991402
Bug: 23619366
Change-Id: Ib002eac5ed0b8810a3e9988ad36f03450cb03b9b
2016-04-27 11:29:26 +01:00
Phil Weaver
6dde7e75e8 Fix crash with a11y set text with text filters.
A text filter may shorten the text, so we need to use the text
that's actually in the View, not the text we requested, to move
the selection.

Also removing the override of performAccessibilityActionInternal,
which should have been done as part of adding text actions initially.

Bug: 28253708
Change-Id: I184f49dcba0238f4ccc222597cefca258393b263
2016-04-26 17:01:29 -07:00
Alan Viverette
4b8994aa30 Merge "Apply tint when setting check mark drawable" into nyc-dev am: fff349d am: bed34a7
am: 50b5ba6

* commit '50b5ba61b5730fe82f9ad9da61953b4daa2f21aa':
  Apply tint when setting check mark drawable

Change-Id: I1207ab3c4388be1150712df614238fac49160019
2016-04-26 17:33:12 +00:00
TreeHugger Robot
fff349ddba Merge "Apply tint when setting check mark drawable" into nyc-dev 2016-04-26 17:17:05 +00:00
Alan Viverette
28fabe5e87 Apply tint when setting check mark drawable
Bug: 28373624
Change-Id: Ieb5be55c63b168ab18302836f28cd5cedc06c4d8
2016-04-25 13:15:39 -04:00
Seigo Nonaka
39abb7cf51 Merge "Fix unexpected truncation again." into nyc-dev am: ab8913e am: 33ed899
am: b900d9f

* commit 'b900d9f77c30c92ee446c9abde81f2b0f4303f64':
  Fix unexpected truncation again.

Change-Id: I7fd698ce618c43745184883137772b776bc6166d
2016-04-25 03:52:15 +00:00
Seigo Nonaka
ab8913e364 Merge "Fix unexpected truncation again." into nyc-dev 2016-04-25 03:36:30 +00:00
Svet Ganov
879f5ba3f7 Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev am: c947ebd am: 70d720c
am: 13da561

* commit '13da5613e2fce0ca2d5682fd202234856d2206e9':
  Cleanup of the PackageInstaller API - Frameworks

Change-Id: Ibe4a6258c6437a9e86ed25e242301ca6d6635d26
2016-04-22 22:35:29 +00:00
Svet Ganov
ae0e03a9e0 Cleanup of the PackageInstaller API - Frameworks
The PackageInstaller app manages side-loading apps as well
as permission management. It should be updatable, hence
should rely on system APIs to talk to the platform. This
is the first step of defining an API boundary.

Change-Id: I9814eafd0b22ae03b4b847a7007cdbf14c9e5466
2016-04-22 14:18:32 -07:00
Seigo Nonaka
77972bbf2c Fix unexpected truncation again.
Unexpected truncation happens again after [1].
This is fixed by setting match_parent into the container LinearLayout.

For the unexpected truncation of Holo Theme is came from other but
related root cause. To calculate the window and container width,
need to add container padding in addition to the maximum width of
the text view. Otherwise the width of the container view will be
shrunk and the contents will be truncated. This only happens on
Holo Theme since the padding of the container is zero on Material
Theme.

I manually confirmed this CL doesn't revive following issues
- 28034210
- 27341560

[1]: I67886a752ef110d3433dddd6aa8447a9027f8e19
[2]: I69b258687b4bf5510d9b2c3e690c88106bf893f5

Bug: 28266493
Bug: 28281740
Change-Id: Ie6d274714ac08080dc22aeb8ecd8b7729cb634cd
2016-04-22 19:06:53 +09:00
Selim Cinek
b0f63057fc Merge "Fixed a bug where notification header could become empty" into nyc-dev am: 57e4a67be1 am: 0aef73a252
am: c93f4b6707

* commit 'c93f4b67076b683c463ab949d6087b41303bc06c':
  Fixed a bug where notification header could become empty

Change-Id: Ifb5e38f663973c62211249edcccdd0d72c754f1c
2016-04-22 05:46:40 +00:00
Selim Cinek
57e4a67be1 Merge "Fixed a bug where notification header could become empty" into nyc-dev 2016-04-22 05:33:33 +00:00
Selim Cinek
65080a64df Merge "Changed the name of chronometer countdown" into nyc-dev am: 8f32cd4306 am: ba26bf8a47
am: 5e2a3e5872

* commit '5e2a3e5872e8439ad836b5b281e6393ecefb50f4':
  Changed the name of chronometer countdown

Change-Id: Ibce68e45c56e90ee66b7a7d2fbfc0350178885fa
2016-04-22 03:47:25 +00:00
Selim Cinek
8f32cd4306 Merge "Changed the name of chronometer countdown" into nyc-dev 2016-04-22 03:21:52 +00:00
Selim Cinek
2490b38795 Merge "Switched the notification time to relative time" into nyc-dev am: 037235d83e am: 832775b7f3
am: 22ac656218

* commit '22ac65621885412c1e90594644b98281f36b64e7':
  Switched the notification time to relative time

Change-Id: Ib4a88c9e7b47bc5f9c586cc49a6eb97ad98fe642
2016-04-22 00:23:54 +00:00
TreeHugger Robot
037235d83e Merge "Switched the notification time to relative time" into nyc-dev 2016-04-21 23:47:23 +00:00
Selim Cinek
b85f36fd48 Fixed a bug where notification header could become empty
Also fixed a few more issues with the header util that could
lead to wrong states.

Change-Id: I95c3479f5d9e5221ee9e91120271e7957b887607
Fixes: 28295743
2016-04-21 15:07:10 -07:00
Selim Cinek
c3b752e712 Changed the name of chronometer countdown
Change-Id: Ie0339205b26f2dff40e0c19760750a0ce6aaf7da
Fixes: 28295825
2016-04-21 15:07:08 -07:00
Selim Cinek
36d570863a Switched the notification time to relative time
The time is now displayed in a relative manner instead
of absolute.

Change-Id: Idcc4411ed07991b6e176c4890a0d804394d8598a
Fixes: 27435284
2016-04-21 15:07:06 -07:00
Vladislav Kaznacheev
4465add3e1 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev am: 729c640cc8 am: 45b1e14468
am: 0ee7fecd43

* commit '0ee7fecd437b4ba4676985e072c940a819d46114':
  Rename DropPermissions to DragAndDropPermissions

Change-Id: Id978e6f65b915955d1caff4825d89373f248d168
2016-04-21 21:48:10 +00:00
Hyunyoung Song
18956a3d6f Merge "Fix broken build due to @RemotableViewMethod" into nyc-dev am: 44157a4abf am: 84e85f2e56
am: 035b1d1c27

* commit '035b1d1c27a85ccb83c425e0e76458ee5c9db42c':
  Fix broken build due to @RemotableViewMethod

Change-Id: If70a4a63991756b7d8bec8236be09caa7705882e
2016-04-21 21:48:07 +00:00
Vladislav Kaznacheev
729c640cc8 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev 2016-04-21 21:34:26 +00:00
Hyunyoung Song
44157a4abf Merge "Fix broken build due to @RemotableViewMethod" into nyc-dev 2016-04-21 21:32:38 +00:00
Alan Viverette
ed276c145c Merge "API review feedback for ProgressBar" into nyc-dev am: 5500bb1d6d am: c1a3af4546
am: 06f931e8ea

* commit '06f931e8eae92cbfb24983502d9cdf41f1284dad':
  API review feedback for ProgressBar

Change-Id: I8a38db908a3b01b33787d4f9e2c6483b3c325ef6
2016-04-21 21:31:35 +00:00
Hyunyoung Song
3a93f0ff37 Fix broken build due to @RemotableViewMethod
Change-Id: I63c6cb4fa68df114220efb2f263115e773e25f5d
2016-04-21 14:26:54 -07:00
Alan Viverette
5500bb1d6d Merge "API review feedback for ProgressBar" into nyc-dev 2016-04-21 21:21:56 +00:00
Hyunyoung Song
e4aabe62ff Merge "add @RemotableViewMethod to TextView#setEnabled b/28304068" into nyc-dev am: 22d91b0eb4 am: b99a507ec0
am: 6d9221ed9b

* commit '6d9221ed9bd4413d9c6bf43ac56c2849e34676bd':
  add @RemotableViewMethod to TextView#setEnabled b/28304068

Change-Id: I6c2721de82645f49b4fec6f99902b98a81d4ebe6
2016-04-21 21:11:15 +00:00
Hyunyoung Song
22d91b0eb4 Merge "add @RemotableViewMethod to TextView#setEnabled b/28304068" into nyc-dev 2016-04-21 21:04:25 +00:00