Jorim Jaggi
cb17416a8d
am 0da89b76: resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp
...
* commit '0da89b76402816dade084166a97b1d352ae1f78b':
Fixed several time related states for secondary users
2014-11-25 15:04:28 +00:00
Jorim Jaggi
0da89b7640
resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp
...
Change-Id: I8f1dbae2ecd14ae4e51a9e86eb6d36dd56a48be1
2014-11-25 15:34:56 +01:00
Narayan Kamath
98c6029878
am 97ee3f7c: resolved conflicts for merge of 98b8fe74 to lmp-mr1-dev-plus-aosp
...
* commit '97ee3f7ca6ca3959f4fff4d264921c1c4e379bba':
Stop using DATE_FORMAT from settings.
2014-11-24 16:39:35 +00:00
Narayan Kamath
97ee3f7ca6
resolved conflicts for merge of 98b8fe74 to lmp-mr1-dev-plus-aosp
...
Change-Id: Ic2826f3be8337e72a80978e4565e0884b9ceed70
2014-11-24 16:32:06 +00:00
Narayan Kamath
32ed090f5a
Merge "Stop using DATE_FORMAT from settings."
2014-11-24 16:14:33 +00:00
Selim Cinek
962b06f9a0
Merge "Fixed several time related states for secondary users" into lmp-mr1-dev
2014-11-24 11:52:40 +00:00
Yigit Boyar
244b5d01e3
am f532871e: am 1bbaeaa4: am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev
...
* commit 'f532871ec4cecd63e760706fbb8871bc1c65583b':
Improve GridLayout's weight calculations
2014-11-21 23:13:16 +00:00
Alan Viverette
72807b2363
am d7c5acdf: am e606a788: am 0218970a: Merge "Fix error overwriting when restoring error"
...
* commit 'd7c5acdf1c98bb92ab05a524375e602296a24422':
Fix error overwriting when restoring error
2014-11-21 23:13:08 +00:00
Yigit Boyar
f532871ec4
am 1bbaeaa4: am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev
...
* commit '1bbaeaa4b5bab1a1eebb1e901292799c58fc5fe2':
Improve GridLayout's weight calculations
2014-11-21 21:00:04 +00:00
Alan Viverette
d7c5acdf1c
am e606a788: am 0218970a: Merge "Fix error overwriting when restoring error"
...
* commit 'e606a7884dff4acc926cb82bf6492e83e9a1d3af':
Fix error overwriting when restoring error
2014-11-21 20:49:11 +00:00
Yigit Boyar
ace33655bf
Merge "Improve GridLayout's weight calculations" into lmp-mr1-dev
2014-11-21 20:48:45 +00:00
Alan Viverette
0218970afa
Merge "Fix error overwriting when restoring error"
2014-11-21 20:40:30 +00:00
Selim Cinek
9c4a707912
Fixed several time related states for secondary users
...
The 24 hour setting was not respected correctly. Also
fixed a bug where the next alarm would not display itself
in the QS panel.
Bug: 16239208
Change-Id: I89734f783912dead5831db49db53fba04dbf54ee
2014-11-21 18:25:30 +01:00
Alan Viverette
d679cf04de
am ac280c48: am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev automerge: fa4eba9
...
* commit 'ac280c48d05c4d23f0d2b0e2622376b374198fef':
Update scrollbars to match Material spec
2014-11-21 12:18:26 +00:00
Alan Viverette
ced4c827af
am a35d07a4: am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev automerge: 69b802f
...
* commit 'a35d07a4f0bb743e03fc5422b45851e639c2f0a8':
Update overflow menu alignment to match spec
2014-11-21 12:18:21 +00:00
Alan Viverette
ac280c48d0
am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev
...
automerge: fa4eba9
2014-11-21 03:03:46 +00:00
Alan Viverette
a35d07a4f0
am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev
...
automerge: 69b802f
2014-11-21 03:02:39 +00:00
Alan Viverette
8ae8500365
Merge "Update scrollbars to match Material spec" into lmp-mr1-dev
2014-11-21 02:12:10 +00:00
Alan Viverette
199ea8c0c7
Update overflow menu alignment to match spec
...
BUG: 18417348
Change-Id: I5e4b1ca366c554bca33eac8e5403be6de72370f9
2014-11-20 17:09:27 -08:00
Alan Viverette
7d5bcd7990
Update scrollbars to match Material spec
...
Adds a minimum touch target size to the fast scroller so that we can
edge-align an 8dp thumb but still maintain a 48dp touch target.
BUG: 18467743
Change-Id: I31e9cf1948856f5fce7d75383b84a9359684ebe5
2014-11-20 16:07:59 -08:00
Alan Viverette
8c359de059
am 8ee7fcd2: am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev automerge: 4247f06
...
* commit '8ee7fcd28bf54a4cc3d89a08bf48508d9a82cc58':
Remove underline and search icon from ActionBar search view
2014-11-20 21:19:17 +00:00
Alan Viverette
51c1803c2b
am ee53586a: am 552eca1a: Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev automerge: 6a6b828
...
* commit 'ee53586acb0e4b64d25313ccbab7e9310cdd9e2c':
Implement Material-style delegate for CalendarView
2014-11-20 21:19:12 +00:00
Alan Viverette
8ee7fcd28b
am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev
...
automerge: 4247f06
2014-11-20 21:10:56 +00:00
Alan Viverette
ee53586acb
am 552eca1a: Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev
...
automerge: 6a6b828
* commit '6a6b828090de26aeef7d11a7cc0513a813cbf3a9':
Implement Material-style delegate for CalendarView
2014-11-20 21:09:34 +00:00
Alan Viverette
b130d5961c
Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev
2014-11-19 23:52:24 +00:00
Alan Viverette
552eca1a71
Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev
2014-11-19 23:51:34 +00:00
Yigit Boyar
98d5f04f91
Improve GridLayout's weight calculations
...
This CL improves the method by which excess space is distributed in GridLayout.
Previously, GridLayout would assume weights were arranged in a 'line' and
sum the weights in the assumed line to figure out the proportional allocation
to each view. The system involved running GridLayout's internal constraint
solver twice.
Behavior was unspecified (and surprising) when weights appeared in views
that were not linked together linearly, typically leaving the last view
in each axis with more space than expected (in GridLayout's Bellman-Ford
constraint solver, remaining space goes to the last span of the axis).
This CL changes the weight distribution mechanism to effectively integrate it
with the Bellman-Ford constraint resolution algorithm. It does this
by returning a boolean value from the constraint solver saying whether or
not the constraints could be solved and then using a binary chop to find
a maximum amount of space that can be distributed without violating the
constraints.
This implementation runs the solver log(<axis size> * <number of Views>)
times until finding the maximum amount of space that can be distributed according
to the weights without causing a contradiction. We expect the cost of this
variation to be around a factor of 10 worse than the previous implementation
but to provide a simple and general definition of space distribution via
weights that will be open to many future optimizations.
As a side effect, this CL also fixes a bug in GridLayout where remaining space
was distributed only along the major axis.
Bug: 17485996
Change-Id: I120f39e95e90b5b35072ef8a6c348ec541aae42a
2014-11-19 03:23:18 +00:00
Alan Viverette
67fd871bc5
am ea3219ff: am 4be155e8: am a489f0b3: Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev
...
* commit 'ea3219ffa9a6b23f6a2bbcbbe6f6ca83490eadad':
Re-initialize data when changing time picker 24-hour mode
2014-11-19 02:48:41 +00:00
Alan Viverette
ea3219ffa9
am 4be155e8: am a489f0b3: Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev
...
* commit '4be155e81aae4fe1354ebc5abe9d55c33723fa4f':
Re-initialize data when changing time picker 24-hour mode
2014-11-19 02:42:06 +00:00
Alan Viverette
a489f0b3d9
Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev
2014-11-19 02:28:37 +00:00
Alan Viverette
448ff718a0
Re-initialize data when changing time picker 24-hour mode
...
BUG: 18381313
Change-Id: Ie1fa9fbbf8edadfda71cf0ad4f1c39395e56ecc7
2014-11-18 18:28:04 -08:00
Alan Viverette
cb8ed3705c
Remove underline and search icon from ActionBar search view
...
BUG: 17396265
Change-Id: I751bc79538f1ea412192172035920e59351270f1
2014-11-18 17:05:35 -08:00
Andreas Gampe
668e3b44b8
am 2cabf4a9: Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp
...
* commit '2cabf4a93df38569e8fd70ac6c848e9e96113116':
PopupWindow: fix typo in doc comment
2014-11-19 00:24:23 +00:00
Adam Powell
3df1a1da42
resolved conflicts for merge of d8435643 to lmp-mr1-dev-plus-aosp
...
Change-Id: Ic4669691dd50e400d79e1bc1e54d2e53bcd35a56
2014-11-18 16:12:28 -08:00
Adam Powell
d843564331
Merge "PopupWindow: fix typo in doc comment"
2014-11-18 23:32:57 +00:00
Alan Viverette
d5408ad4b4
am 0d9a3691: am 8b9df16f: am 68235e4d: Merge "Prevent NPE when computing FastScroller position with no visible items" into lmp-mr1-dev
...
* commit '0d9a3691e89f8160c9edd15ab9b927435a2069e1':
Prevent NPE when computing FastScroller position with no visible items
2014-11-18 20:21:41 +00:00
Alan Viverette
0d9a3691e8
am 8b9df16f: am 68235e4d: Merge "Prevent NPE when computing FastScroller position with no visible items" into lmp-mr1-dev
...
* commit '8b9df16f2db6ee7c37d6d4b759109e45fe7d123e':
Prevent NPE when computing FastScroller position with no visible items
2014-11-18 18:22:02 +00:00
Alan Viverette
68235e4dbc
Merge "Prevent NPE when computing FastScroller position with no visible items" into lmp-mr1-dev
2014-11-18 17:46:52 +00:00
Narayan Kamath
775eca105c
Stop using DATE_FORMAT from settings.
...
bug: 18388178
Change-Id: I315dc463bb0569adc0b5d1c5ac5a17485f2b5adc
2014-11-18 14:54:24 +00:00
Raph Levien
228eab2480
am c047ca45: am 25f7c4b9: Merge "Update hint text color even when text present" into lmp-mr1-dev automerge: fbe0e8f
...
* commit 'c047ca454012d49820e9bf14f4501156e4479881':
Update hint text color even when text present
2014-11-14 21:56:01 +00:00
Raph Levien
487b26f411
am 2d208505: am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev automerge: be1ad50
...
* commit '2d2085052550ad0fa1b032d6cc3123b5524c5fe8':
Fudge clipRect in TextView for extra cursor width
2014-11-14 21:55:56 +00:00
Raph Levien
c047ca4540
am 25f7c4b9: Merge "Update hint text color even when text present" into lmp-mr1-dev
...
automerge: fbe0e8f
2014-11-14 21:51:44 +00:00
Raph Levien
2d20850525
am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev
...
automerge: be1ad50
2014-11-14 21:50:37 +00:00
Raph Levien
25f7c4b992
Merge "Update hint text color even when text present" into lmp-mr1-dev
2014-11-14 20:53:14 +00:00
Raph Levien
cda81f2ded
Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev
2014-11-14 20:51:58 +00:00
Alan Viverette
3cad91aa5c
am 8f5de8c6: am 96dacf36: am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev
...
* commit '8f5de8c6c0d5da3c81670b72d5b412acea502d22':
Don't dismiss AutoCompleteTextView on focus change while temp detached
2014-11-14 19:17:09 +00:00
Alan Viverette
8f5de8c6c0
am 96dacf36: am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev
...
* commit '96dacf3659c6fe9a1ac509ec242eb446307c6833':
Don't dismiss AutoCompleteTextView on focus change while temp detached
2014-11-14 00:03:27 +00:00
Alan Viverette
df68999dc7
Don't dismiss AutoCompleteTextView on focus change while temp detached
...
This is consistent with how TextView handles focus changes while
temporarily detached and prevents the suggestion popup from being
dismissed during layout when the AutoCompleteTextView is used
within a ListView.
BUG: 18364277
Change-Id: I8ca6fb9dba63b49a84a60a606bc441446c083cee
2014-11-13 12:59:37 -08:00
Raph Levien
44cb2432e9
Fudge clipRect in TextView for extra cursor width
...
There are a number of cases (most commonly cursor at start of line in
RTL direction) where the cursor extends past the right edge of the
clipRect. This patch adds approximately 1dp on the right side of the
clip, so that the cursor doesn't get clipped.
Bug: 18035274
Change-Id: I489825a91750742c28e445f54f9d27000accbcfb
2014-11-13 12:48:40 -08:00
Alan Viverette
4612740ddc
Implement Material-style delegate for CalendarView
...
BUG: 18266649
Change-Id: Ifd749328754b82dc43259ca7dadb472e449bdfff
2014-11-13 10:50:37 -08:00
