Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
173,781 Commits 3 Branches 0 Tags
e7ff01ecc5c0ceda498dd476cb29ee663f1968dc
Commit Graph

47502 Commits

Author SHA1 Message Date
Raph Levien
35b5780ec5 am 2ed9a7e5: am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev 
* commit '2ed9a7e5ac3923b9459dc02b3a04e075ae4ea627':
  Refine resolution order for typeface and fontFamily
 2015-01-29 22:36:46 +00:00
Raph Levien
2ed9a7e5ac am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev 
* commit 'af461e12a12dba8fc544fa373831368ba2c18096':
  Refine resolution order for typeface and fontFamily
 2015-01-29 22:25:51 +00:00
Raph Levien
af461e12a1 Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev 2015-01-29 22:11:00 +00:00
Raph Levien
42b3024efd Refine resolution order for typeface and fontFamily 
Previously any fontFamily value on a TextView would override a typeface
value, even if the fontFamily is from a TextAppearance (for example,
from the theme) and the typeface is explicitly set. This patch changes
the resolution order to fontFamily set directly on the TextView,
typeface set directly on the TextView, fontFamily from TextAppearance,
typeface from TextAppearance.

Bug: 16154223
Change-Id: I45c1e511fba8f64eb236200e3fa2e885c02b59dc
 2015-01-29 12:49:19 -08:00
Eino-Ville Talvala
745d45e0c0 am 06b1014c: Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev automerge: a17ab21 
* commit '06b1014cf28431706d42219549170896bd581a29':
  Camera2 legacy: Do not advertise NV21 support.
 2015-01-28 23:29:23 +00:00
Eino-Ville Talvala
06b1014cf2 Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev 
automerge: a17ab21

* commit 'a17ab21d4c81ecc80b00b14fe56ce721b4e757ae':
  Camera2 legacy: Do not advertise NV21 support.
 2015-01-28 23:22:56 +00:00
Eino-Ville Talvala
a17ab21d4c Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev 2015-01-28 23:20:01 +00:00
Jose Lima
485f6a60e0 am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973 
* commit '4a40f7cc90d8f908527d2cfff32376ee51259250':
  Fix crash caused by disabling the Options panel on TVs
 2015-01-28 21:27:33 +00:00
Jose Lima
4a40f7cc90 Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev 
automerge: 1f81973

* commit '1f81973e7d33f2a3f4b0a0e232854283f0f18030':
  Fix crash caused by disabling the Options panel on TVs
 2015-01-28 20:59:05 +00:00
Eino-Ville Talvala
ccf6e88eec Camera2 legacy: Do not advertise NV21 support. 
Also reduce logging somewhat for common scenarios.

Bug: 19161738
Change-Id: If96ed7d2bac0229159564072d7969d7bea3fae27
 2015-01-28 12:57:56 -08:00
Jose Lima
bd769a15ab Fix crash caused by disabling the Options panel on TVs 
Address more cases where calls to getPanelState may cause a crash when the
options panel is disabled on a platform.

Bug: 19178531
Bug: 18780696
Change-Id: Ib72bb8483e636181788ed3919c4cb9e99a94b7b1
 2015-01-28 10:46:39 -08:00
Bryce Lee
263987f626 am 2a8ccd4b: am 1061652a: Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev 
* commit '2a8ccd4b1f82086f6e38ec32ad084306400dcf93':
  Revert "Make THEATER_MODE_ON setting a system api."
 2015-01-28 17:58:41 +00:00
Bryce Lee
2a8ccd4b1f am 1061652a: Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev 
* commit '1061652a37e18683c994f9d4b872ecf990125a05':
  Revert "Make THEATER_MODE_ON setting a system api."
 2015-01-28 17:52:59 +00:00
Bryce Lee
1061652a37 Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev 2015-01-28 17:50:39 +00:00
Bryce Lee
034dc3839f Revert "Make THEATER_MODE_ON setting a system api." 
This reverts commit 35dafda1b0.

Change-Id: I76e72592791682e0dbee719fbd518962a1bdcd11
 2015-01-28 17:45:35 +00:00
Bryce Lee
f2d5253bce am fdb8dff5: am d8cb4040: Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev 
* commit 'fdb8dff54cf9327089e5ee4d5bf461ef42020fcd':
  Make THEATER_MODE_ON setting a system api.
 2015-01-28 17:15:11 +00:00
Bryce Lee
fdb8dff54c am d8cb4040: Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev 
* commit 'd8cb404035e8e133e310f5d811d44e3b0ecb8dcf':
  Make THEATER_MODE_ON setting a system api.
 2015-01-28 17:09:21 +00:00
Bryce Lee
d8cb404035 Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev 2015-01-28 17:03:57 +00:00
George Mount
5c25f5b0a7 am fff84a23: Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev automerge: aa6945a 
* commit 'fff84a232a964a8587eabee4e34cc38344309593':
  Activity Transition: fix quick back after enter.
 2015-01-27 15:21:23 +00:00
George Mount
fff84a232a Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev 
automerge: aa6945a

* commit 'aa6945ac7904611499ae4ad33799d1f1fe434d32':
  Activity Transition: fix quick back after enter.
 2015-01-27 15:15:38 +00:00
George Mount
aa6945ac79 Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev 2015-01-27 15:13:32 +00:00
Svetoslav
e5743753ee am 55120a0f: am 197adec3: Merge "Accessibility: Ignore overlapping siblings when computing a click location" into lmp-mr1-dev 
* commit '55120a0f1acb9a46dc56bbdab877bc2c635f1356':
  Accessibility: Ignore overlapping siblings when computing a click location
 2015-01-27 04:36:31 +00:00
Svetoslav
55120a0f1a am 197adec3: Merge "Accessibility: Ignore overlapping siblings when computing a click location" into lmp-mr1-dev 
* commit '197adec3656fc087d4aa56396e601bb8d04aa9fd':
  Accessibility: Ignore overlapping siblings when computing a click location
 2015-01-27 04:26:51 +00:00
Svetoslav
197adec365 Merge "Accessibility: Ignore overlapping siblings when computing a click location" into lmp-mr1-dev 2015-01-27 04:23:44 +00:00
Jose Lima
69fbcf1f10 am 445768bd: am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev 
* commit '445768bddf00256195a46b78ed35ea3722df7c92':
  Allow disabling the Options Pannel feature for TVs
 2015-01-27 03:10:28 +00:00
Jose Lima
445768bddf am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev 
* commit '3fd8a433a918fc9c57b6d7ff12839a1e028d6dad':
  Allow disabling the Options Pannel feature for TVs
 2015-01-27 02:58:44 +00:00
Jose Lima
3fd8a433a9 Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev 2015-01-27 02:53:22 +00:00
Jose Lima
7a22fc62d3 Allow disabling the Options Pannel feature for TVs 
- Added a config entry in velues-television to disable the options panel
feature for TVs.
- Fixed parts of the code in PhoneWindow that assumed this feature is supposed
to always be available, which was causing exceptions when it was turned off.

Bug: 18780696
Change-Id: I923bd4b5019d634e5352a6e893005133edb475f6
 2015-01-26 17:39:49 -08:00
Chris Craik
2da67b570c am 00c53d66: am cdd8b7f8: Merge "Invalidate outline on padding update" into lmp-mr1-dev 
* commit '00c53d66dd56384aff834ec2c59de9f3c3913579':
  Invalidate outline on padding update
 2015-01-27 01:37:09 +00:00
Alan Viverette
da9653a263 am 8648dfe5: am 5229be05: Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev 
* commit '8648dfe5f52f131b0af1a17a383ce11d213cedc2':
  Convert getHourForDegrees result to 12-hour format when needed
 2015-01-27 01:37:03 +00:00
Chris Craik
00c53d66dd am cdd8b7f8: Merge "Invalidate outline on padding update" into lmp-mr1-dev 
* commit 'cdd8b7f8199eb94ca133c8cebddf86adb0f9bb11':
  Invalidate outline on padding update
 2015-01-27 01:13:00 +00:00
Alan Viverette
8648dfe5f5 am 5229be05: Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev 
* commit '5229be05b439cf24b7028adbb64d05ecc23184ac':
  Convert getHourForDegrees result to 12-hour format when needed
 2015-01-27 01:12:56 +00:00
Chris Craik
cdd8b7f819 Merge "Invalidate outline on padding update" into lmp-mr1-dev 2015-01-27 01:08:54 +00:00
Alan Viverette
5229be05b4 Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev 2015-01-27 01:02:00 +00:00
George Mount
fbd459642f Activity Transition: fix quick back after enter. 
Bug 19105460

When an Activity Transition was receiving an exit call
immediately after the enter, the transition for the enter
was still in progress. TransitionManager does not allow
multiple transitions to work at once, so the enter transition
would run, but the exit did not. This CL detects when the
enter transition is still pending and tells the
ActivityTransitionState to delay one frame so that the
enter can finish its required work prior to starting the
exit transition.

Change-Id: I1b40f1e41d61a67da3fd672419ea321e7d0496da
 2015-01-26 15:59:42 -08:00
Alan Viverette
5efe0d199e Convert getHourForDegrees result to 12-hour format when needed 
Also prevents the selector from jumping between the inner and outer
circle during touch exploration in 24-hour mode.

Bug: 19101918
Change-Id: If342056b378927397f8651dad5e8d806bcda03a6
 2015-01-26 15:34:56 -08:00
Chris Craik
c43a820945 Invalidate outline on padding update 
bug:19113359

Ensures that ViewOutlineProvider#PADDED_BOUNDS is always kept up to
date with the view's padding.

Change-Id: I5e090bd8272e89d6b8b9055dbe95ef3d45333fcb
 2015-01-26 14:40:29 -08:00
Lorenzo Colitti
583dec84d9 am 3d992507: am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev 
* commit '3d992507a09b4d32c1e961a99d77027db050f01b':
  Only try to fetch time from NTP if there is a network connection.
 2015-01-26 22:22:27 +00:00
Lorenzo Colitti
3d992507a0 am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev 
* commit '09dff843b8ed402564c4c89d7e1cabceb715e458':
  Only try to fetch time from NTP if there is a network connection.
 2015-01-26 22:16:03 +00:00
Lorenzo Colitti
09dff843b8 Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev 2015-01-26 22:08:19 +00:00
Alan Viverette
a6b9390949 am e1eff7aa: am de8d2840: Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev 
* commit 'e1eff7aadeb0c9f6cc51f07166accd63710ea2c5':
  Prevent drag-to-open from cycling pressed state, propagate hotspot
 2015-01-26 19:29:31 +00:00
Alan Viverette
e1eff7aade am de8d2840: Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev 
* commit 'de8d28405538128fad55e34dc7c74fd49a909ae6':
  Prevent drag-to-open from cycling pressed state, propagate hotspot
 2015-01-26 19:23:27 +00:00
Alan Viverette
2563095d2d Prevent drag-to-open from cycling pressed state, propagate hotspot 
Avoids unnecessary changes to pressed state. Ensures hotspot propagates
to both the list view and the list item view since both receive the
pressed state.

Bug: 19134424
Change-Id: If2496ce2042e43fe1c1efd527eeca10dc53e1f4a
 2015-01-26 10:24:08 -08:00
Bryce Lee
35dafda1b0 Make THEATER_MODE_ON setting a system api. 
This will allow an unbundled home to continue accessing this property.

Bug: 19043538
Change-Id: I845a8726e617ca7b6f7f7347a0ac5aa0620d6658
 2015-01-26 08:21:10 -08:00
Lorenzo Colitti
df59053588 Only try to fetch time from NTP if there is a network connection. 
Bug: 19046107
Change-Id: Iff647ee33fe0eb9b530d7baad636d32b386e4fa7
 2015-01-26 15:24:07 +09:00
Svetoslav
a1ac6a0925 Accessibility: Ignore overlapping siblings when computing a click location 
To click a view we were computing a click location by ignoring overlapping
views that are actionable. However, detection whether a view is actionable
is not always possible as the view may handle touch events directly. This
leads to unhandled edge cases. We are taking a conservative approach and
ignore all overlapping siblings regardless if clickable. This is also has
limitations but hopefully less frequent edge cases.

bug:18889611

Change-Id: Icea0b7b3e2d4ed53e50e01cb6a99b880be560b14
 2015-01-23 16:13:43 -08:00
Svetoslav
9027d7355e am 42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev 
automerge: 6e9f276

* commit '6e9f276ff1554b59692a1820f60217307460308b':
  Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
 2015-01-23 22:30:46 +00:00
Svetoslav
6e9f276ff1 am 42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev 
* commit '42a13865a4527aaf907a6ced96f726b49b2cbbed':
  Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
 2015-01-23 22:27:04 +00:00
Svetoslav
42a13865a4 Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev 2015-01-23 22:22:18 +00:00
Chet Haase
f647cde899 am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev 
automerge: 458cc6a

* commit '458cc6a51567677e8a4d1012d3ac89ae57c4daf7':
  Allow infinite-repeat zero-duration animators to continue repeating
 2015-01-23 18:07:14 +00:00