Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,536 Commits 3 Branches 0 Tags
dd3cda73ff4dfb828ec30d902aaa9156379a6f41
Commit Graph

48987 Commits

Author SHA1 Message Date
Adam Powell
dd3cda73ff am 1cf4c2c3: am 8e44ec0e: am 2b710c29: Merge "Add DENSITY_360" into mnc-dev 
* commit '1cf4c2c3b62e4b3a193b809191348896f6f413fe':
  Add DENSITY_360
 2015-06-04 20:39:14 +00:00
Adam Powell
1cf4c2c3b6 am 8e44ec0e: am 2b710c29: Merge "Add DENSITY_360" into mnc-dev 
* commit '8e44ec0ec2c387b12b539715a7747513f874d22d':
  Add DENSITY_360
 2015-06-04 20:20:38 +00:00
George Mount
e9b90b3c88 am 74e4a76e: am df73fd7c: am e50b091d: Merge "Clean up the enter transition even if there is not entering fragment." into mnc-dev 
* commit '74e4a76e3607801d705566a85cd939d0751f5c09':
  Clean up the enter transition even if there is not entering fragment.
 2015-06-04 19:33:27 +00: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
Dianne Hackborn
a3601ad430 am 4752d671: am 7771406d: am b0a5e78f: Merge "More API changes." into mnc-dev 
* commit '4752d671f2789cb0a369a6bd4d9a1188fb46f042':
  More API changes.
 2015-06-04 19:33:01 +00:00
Alan Viverette
cfb4b59248 am 1d229075: am ce372f48: am 52999685: Merge "Prevent poorly-extended ParcelableSpans from writing to parcels" into mnc-dev 
* commit '1d22907516963ad9e07d8e6fd9b843659b44c389':
  Prevent poorly-extended ParcelableSpans from writing to parcels
 2015-06-04 19:32:55 +00:00
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
Adam Powell
f6d9cd19e2 Add DENSITY_360 
Add 360dpi as a supported screen density to closer match some
hardware's physical specifications. This gives a dp multiplier of
2.25.

Bug 19529059

Change-Id: Ibf9c768fba53765ea684ff228d24caf091f27a3e
 2015-06-04 10:41:44 -07: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
Paul Crowley
326a0acde1 Merge "Delete the user key when deleting a user." 2015-06-04 12:08:47 +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
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
6ec35804a9 am ff843a2c: am 060981e4: am b3876474: Merge "Make node retrieval methods in AccessibilityManagerService use separate Region instances to make them thread safe." into mnc-dev 
* commit 'ff843a2c50096288a8258b3b2e2847848fe53cc7':
  Make node retrieval methods in AccessibilityManagerService use separate Region instances to make them thread safe.
 2015-06-04 02:53:30 +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
Zhijun He
fee4ce570d am a64b64c8: am f9c6becf: am b7c3e931: Merge "Camera2: add high speed video APIs" into mnc-dev 
* commit 'a64b64c803fda3b2e44cbefd5f703ce47d153046':
  Camera2: add high speed video APIs
 2015-06-04 02:29:31 +00:00
Zhijun He
2dd3b31620 am f1d6b42a: am 9b2cf052: am b3c27b18: Merge "camera_metadata: update high speed video recording API" into mnc-dev 
* commit 'f1d6b42a7fd8b12a5422a2304f2ef2bd495b48d3':
  camera_metadata: update high speed video recording API
 2015-06-04 02:29:24 +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
Tim Kilbourn
20fc439fe7 Merge "Fix DropBoxManager.Entry parcels with fds." 2015-06-04 00:29:17 +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
Adrian Roos
4875e599b0 am b14d3586: am 39c5b3eb: am 461829d6: Prevent windows below the keyguard from showing 
* commit 'b14d35862d1abd88ee3db2aa021661912e436216':
  Prevent windows below the keyguard from showing
 2015-06-04 00:25:30 +00: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
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
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
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
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
Adam Powell
7241d8d931 am a115bffa: am 93d3a94b: am cd45913f: Merge "Fix view foreground tinting" into mnc-dev 
* commit 'a115bffa1ecdd2ccacb3612c048c06fd9a5b6463':
  Fix view foreground tinting
 2015-06-03 23:31:57 +00:00
Svetoslav
a44af6271b am 3f8a2f73: am 21ec5f62: am 597059d5: Merge "Adding missing permission API to fragment" into mnc-dev 
* commit '3f8a2f73ec6ac236e31de8c660c4d373538c7e63':
  Adding missing permission API to fragment
 2015-06-03 23:31:51 +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