Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199,158 Commits 3 Branches 0 Tags
32c9721ec85fa69eac52b692798fbf64288a09e8
Commit Graph

5566 Commits

Author SHA1 Message Date
Abodunrinwa Toki
6f8029494d am f70aa841: am 6bbacb53: am 7d3b8833: Merge "Fix ActionMode.snooze API" into mnc-dev 
* commit 'f70aa84170584eb7efcc048c55bb3a1aebe6d89d':
  Fix ActionMode.snooze API
 2015-06-08 17:22:42 +00:00
Abodunrinwa Toki
7d3b8833df Merge "Fix ActionMode.snooze API" into mnc-dev 2015-06-08 11:36:19 +00:00
Jae Seo
6868787136 am 1a2519f7: am d0c34cba: am 683e3cfe: Merge "MediaController: Keep the controller when touch exploration is enabled" into mnc-dev 
* commit '1a2519f791d7493e5ca0c2c17a42b91569a7faf7':
  MediaController: Keep the controller when touch exploration is enabled
 2015-06-06 17:05:48 +00:00
Jae Seo
63d37d9f16 MediaController: Keep the controller when touch exploration is enabled 
Also added missing final and @Override keywords

Bug: 17199815
Change-Id: If96554e36799557a2d81767f287aeb446e4a1983
 2015-06-05 17:27:30 -07:00
Adam Powell
50a11e9d27 am 411b6c06: am 086f5085: am cedc7b3b: Merge "Use real rounding in ImageView bounds configuration" into mnc-dev 
* commit '411b6c069f352853b0ca54d8b5f176299b178833':
  Use real rounding in ImageView bounds configuration
 2015-06-05 20:41:58 +00:00
Adam Powell
cedc7b3ba4 Merge "Use real rounding in ImageView bounds configuration" into mnc-dev 2015-06-05 20:07:07 +00:00
Alan Viverette
a788ffc3fe am 8aa4d2a1: am 43b123c1: am 42cc892b: Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev 
* commit '8aa4d2a19fc4aa497a6fa34c97f13376444e10ac':
  Account for margins in ScrollView onMeasure() when filling viewport
 2015-06-05 17:54:18 +00:00
Alan Viverette
42cc892be1 Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev 2015-06-05 17:18:47 +00:00
Clara Bayarri
866d3c7bfb am 5d9d3281: am e3aba488: am 3e85c1ed: Merge "Fix Select All should not be shown when everything is already selected" into mnc-dev 
* commit '5d9d32816afca2976634dff0e4cdfd16f30e65b1':
  Fix Select All should not be shown when everything is already selected
 2015-06-05 16:58:12 +00:00
Clara Bayarri
3e85c1ed0c Merge "Fix Select All should not be shown when everything is already selected" into mnc-dev 2015-06-05 16:19:31 +00:00
Adam Powell
14d1f1383f Use real rounding in ImageView bounds configuration 
While a useful tactic in previous years, the (int) (float + 0.5f)
trick is inaccurate in some cases. Tradeoffs have changed; do the real
thing now.

Bug 20145160

Change-Id: I8af31bcb1945dc113fd36e094f5970ebd4ec0304
 2015-06-05 08:51:45 -07:00
Clara Bayarri
3d5a78aa40 am acc6fc50: am fee163c5: am de5cdeba: Merge "Fix Toolbar is not refreshed after Select All" into mnc-dev 
* commit 'acc6fc509e2f45bfbb2a9d148a7e61a378f18b3e':
  Fix Toolbar is not refreshed after Select All
 2015-06-05 02:43:30 +00:00
Abodunrinwa Toki
9e211282d3 Fix ActionMode.snooze API 
Bug: 21572677
Change-Id: If9fdb8ace3773b983418b0148082712644fd1fa5
 2015-06-05 03:35:15 +01:00
Clara Bayarri
01243ac57e Fix Toolbar is not refreshed after Select All 
Bug: 21361248
Change-Id: Iab913bd610c208e5881d3d0eb5574efdf9eb5d92
 2015-06-05 03:03:31 +01:00
Clara Bayarri
3b69fd81df Fix Select All should not be shown when everything is already selected 
Condition Select All on whether the full text is already selected,
and add/remove this item when needed on ActionMode invalidation.

Bug: 21608943
Change-Id: Iad5f8a77a03b98024f7dcf355b2f7f0d1338b94a
 2015-06-05 02:53:30 +01:00
Doris Liu
3dd9a25e61 am d8fa6c3a: am 6e941351: am 5de55868: Merge "Make ListView\'s EdgeEffect respect the clipToPadding flag" into mnc-dev 
* commit 'd8fa6c3aeccf8be0f54ab2a8b4778c896cbc0546':
  Make ListView's EdgeEffect respect the clipToPadding flag
 2015-06-05 01:27:32 +00:00
Clara Bayarri
b1d4d77d6a am 612e1da8: am f407aa30: am c1f28bc9: Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 
* commit '612e1da808b327aba06be883a54dc08f9afd6dd2':
  Separate the SelectionActionMode into Insertion and Selection.
 2015-06-05 01:18:32 +00:00
Doris Liu
5de55868a9 Merge "Make ListView's EdgeEffect respect the clipToPadding flag" into mnc-dev 2015-06-05 00:57:32 +00:00
Doris Liu
f36c061909 Make ListView's EdgeEffect respect the clipToPadding flag 
This CL sets the position of EdgeEffect based on whether
clipToPadding is enabled. When enabled, the EdgeEffect will be
bounded to the padding. Otherwise, it will be drawn at the view's
bounds.

Bug: 21595866
Change-Id: I3968e5b8d3a75ce2d7607e2037bc372024694d5b
 2015-06-04 17:50:47 -07:00
Clara Bayarri
c1f28bc97d Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 2015-06-05 00:40:43 +00:00
Clara Bayarri
7938cdbf98 Separate the SelectionActionMode into Insertion and Selection. 
When we got rid of the paste popup, we merged it into the Selection
ActionMode and moved all its invocations to the ActionMode. Some apps
actually want the paste popup without the Selection ActionMode, hence
separating them again allows them to cancel the one they want.

Bug: 21571422
Change-Id: I91bcd0d9c3e68d9c736698fe0bec010b4c9f5cf3
 2015-06-04 20:46:19 +01:00
Alan Viverette
6004b663ed am 59e81d32: am e6206fb8: am 2e4e5d74: Merge "Revert "Synchronize selected item data on-demand after data set invalidation"" into mnc-dev 
* commit '59e81d32efd406c1112c474ac7f8dfadf22b371e':
  Revert "Synchronize selected item data on-demand after data set invalidation"
 2015-06-04 19:33:16 +00:00
Alan Viverette
97e1be8ef6 Account for margins in ScrollView onMeasure() when filling viewport 
Bug: 19247610
Change-Id: I8e43cd9c28652cd8a0fed9b896394b976c9817a9
 2015-06-04 10:56:27 -07:00
Alan Viverette
2e4e5d745f Merge "Revert "Synchronize selected item data on-demand after data set invalidation"" into mnc-dev 2015-06-04 17:19:27 +00:00
Alan Viverette
31ff78b146 Revert "Synchronize selected item data on-demand after data set invalidation" 
This CL was a can of worms. More extensive changes are
needed to decouple AdapterView state from measure/layout
passes.

This reverts commit abed07f6c0.

Change-Id: I4e4e01692a1f660a04e9dfd16db882f13c3d0b94
 2015-06-04 17:18:34 +00:00
Keisuke Kuroyanagi
88cf0a9335 am 48c21f47: am cf528d4b: am 4186b1d4: Merge "Stop offering "Replace..." when there are no suggestions." into mnc-dev 
* commit '48c21f472b68b3312c73428ed3cbcd274ec50405':
  Stop offering "Replace..." when there are no suggestions.
 2015-06-04 06:42:20 +00:00
Keisuke Kuroyanagi
4186b1d4d8 Merge "Stop offering "Replace..." when there are no suggestions." into mnc-dev 2015-06-04 06:06:52 +00:00
Alan Viverette
147ec13c20 am 424c08d5: am 3b2e25a4: am 8d6a9363: Merge "Fix drop down layout inflation in ThemedSpinnerAdapter classes" into mnc-dev 
* commit '424c08d5a3b1b1f2040b7bea89f822c5bc5541ec':
  Fix drop down layout inflation in ThemedSpinnerAdapter classes
 2015-06-04 00:25:35 +00:00
Alan Viverette
ea95b729e7 am bc0631b0: am ccb342c4: am d3c9df1a: Merge "Update number picker styling for Material" into mnc-dev 
* commit 'bc0631b04b32fc547b8a9cc7a916380549013c84':
  Update number picker styling for Material
 2015-06-04 00:11:32 +00:00
Alan Viverette
a40a7b1354 am f8e556e7: am 891a7ee6: am e9bb596c: Merge "Synchronize selected item data on-demand after data set invalidation" into mnc-dev 
* commit 'f8e556e7eb58d1bccfea52effd9faa3bf5caf80f':
  Synchronize selected item data on-demand after data set invalidation
 2015-06-03 23:57:11 +00:00
Alan Viverette
1c1b18abfb am b4133483: am bdb1127a: am b8da5340: Merge "Pass setEnabled() value in calendar-mode DatePicker delegate" into mnc-dev 
* commit 'b4133483bd4e5127e4bd7c129ea9b5f129609f06':
  Pass setEnabled() value in calendar-mode DatePicker delegate
 2015-06-03 23:57:06 +00:00
Alan Viverette
8d6a9363a1 Merge "Fix drop down layout inflation in ThemedSpinnerAdapter classes" into mnc-dev 2015-06-03 23:48:41 +00:00
Raph Levien
8746623e3c am 7f374287: am 85e9092d: am 88ac4e04: Merge "Rename setTextDir to setTextDirection" into mnc-dev 
* commit '7f374287c418fd66299be4db36db21e5ab04740a':
  Rename setTextDir to setTextDirection
 2015-06-03 23:46:42 +00:00
Alan Viverette
d3c9df1a34 Merge "Update number picker styling for Material" into mnc-dev 2015-06-03 23:35:02 +00:00
Alan Viverette
e9bb596cc8 Merge "Synchronize selected item data on-demand after data set invalidation" into mnc-dev 2015-06-03 23:29:10 +00:00
Alan Viverette
7d5967e55e Fix drop down layout inflation in ThemedSpinnerAdapter classes 
Bug: 21209640
Change-Id: I32aed1b70977fae25f43714eb3ef6edca53e51e9
 2015-06-03 16:27:36 -07:00
Alan Viverette
b8da5340f2 Merge "Pass setEnabled() value in calendar-mode DatePicker delegate" into mnc-dev 2015-06-03 23:20:36 +00:00
Clara Bayarri
3cd93a7055 am 3341fa53: am 79c389de: am eb665337: Merge "Fix Floating tool bar covers text during long press + drag" into mnc-dev 
* commit '3341fa534985b55086099931ab079404fc0c12dd':
  Fix Floating tool bar covers text during long press + drag
 2015-06-03 23:11:50 +00:00
Raph Levien
88ac4e04a5 Merge "Rename setTextDir to setTextDirection" into mnc-dev 2015-06-03 23:09:49 +00:00
Clara Bayarri
eb66533716 Merge "Fix Floating tool bar covers text during long press + drag" into mnc-dev 2015-06-03 22:33:59 +00:00
Mady Mellor
f9ccf37ec1 am a28b6021: am a80a8025: am 95753e2f: Merge "Ensure to reset state of selecting by word/char for new selections" into mnc-dev 
* commit 'a28b60217affc8e0cef6e06e3901347c9011692b':
  Ensure to reset state of selecting by word/char for new selections
 2015-06-03 22:26:50 +00:00
James Cook
d6a9223aa3 am 72921131: am 9a0f4bd4: am 8fd48ca3: Merge "Fix TabHost stealing focus on hardware keyboard keypress" into mnc-dev 
* commit '72921131d967b560158c2891a8bf570bff106f33':
  Fix TabHost stealing focus on hardware keyboard keypress
 2015-06-03 22:26:16 +00:00
Adam Powell
18033be14b am 93925483: am cb3b67f4: am c52e0d90: Merge "Properly restore RTL state in HorizontalScrollView" into mnc-dev 
* commit '93925483f38e19d9e5b4e3fb95ec4d103b975cfc':
  Properly restore RTL state in HorizontalScrollView
 2015-06-03 22:24:52 +00:00
Alan Viverette
b79ac367ad am 88bba269: am d425e2d7: am 4a7bb462: Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev 
* commit '88bba269c64b1bfc2ea2ce38bf6cdd9fcd4deccb':
  Call dispatchFinishTemporaryDetach before returning a transient view
 2015-06-03 22:23:58 +00:00
Alan Viverette
abed07f6c0 Synchronize selected item data on-demand after data set invalidation 
Previously, the selected item data could become inconsistent between a
call to Adapter.notifyDataSetChanged()/Invalidated() and the subsequent
layout pass.

Bug: 21614294
Change-Id: I45c9c98b2f6a8d8b8fb17de2065efa505cbf3c92
 2015-06-03 15:19:13 -07:00
Mady Mellor
95753e2f4b Merge "Ensure to reset state of selecting by word/char for new selections" into mnc-dev 2015-06-03 21:15:19 +00:00
Alan Viverette
f7aa9251d0 Pass setEnabled() value in calendar-mode DatePicker delegate 
Fixes mContainer referencing wrong view. Also cleans up getCalendarView()
exception message.

Bug: 21211308
Change-Id: I4ad18206a8071b2c9b75d488e14fd53da6f5fa5b
 2015-06-03 14:07:26 -07:00
Clara Bayarri
dfac443516 Fix Floating tool bar covers text during long press + drag 
The existing implementation started the ActionMode even when knowing
a drag would start. Moved this logic to once the drag is complete,
to avoid the toolbar popping up while the user is still dragging.

Since the existing method selected the initial word when no other
selection existed, refactored that logic so it is also performed at
the start of the drag. Otherwise, the user sees no selection until
he drags over 2 or more words.

Bug: 21144634

Change-Id: I97cf89b1c4c3ebdbbd1af50bd1ce5aa4af72164b
 2015-06-03 22:06:55 +01:00
James Cook
8fd48ca377 Merge "Fix TabHost stealing focus on hardware keyboard keypress" into mnc-dev 2015-06-03 20:58:52 +00:00
Raph Levien
a6a082862b Rename setTextDir to setTextDirection 
StaticLayout.Builder used "setTextDir" as a shorthand, but it's not
as clear as spelling it out. So, setTextDirection.

Bug: 21572282
Change-Id: Ia94476562d70678f963196b87bb63511d30836b6
 2015-06-03 13:20:45 -07:00