Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
180,956 Commits 3 Branches 0 Tags
b805dd3a8e4fda83aa41738eb761300a45107267
Commit Graph

180956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
b805dd3a8e am b84e0040: am 525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev 
automerge: 9461526

* commit '94615260a8fc51fc6b9a0407b1caa13849082af5':
  Make NetworkMonitor less aggressive on broken networks.
 2015-01-27 23:29:02 +00:00
Yabin Cui
026111bc56 am f7049289: am 3812e68e: Merge "kill HAVE_PTHREADS." 
automerge: 3a10a67

* commit '3a10a672f05735be46256617b8a61cdb1e589008':
  kill HAVE_PTHREADS.
 2015-01-27 23:27:37 +00:00
Svetoslav
85d6a63d41 am fcecdccc: am 369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev 
automerge: 3fd1ebf

* commit '3fd1ebff6c017ba4495070cb34f1ed7652b33cc9':
  Add a missing file to print spooler resources
 2015-01-27 23:26:24 +00:00
Alan Viverette
d8111138ab resolve merge conflicts of e5743753 to master. 
Change-Id: I83f4b6abb669963b9c4fcdf9870317e019360d46
 2015-01-27 15:23:09 -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
a171ae1bb2 Merge "Precompute FLAG_ACTIVITY_NO_ANIMATION" 2015-01-27 22:15:56 +00:00
Craig Mautner
1ab8674be0 Merge "Eliminate groupId and add task to AppWindowToken" 2015-01-27 22:15:19 +00:00
Craig Mautner
8f5f7e9245 Precompute FLAG_ACTIVITY_NO_ANIMATION 
Save lots of passing around of ActivityRecords when all you care
about is the flag.

Fixes bug 18088522 item #14

Change-Id: Ib6d95ef06b44faa1715a196ab710f96ed4517213
 2015-01-27 13:56:39 -08: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
Alan Viverette
0011753a1a Merge "resolve merge conflicts of da9653a2 to master." 2015-01-27 18:22:11 +00:00
Alan Viverette
8f0a2f37e5 resolve merge conflicts of da9653a2 to master. 
Change-Id: Ic77174eb047e2a925e5feedf032e1f26f892ad61
 2015-01-27 10:21:06 -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
Craig Mautner
9933b3136e am 603d30b1: Merge "Stop logging service starts and stops." into lmp-mr1-dev automerge: 49880ee 
automerge: 8e72aa8

* commit '8e72aa8a41cf1395ce30a9f0c9416587d64b5ba9':
  Stop logging service starts and stops.
 2015-01-27 17:55:31 +00:00
Wonsik Kim
1bc966d94d am b3c06e49: Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev automerge: cd8a80c 
automerge: ae3e5e8

* commit 'ae3e5e82b6d36aa49cd9da7d89f6943fe92b1d41':
  TIF: fix loud volume after input switch when volume is 0
 2015-01-27 17:54:20 +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
deff152e88 Merge "resolve merge conflicts of da9653a to master." 2015-01-27 17:50:22 +00:00
Alan Viverette
2a05ae733b resolve merge conflicts of da9653a to master. 
Change-Id: I51a1056b36015986d7e55aa38d658b547c2446e1
 2015-01-27 09:48:47 -08:00
Jorim Jaggi
cb4f594eca Remove dead code #11: Remove more unused classes 
Change-Id: Ie78d40fd20eef859e3c0ea9269b86ff1e1471a58
 2015-01-27 18:15:50 +01:00
Jorim Jaggi
3cdb3b7d0d Merge "Revert "Remove dead code #11: Remove more unused classes"" 2015-01-27 16:53:02 +00:00
Jorim Jaggi
de47e3554d Revert "Remove dead code #11: Remove more unused classes" 
This reverts commit 397ca8be8d.

Change-Id: Id7f8dbe93d2a48a7f6261232499f73b7de8dd7b1
Reason: Build breakage.
 2015-01-27 16:52:24 +00:00
Jorim Jaggi
ca3e3b73b3 Merge "Remove dead code #11: Remove more unused classes" 2015-01-27 16:12:25 +00: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
Lorenzo Colitti
94615260a8 am b84e0040: am 525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev 
* commit 'b84e0040d8c2f44790e7ceeda8cddf3524f33d29':
  Make NetworkMonitor less aggressive on broken networks.
 2015-01-27 11:55:51 +00:00
Lorenzo Colitti
b84e0040d8 am 525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev 
* commit '525588c593794cf52d93665e9cf55f06abd3d1b7':
  Make NetworkMonitor less aggressive on broken networks.
 2015-01-27 11:46:31 +00:00
Lorenzo Colitti
525588c593 Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev 2015-01-27 11:41:10 +00:00
Yabin Cui
3a10a672f0 am f7049289: am 3812e68e: Merge "kill HAVE_PTHREADS." 
* commit 'f70492898b3efa3c5f480f195062fa6f293bc764':
  kill HAVE_PTHREADS.
 2015-01-27 07:04:55 +00:00
Yabin Cui
f70492898b am 3812e68e: Merge "kill HAVE_PTHREADS." 
* commit '3812e68ea788782c54c27f69d08bcc1419066cb2':
  kill HAVE_PTHREADS.
 2015-01-27 06:54:06 +00:00
Yabin Cui
3812e68ea7 Merge "kill HAVE_PTHREADS." 2015-01-27 06:49:16 +00:00
Yabin Cui
1610486d37 kill HAVE_PTHREADS. 
Bug: 19083585
Change-Id: Ib466949bb6cd6d1bbc4680e989f0f9fae62ca564
 2015-01-26 22:32:38 -08:00
Svetoslav
3fd1ebff6c am fcecdccc: am 369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev 
* commit 'fcecdccc0f24b9c9447fe5bd69c31ca29c35d5c8':
  Add a missing file to print spooler resources
 2015-01-27 04:36:37 +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
fcecdccc0f am 369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev 
* commit '369f1ec6ea78637870f35822456628e7ae8caf95':
  Add a missing file to print spooler resources
 2015-01-27 04:26:55 +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
369f1ec6ea Merge "Add a missing file to print spooler resources" into lmp-mr1-dev 2015-01-27 04:24:08 +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
Craig Mautner
8e72aa8a41 am 603d30b1: Merge "Stop logging service starts and stops." into lmp-mr1-dev automerge: 49880ee 
* commit '603d30b1cfe7be61e4e352b58342b86e5cfb7612':
  Stop logging service starts and stops.
 2015-01-27 01:47:16 +00:00
Wonsik Kim
ae3e5e82b6 am b3c06e49: Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev automerge: cd8a80c 
* commit 'b3c06e49c8e286f8960be65c3e96934ea2ab8b49':
  TIF: fix loud volume after input switch when volume is 0
 2015-01-27 01:47:11 +00:00
Craig Mautner
603d30b1cf Merge "Stop logging service starts and stops." into lmp-mr1-dev 
automerge: 49880ee

* commit '49880eeb00c71a2287db65717fd8a7ff5e87279d':
  Stop logging service starts and stops.
 2015-01-27 01:41:15 +00:00
Wonsik Kim
b3c06e49c8 Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev 
automerge: cd8a80c

* commit 'cd8a80c7077ee1ef14888e1a735b20c7119c1aac':
  TIF: fix loud volume after input switch when volume is 0
 2015-01-27 01:39:56 +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
Craig Mautner
49880eeb00 Merge "Stop logging service starts and stops." into lmp-mr1-dev 2015-01-27 01:15:35 +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
Wonsik Kim
cd8a80c707 Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev 2015-01-27 01:12:33 +00:00