Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
170,594 Commits 3 Branches 0 Tags
8d50d0fb27c1958dbd047bb8a46d7183d873f131
Commit Graph

4966 Commits

Author SHA1 Message Date
Adam Powell
1962353873 am b3b4f837: am 8c9283f4: Merge "Fix NullPointerException in ListView" 
* commit 'b3b4f83702ca878854529acfdc389d15db5ca6f3':
  Fix NullPointerException in ListView
 2014-12-05 19:39:25 +00:00
Adam Powell
8c9283f410 Merge "Fix NullPointerException in ListView" 2014-12-05 19:26:18 +00:00
Alan Viverette
4483f4611e am bb241c3c: am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev 
* commit 'bb241c3cdedb96d2a3a61e913102d6186f12103a':
  Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
 2014-12-03 07:56:12 +00:00
Alan Viverette
9752428dc1 Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting 
Using CURRENT isn't always safe.

BUG: 18557273
Change-Id: I12e197ab25b8ffdc04c5e74836945177870698a2
 2014-12-02 16:24:24 -08:00
Alan Viverette
73d28900e9 resolved conflicts for merge of 850cdbe5 to lmp-mr1-dev-plus-aosp 
Change-Id: Icb394ddc92eb64732993ef345284e63c9844f76b
 2014-12-02 13:58:27 -08:00
Alan Viverette
71c5d62d96 Merge "Consider RTL layout in DPAD navigation in AbsSeekBar" 2014-12-02 19:21:22 +00:00
Alan Viverette
6591b0259c am cc636f08: am 4515f785: Merge "Only send haptic events from time picker when time changes" into lmp-mr1-dev 
* commit 'cc636f08249011f0e99b7d7ddfca31e2c7a9bec3':
  Only send haptic events from time picker when time changes
 2014-12-02 02:10:12 +00:00
Alan Viverette
002f918cea Only send haptic events from time picker when time changes 
BUG: 18572841
Change-Id: Iaa26e2f0804e301f8754e19a1d03dbd2142bf044
 2014-12-01 16:13:32 -08:00
Alan Viverette
7c28a9682b am c8361ba7: am 0a310c99: Merge "Revert "Animates AbsSeekBar progress movement from key presses."" into lmp-mr1-dev 
* commit 'c8361ba78eac66c49d92ff4be36ef23889846ea9':
  Revert "Animates AbsSeekBar progress movement from key presses."
 2014-11-26 18:41:41 +00:00
Alan Viverette
ed79856db2 am 30c0d5b5: am 8a45126a: Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev 
* commit '30c0d5b5eadecf5ba3c9ee536f153adc4c8c8723':
  Load SPEAK_PASSWORD from currently active user rather than self
 2014-11-26 18:41:35 +00:00
Kenji Sugimoto
827bb445d1 Fix NullPointerException in ListView 
There is a NullPointerException in `handleHorizontalFocusWithinListItem()`
because `selectedView.findFocus()` returns null and then there is no null
check when when the assigned variable `currentFocus` is used, although
`View.findFocus()` states that it may return null.

Change-Id: I6897027e9a2a238d9283e6b9f5146198989fcac0
 2014-11-26 06:56:10 +00:00
Alan Viverette
0a310c99ee Merge "Revert "Animates AbsSeekBar progress movement from key presses."" into lmp-mr1-dev 2014-11-26 00:52:36 +00:00
Alan Viverette
5ce0ec0efd Revert "Animates AbsSeekBar progress movement from key presses." 
Incorrect implementation that broke the Brightness dialog slider. Reverting
to the previous behavior.

This reverts commit c5c9d0af764f590ae0031b5470192a0a08ca42d1.

BUG: 18510040
Change-Id: I201b1da46be964fcf6f041bb92ef79c335c2d23d
 2014-11-26 00:36:26 +00:00
Alan Viverette
b6e0cb97b7 Load SPEAK_PASSWORD from currently active user rather than self 
Also fixes a typo in UserHandle's docs.

BUG: 18295054
Change-Id: I1f5384f84062b9ea7dcbebe1e5f64af331028d41
 2014-11-25 16:08:03 -08:00
Alan Viverette
11d33527e8 am 44c09f29: am 27fbf676: Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev 
* commit '44c09f2919d21296c0f020b954621c30d73eba20':
  Update documentation for DatePicker to reflect the new mode
 2014-11-25 18:44:20 +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
Alan Viverette
27fbf67644 Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev 2014-11-25 00:50:50 +00:00
Alan Viverette
d25eb9fbb9 Update documentation for DatePicker to reflect the new mode 
BUG: 18508605
Change-Id: I23d45bf1cd7783fa6f397c15f0ba6802e4069d6b
 2014-11-24 14:07:24 -08: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
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
ac280c48d0 am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev 
automerge: fa4eba9

* commit 'fa4eba96374b971c13ee6427c74a78503c958757':
  Update scrollbars to match Material spec
 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

* commit '69b802fdb6a5920bb0bd0270298450ede52dcaf1':
  Update overflow menu alignment to match spec
 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
8ee7fcd28b am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev 
automerge: 4247f06

* commit '4247f06ba43becfcdf7713b4b9fbc347c5b3361d':
  Remove underline and search icon from ActionBar search view
 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
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
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
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
c047ca4540 am 25f7c4b9: Merge "Update hint text color even when text present" into lmp-mr1-dev 
automerge: fbe0e8f

* commit 'fbe0e8f4183f3a42fde9aeeed024bee2fbf182b6':
  Update hint text color even when text present
 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

* commit 'be1ad50b34e160c5d490d1165a590eb4c633d996':
  Fudge clipRect in TextView for extra cursor width
 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
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