Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,912 Commits 3 Branches 0 Tags
00a5dcbbf95d27059f6f4c7bf8312f3f2dc5b4fa
Commit Graph

48532 Commits

Author SHA1 Message Date
George Mount
74e4a76e36 am df73fd7c: am e50b091d: Merge "Clean up the enter transition even if there is not entering fragment." into mnc-dev 
* commit 'df73fd7ca2552841a07c3d7b48135e866c8f28dd':
  Clean up the enter transition even if there is not entering fragment.
 2015-06-04 19:23:16 +00:00
Alan Viverette
59e81d32ef am e6206fb8: am 2e4e5d74: Merge "Revert "Synchronize selected item data on-demand after data set invalidation"" into mnc-dev 
* commit 'e6206fb8653f1779d4ccd8645e47b666c4910143':
  Revert "Synchronize selected item data on-demand after data set invalidation"
 2015-06-04 19:23:04 +00:00
Dianne Hackborn
4752d671f2 am 7771406d: am b0a5e78f: Merge "More API changes." into mnc-dev 
* commit '7771406d95ae5cfb83c17d0e0ed710e33925b39e':
  More API changes.
 2015-06-04 19:22:52 +00:00
Alan Viverette
1d22907516 am ce372f48: am 52999685: Merge "Prevent poorly-extended ParcelableSpans from writing to parcels" into mnc-dev 
* commit 'ce372f48f0991c5a2c33a12b42cef05a85208633':
  Prevent poorly-extended ParcelableSpans from writing to parcels
 2015-06-04 19:22:47 +00:00
George Mount
e50b091df9 Merge "Clean up the enter transition even if there is not entering fragment." into mnc-dev 2015-06-04 17:32:53 +00:00
George Mount
ec3364cc32 Clean up the enter transition even if there is not entering fragment. 
Bug 21618103

Change-Id: Id670465afd0b743f964d24d7d36d49706b459ac8
 2015-06-04 10:28:54 -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
Dianne Hackborn
b0a5e78fc0 Merge "More API changes." into mnc-dev 2015-06-04 16:56:52 +00:00
Alan Viverette
5299968517 Merge "Prevent poorly-extended ParcelableSpans from writing to parcels" into mnc-dev 2015-06-04 16:55:57 +00:00
Keisuke Kuroyanagi
48c21f472b am cf528d4b: am 4186b1d4: Merge "Stop offering "Replace..." when there are no suggestions." into mnc-dev 
* commit 'cf528d4b434b3e56a3c82a998ca3cd20401eaea5':
  Stop offering "Replace..." when there are no suggestions.
 2015-06-04 06:31:05 +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
Svetoslav Ganov
ff843a2c50 am 060981e4: am b3876474: Merge "Make node retrieval methods in AccessibilityManagerService use separate Region instances to make them thread safe." into mnc-dev 
* commit '060981e439769135fa163b699db77a49ae68e16f':
  Make node retrieval methods in AccessibilityManagerService use separate Region instances to make them thread safe.
 2015-06-04 02:41:18 +00:00
Svetoslav Ganov
b387647439 Merge "Make node retrieval methods in AccessibilityManagerService use separate Region instances to make them thread safe." into mnc-dev 2015-06-04 02:21:09 +00:00
Nirmal Patel
386a824384 Make node retrieval methods in AccessibilityManagerService use separate Region instances to make them thread safe. 
b/21087793

Change-Id: Ice690e3d7494788fb9e1e234a54f14831bd4e0d3
(cherry picked from commit ebd8eb4610d6bb9322a374f8965a78ba1c39ee63)
 2015-06-03 19:18:00 -07:00
Zhijun He
a64b64c803 am f9c6becf: am b7c3e931: Merge "Camera2: add high speed video APIs" into mnc-dev 
* commit 'f9c6becf9710371d0cb37fd12cd473605ad19f33':
  Camera2: add high speed video APIs
 2015-06-04 02:17:21 +00:00
Zhijun He
f1d6b42a7f am 9b2cf052: am b3c27b18: Merge "camera_metadata: update high speed video recording API" into mnc-dev 
* commit '9b2cf052bd0f1bb83f30f58d0fe9606b7cf0aef0':
  camera_metadata: update high speed video recording API
 2015-06-04 02:17:15 +00:00
Zhijun He
b1300e39c7 Camera2: add high speed video APIs 
Interface only.

Bug: 21442271
Change-Id: If81caa0f2dc9f7802af564abcd9541aff3e30901
 2015-06-03 17:50:22 -07:00
Zhijun He
fab663ebfd camera_metadata: update high speed video recording API 
Update high speed video recording API to support batch mode recording.

Bug: 21442271
Change-Id: I62de6067c75fcfbe6320dd987cce65843d810021
 2015-06-03 17:45:48 -07:00
Alan Viverette
424c08d5a3 am 3b2e25a4: am 8d6a9363: Merge "Fix drop down layout inflation in ThemedSpinnerAdapter classes" into mnc-dev 
* commit '3b2e25a4745442587fc6b1ad05c772805df0a592':
  Fix drop down layout inflation in ThemedSpinnerAdapter classes
 2015-06-04 00:15:22 +00:00
Adrian Roos
b14d35862d am 39c5b3eb: am 461829d6: Prevent windows below the keyguard from showing 
* commit '39c5b3eb355bba10639f21e612fa3239fbbd0982':
  Prevent windows below the keyguard from showing
 2015-06-04 00:15:16 +00:00
Alan Viverette
bc0631b04b am ccb342c4: am d3c9df1a: Merge "Update number picker styling for Material" into mnc-dev 
* commit 'ccb342c4256e386b5bf353c067b290d587a95225':
  Update number picker styling for Material
 2015-06-03 23:58:05 +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
Adrian Roos
461829d607 Prevent windows below the keyguard from showing 
Fixes a bug where windows below the lock screen
could become visible if a SHOW_WHEN_LOCKED activity
hides the status bar.

Bug: 21450145
Change-Id: Ie660394cb96d7e6839bd4fb7c2729133bac2dfc5
 2015-06-03 23:44:52 +00:00
Alan Viverette
f8e556e7eb am 891a7ee6: am e9bb596c: Merge "Synchronize selected item data on-demand after data set invalidation" into mnc-dev 
* commit '891a7ee666eafbfda8c36e339ce5bbed6b312f3c':
  Synchronize selected item data on-demand after data set invalidation
 2015-06-03 23:44:03 +00:00
Alan Viverette
b4133483bd am bdb1127a: am b8da5340: Merge "Pass setEnabled() value in calendar-mode DatePicker delegate" into mnc-dev 
* commit 'bdb1127a6b8786d392b4f2ad635f5c36cd3a775f':
  Pass setEnabled() value in calendar-mode DatePicker delegate
 2015-06-03 23:43:57 +00:00
Alan Viverette
d3c9df1a34 Merge "Update number picker styling for Material" into mnc-dev 2015-06-03 23:35:02 +00:00
Raph Levien
7f374287c4 am 85e9092d: am 88ac4e04: Merge "Rename setTextDir to setTextDirection" into mnc-dev 
* commit '85e9092decddc5a0da43ecbd22ef2d3292daca4d':
  Rename setTextDir to setTextDirection
 2015-06-03 23:32:17 +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
Adam Powell
a115bffa1e am 93d3a94b: am cd45913f: Merge "Fix view foreground tinting" into mnc-dev 
* commit '93d3a94bcae201236922c0caed54b5c90a2e736d':
  Fix view foreground tinting
 2015-06-03 23:20:10 +00:00
Svetoslav
3f8a2f73ec am 21ec5f62: am 597059d5: Merge "Adding missing permission API to fragment" into mnc-dev 
* commit '21ec5f6256794755abee83c4daf8737f2ff30e10':
  Adding missing permission API to fragment
 2015-06-03 23:20:05 +00:00
Raph Levien
88ac4e04a5 Merge "Rename setTextDir to setTextDirection" into mnc-dev 2015-06-03 23:09:49 +00:00
Clara Bayarri
3341fa5349 am 79c389de: am eb665337: Merge "Fix Floating tool bar covers text during long press + drag" into mnc-dev 
* commit '79c389de922d871d4fd96093b6715e6b9bfad778':
  Fix Floating tool bar covers text during long press + drag
 2015-06-03 22:58:30 +00:00
Adam Powell
cd45913fe3 Merge "Fix view foreground tinting" into mnc-dev 2015-06-03 22:54:00 +00:00
Svetoslav
597059d535 Merge "Adding missing permission API to fragment" into mnc-dev 2015-06-03 22:44:48 +00:00
Svetoslav
a2011d232b Adding missing permission API to fragment 
Change-Id: I90309a23a08a82f0ab93eb4f6185db09e035aac1
 2015-06-03 15:43:59 -07: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
Adam Powell
cec5f733f5 Fix view foreground tinting 
Copy and paste is bad, mmkay?

Bug 21209639

Change-Id: I6c17e8a30fad6d5110f18e4723a5f5e6ddb814b8
 2015-06-03 15:26:51 -07: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
a28b60217a am a80a8025: am 95753e2f: Merge "Ensure to reset state of selecting by word/char for new selections" into mnc-dev 
* commit 'a80a802505ec1fbd67f8136406074ed883f6e3dc':
  Ensure to reset state of selecting by word/char for new selections
 2015-06-03 21:43:26 +00:00
James Cook
72921131d9 am 9a0f4bd4: am 8fd48ca3: Merge "Fix TabHost stealing focus on hardware keyboard keypress" into mnc-dev 
* commit '9a0f4bd44ebb8cd1f922bb27f8de384937b24255':
  Fix TabHost stealing focus on hardware keyboard keypress
 2015-06-03 21:24:55 +00: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
Adam Powell
93925483f3 am cb3b67f4: am c52e0d90: Merge "Properly restore RTL state in HorizontalScrollView" into mnc-dev 
* commit 'cb3b67f404c97c799233f04c91726e2febc66f5e':
  Properly restore RTL state in HorizontalScrollView
 2015-06-03 20:10:20 +00:00
Mady Mellor
36d5a7b225 Ensure to reset state of selecting by word/char for new selections 
Previously this value was only updated when interacting with the
selection handles, so if you started a selection, entered by-char mode,
and then started another selection you would still be in by-char mode.
This resulted in incorrect behavior.

This CL alters the logic to update the handle state whenever the cursor
is placed which will included the initial long press to select a word.

Bug: 21301589
Change-Id: I15dbe6f2b76c7edd8ea4b3ba53e7107c47bc48fa
 2015-06-03 19:53:52 +00:00