Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
181,091 Commits 3 Branches 0 Tags
43181fb72d12bbf4f89a015f5020229b6ee00aab
Commit Graph

45279 Commits

Author SHA1 Message Date
Jose Lima
43181fb72d am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973 
automerge: 485f6a6

* commit '485f6a60e0182767d57a5ab08d6438124a69439e':
  Fix crash caused by disabling the Options panel on TVs
 2015-01-28 21:32:37 +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
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
Chien-Yu Chen
25af2fc0cc Merge "CameraManager: add torch mode APIs for flashlight" 2015-01-28 18:24:47 +00:00
Bryce Lee
c0086ea950 am 263987f6: am 2a8ccd4b: am 1061652a: Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev 
* commit '263987f6268439af69fcfa66a278103e1efe1343':
  Revert "Make THEATER_MODE_ON setting a system api."
 2015-01-28 18:05:04 +00: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
293465a75c am f2d5253b: am fdb8dff5: am d8cb4040: Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev 
* commit 'f2d5253bce5ef69cb6cb4da7697a228a47b55904':
  Make THEATER_MODE_ON setting a system api.
 2015-01-28 17:22:22 +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
Craig Mautner
5d49712960 Merge "Remove TYPE_UNIVERSE_BACKGROUND from system" 2015-01-28 02:35:15 +00:00
Chien-Yu Chen
c8c109b403 CameraManager: add torch mode APIs for flashlight 
Add torch mode APIs to support flashlight without opening any
camera devices.

Bug: 2682206
Change-Id: Ifb66c309f23fd7e9f124016e0d9c6b364d19acdd
 2015-01-27 16:55:16 -08:00
Alan Viverette
ca360e14af Merge "Fix fallout from merging e5743753 conflicts" 2015-01-28 00:22:03 +00:00
Alan Viverette
4c05c4c216 Fix fallout from merging e5743753 conflicts 
Change-Id: Iad16381bdf925a05e2ec609c3a5442c2a0354be9
 2015-01-27 16:21:25 -08:00
Alan Viverette
b032cd1f52 Merge "Expose View.OnScrollChangeListener interface" 2015-01-28 00:02:21 +00:00
Alan Viverette
f9d7eedc46 Expose View.OnScrollChangeListener interface 
Allows clients to observe changes to scrollX / scrollY.

Bug: 19098033
Change-Id: I070e61a9532fe1f6cb5437eab94f7fffc1b17e97
 2015-01-27 15:38:19 -08:00
George Mount
206db8a70f am fff84a23: Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev automerge: aa6945a 
automerge: 5c25f5b

* commit '5c25f5b0a7de7c05e71a88373223d579c3823415':
  Activity Transition: fix quick back after enter.
 2015-01-27 23:30:18 +00:00
Alan Viverette
d8111138ab resolve merge conflicts of e5743753 to master. 
Change-Id: I83f4b6abb669963b9c4fcdf9870317e019360d46
 2015-01-27 15:23:09 -08:00
Craig Mautner
165be0c70d Remove TYPE_UNIVERSE_BACKGROUND from system 
An experiment that is over and has been occupying space.

Fixes bug 18088522 item #7

Change-Id: Ib0fcaa24243ed9b0581143e1d5114c1fd2b0aa6e
 2015-01-27 15:16:58 -08:00
Wale Ogunwale
783f28691e Merge "Support activities in the same process having different resources." 2015-01-27 22:24:15 +00:00
Craig Mautner
1ab8674be0 Merge "Eliminate groupId and add task to AppWindowToken" 2015-01-27 22:15:19 +00:00
Craig Mautner
83162a9027 Eliminate groupId and add task to AppWindowToken 
Simplifies access by eliminating indirect referencing.

Fixes bug 18088522 item #15.

Change-Id: I9049192a7f3e1028d60c4f2d4d4a0d4aad590aa4
 2015-01-27 13:56:20 -08:00
Alan Viverette
d8c2af5542 Fix build 
Change-Id: I134e40dbabcb9b111b3d7851a7adc247f5c92e3b
 2015-01-27 13:35:14 -08:00
Jose Lima
ceba619e36 am 445768bd: am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev 
automerge: 69fbcf1

* commit '69fbcf1f100905f5a28909d561db4753189bd717':
  Allow disabling the Options Pannel feature for TVs
 2015-01-27 17:57:04 +00:00
Chris Craik
b018835dc7 am 00c53d66: am cdd8b7f8: Merge "Invalidate outline on padding update" into lmp-mr1-dev 
automerge: 2da67b5

* commit '2da67b570c91a831550fee32f778e2a60055e0d8':
  Invalidate outline on padding update
 2015-01-27 17:53:00 +00:00
Alan Viverette
2a05ae733b resolve merge conflicts of da9653a to master. 
Change-Id: I51a1056b36015986d7e55aa38d658b547c2446e1
 2015-01-27 09:48:47 -08:00
Wale Ogunwale
60454dbc4d Support activities in the same process having different resources. 
Activities can be of various sizes in a multi-window environment.
This change allows them to have override configurations that allows
different resources to the loaded if needed.

Bug: 19002213
Change-Id: Ib2c7be0b427f5ce05e7a362bcdd496ddbc9164f0
 2015-01-27 07:50:58 -08: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
Brian Attwell
7ba4751e91 Merge "Add Insert.EXTRA_{ACCOUNT,DATA_SET} to API. P #1/2" 2015-01-27 00:50:01 +00:00
Brian Attwell
63f859b2b7 Add Insert.EXTRA_{ACCOUNT,DATA_SET} to API. P #1/2 
Names are based on recent suggestions from the API council, such as
implemented inside ag/540453.

Bug: 18777272
Change-Id: I17a5b7cb4d4c5a0ba48936a6fc829acaab73f31d
 2015-01-27 00:05:07 +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