Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
163,799 Commits 3 Branches 0 Tags
7fc93fa94474c19a511d0843295e1cd4c35d4b5a
Commit Graph

7743 Commits

Author SHA1 Message Date
Christoph Studer
0c07268aa4 am d894e9b8: am b83d9dc3: am dfd80a4e: am 1ff283b8: am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev 
* commit 'd894e9b8d0aeccaf14c52152bffc87d43ce5bd83':
  SysUI: Correctly compare MediaControllers
 2014-09-23 20:55:48 +00:00
Jeff Brown
bd369f4a58 am f45e4d55: am c7b28e74: am e5121f0e: am 86cb67b1: am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev 
* commit 'f45e4d5535d1540c99b944e244e2720436d369f2':
  Ensure wakelock is released unconditionally.
 2014-09-23 19:08:13 +00:00
Christoph Studer
ccc3f012b0 am b83d9dc3: am dfd80a4e: am 1ff283b8: am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev 
* commit 'b83d9dc3e1d853d43807375d79d90739e572b938':
  SysUI: Correctly compare MediaControllers
 2014-09-23 17:48:30 +00:00
Jeff Brown
3f0afd3544 am c7b28e74: am e5121f0e: am 86cb67b1: am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev 
* commit 'c7b28e741062e197644f2c2f29b55a75b4ccb39e':
  Ensure wakelock is released unconditionally.
 2014-09-23 17:22:59 +00:00
Christoph Studer
8d843cea30 am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev 
* commit '5a7068eec454df33575176d9f4ee58de577a6401':
  SysUI: Correctly compare MediaControllers
 2014-09-23 17:11:30 +00:00
Christoph Studer
231dc0a6d2 Merge "SysUI: Correctly compare MediaControllers" into lmp-dev 2014-09-23 17:03:48 +00:00
Jeff Brown
47b32c569a am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev 
* commit '28c9590b90215230b65d98c4d816e0d776a07540':
  Ensure wakelock is released unconditionally.
 2014-09-23 16:48:40 +00:00
Jeff Brown
510e8cdc8d Merge "Ensure wakelock is released unconditionally." into lmp-dev 2014-09-23 16:39:40 +00:00
Jeff Brown
a273924b8c Ensure wakelock is released unconditionally. 
Bug: 17610254
Change-Id: I8b846c867edaa5038e34d4c857550735b121a1d9
 2014-09-23 09:38:04 -07:00
Selim Cinek
be14f2453a am 91be004d: am 51bc3416: am e9d27cb2: am d6a4bd90: am d08372bc: Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev 
* commit '91be004d3b6ea0064ec2cf9f8ab7170ea7c8c991':
  Fixed a bug where the alarm could overlap in QS
 2014-09-23 16:22:35 +00:00
Adrian Roos
b8682f91a6 am cc9f57df: am 2d9f7f57: am a2145ac0: am 034d1d03: am b98fd933: Merge "Ensure that force lock works with accessibility enabled" into lmp-dev 
* commit 'cc9f57df925a80a22d5cf666851937e75bdc2ffc':
  Ensure that force lock works with accessibility enabled
 2014-09-23 16:22:30 +00:00
John Spurlock
2389580424 am ac96ebf0: am 59c9166f: am 024849b2: am 92b32c41: am afbfb9b5: Merge "Doze: Fix NPE found when pulsing and !dozing." into lmp-dev 
* commit 'ac96ebf070bb3cb3afc0c6458997ac5d962fcbdf':
  Doze: Fix NPE found when pulsing and !dozing.
 2014-09-23 16:19:13 +00:00
John Spurlock
c80405ab5c am de53e072: am 78de9759: am 2af1bf3b: am 53a19524: am ff8c16e7: Merge "Zen: Add content description to settings icon." into lmp-dev 
* commit 'de53e07222a90bcbd786fec226ee01bc70f879e4':
  Zen: Add content description to settings icon.
 2014-09-23 16:19:08 +00:00
Jason Monk
bd42abc6c9 am e14c561f: am 185f34b5: am 1555ed94: am eeda2131: am 5c2ecf24: Merge "Announce title of QS detail views" into lmp-dev 
* commit 'e14c561f96438353518e964568fd5cb135ff2228':
  Announce title of QS detail views
 2014-09-23 16:16:38 +00:00
Jason Monk
928a74de07 am 66748e95: am e88e8e85: am 78f7385f: am f09fda20: am f9d996c1: Fix status bar cast icon not updating 
* commit '66748e95289f5b466c51c0e5116ba0ecfe4ee9e1':
  Fix status bar cast icon not updating
 2014-09-23 16:16:33 +00:00
John Spurlock
9702192319 am e47f03c1: am 34dfd6bb: am d613437b: am 797fd661: am 61ffcaca: Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev 
* commit 'e47f03c1d0b18c915344315e4dc172b834ac33bd':
  Doze: Ensure a doze reset happens after leaving keyguard.
 2014-09-23 16:16:23 +00:00
John Spurlock
2b613e1a13 am 1d807090: am 082c2b49: am b22dc016: am 7e5776e1: am bfaadc6b: Merge "Mark sysui config resource as untranslatable." into lmp-dev 
* commit '1d807090324cc604bacadd828366630c3318a4f1':
  Mark sysui config resource as untranslatable.
 2014-09-23 16:15:23 +00:00
Selim Cinek
b3f22d3c4b am 51bc3416: am e9d27cb2: am d6a4bd90: am d08372bc: Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev 
* commit '51bc341620f3aa7e63f5dd33954ececf9503f6cf':
  Fixed a bug where the alarm could overlap in QS
 2014-09-23 15:53:38 +00:00
Adrian Roos
3da2015467 am 2d9f7f57: am a2145ac0: am 034d1d03: am b98fd933: Merge "Ensure that force lock works with accessibility enabled" into lmp-dev 
* commit '2d9f7f573e5255a84b74da923124f3cac1f094a7':
  Ensure that force lock works with accessibility enabled
 2014-09-23 15:53:29 +00:00
Selim Cinek
3caab56c21 am d08372bc: Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev 
* commit 'd08372bc89eb0a1de3dee72a270b65b10701aad3':
  Fixed a bug where the alarm could overlap in QS
 2014-09-23 14:33:04 +00:00
Selim Cinek
0eba4e279f Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev 2014-09-23 14:25:09 +00:00
Adrian Roos
18321f5337 am b98fd933: Merge "Ensure that force lock works with accessibility enabled" into lmp-dev 
* commit 'b98fd933fd7c5ca2c75849a013fc942ec211b5ee':
  Ensure that force lock works with accessibility enabled
 2014-09-23 14:00:27 +00:00
Adrian Roos
6ec76b0ff9 Merge "Ensure that force lock works with accessibility enabled" into lmp-dev 2014-09-23 13:48:42 +00:00
Selim Cinek
ba5b3a0b4e Fixed a bug where the alarm could overlap in QS 
When closing the QS panel the alarm did the normal
transformation, regardless whether we were in a
detail state. This lead to the alarm overlapping
with the title.

Bug: 17581501
Change-Id: I0318f6778063af11f388e6c7fe8bbb30105ca246
 2014-09-23 15:39:54 +02:00
John Spurlock
2bce7a4270 am 59c9166f: am 024849b2: am 92b32c41: am afbfb9b5: Merge "Doze: Fix NPE found when pulsing and !dozing." into lmp-dev 
* commit '59c9166feb00552f250e2b645a450604c448dff8':
  Doze: Fix NPE found when pulsing and !dozing.
 2014-09-22 20:22:49 +00:00
John Spurlock
9261f8973e am 78de9759: am 2af1bf3b: am 53a19524: am ff8c16e7: Merge "Zen: Add content description to settings icon." into lmp-dev 
* commit '78de9759984d67b46258f5ca61adfaf81d29429e':
  Zen: Add content description to settings icon.
 2014-09-22 20:22:44 +00:00
Jason Monk
0bc835f1f6 am 185f34b5: am 1555ed94: am eeda2131: am 5c2ecf24: Merge "Announce title of QS detail views" into lmp-dev 
* commit '185f34b5e230c8fbe616ae2f39e19185c773df83':
  Announce title of QS detail views
 2014-09-22 19:45:18 +00:00
Jason Monk
a7407db420 am e88e8e85: am 78f7385f: am f09fda20: am f9d996c1: Fix status bar cast icon not updating 
* commit 'e88e8e85d5709c5305e2555c55d5d308e950df8c':
  Fix status bar cast icon not updating
 2014-09-22 19:45:13 +00:00
John Spurlock
8ac6756b88 am 34dfd6bb: am d613437b: am 797fd661: am 61ffcaca: Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev 
* commit '34dfd6bbbd7453cf9426c179818e200251315fe1':
  Doze: Ensure a doze reset happens after leaving keyguard.
 2014-09-22 19:45:04 +00:00
John Spurlock
51abd935e3 am afbfb9b5: Merge "Doze: Fix NPE found when pulsing and !dozing." into lmp-dev 
* commit 'afbfb9b5efd8a7ebb320f0b5e8c3003b646705a8':
  Doze: Fix NPE found when pulsing and !dozing.
 2014-09-22 19:44:49 +00:00
John Spurlock
37758bf5a3 am ff8c16e7: Merge "Zen: Add content description to settings icon." into lmp-dev 
* commit 'ff8c16e73349bc7c1e47f1ef88276928cd1a7366':
  Zen: Add content description to settings icon.
 2014-09-22 19:44:44 +00:00
John Spurlock
707b6d7a9f am 082c2b49: am b22dc016: am 7e5776e1: am bfaadc6b: Merge "Mark sysui config resource as untranslatable." into lmp-dev 
* commit '082c2b4924387b7635ea2b19a110c5f465833773':
  Mark sysui config resource as untranslatable.
 2014-09-22 19:43:54 +00:00
John Spurlock
101b785d42 Merge "Doze: Fix NPE found when pulsing and !dozing." into lmp-dev 2014-09-22 19:35:55 +00:00
John Spurlock
b9e9729887 Merge "Zen: Add content description to settings icon." into lmp-dev 2014-09-22 19:35:12 +00:00
John Spurlock
58a28eb85e Doze: Fix NPE found when pulsing and !dozing. 
Bug:17390492
Change-Id: Id6665c5bb8fa13ee08f68478c601b77a4f9e3f6a
 2014-09-22 15:20:52 -04:00
John Spurlock
50d0144996 am 7e5776e1: am bfaadc6b: Merge "Mark sysui config resource as untranslatable." into lmp-dev 
* commit '7e5776e12c9706f511c22993dfed3bb30d22ed8d':
  Mark sysui config resource as untranslatable.
 2014-09-22 19:17:38 +00:00
John Spurlock
b753372da6 Zen: Add content description to settings icon. 
Bug:17578039
Change-Id: I6c513200b2ac1d6abd6da0dd7412500a12fded28
 2014-09-22 15:14:48 -04:00
Jason Monk
1c30334b77 am 5c2ecf24: Merge "Announce title of QS detail views" into lmp-dev 
* commit '5c2ecf242ba7cda0340574e543b581818972e76a':
  Announce title of QS detail views
 2014-09-22 15:46:46 +00:00
Jason Monk
443c4e6504 am f9d996c1: Fix status bar cast icon not updating 
* commit 'f9d996c179e319e54769230e293b8712a3f0631b':
  Fix status bar cast icon not updating
 2014-09-22 15:46:42 +00:00
Adrian Roos
38fc7606b1 Ensure that force lock works with accessibility enabled 
Fixes a bug where the force lock gesture was not available
when an accessibility service was active, but touch exploration
wasn't.

Bug: 17514298
Change-Id: Ib42e28f643559040ad5f24d45456b0a41008c647
 2014-09-22 17:34:56 +02:00
Jason Monk
fdb35f0526 Merge "Announce title of QS detail views" into lmp-dev 2014-09-22 15:33:06 +00:00
Jason Monk
7eb6202fee Fix status bar cast icon not updating 
Change the listening in CastControllerImpl so that it will always
at least passive discovery when callbacks are added.  When discovering
is set this will switch to request discovery.  This allows the
status bar to catch disconnect callbacks when QS is not discovering.

Bug: 17555869
Change-Id: Id2a80b98f6c7ca7e6a4d0ff00315d10a109e8259
 2014-09-22 10:53:50 -04:00
Jason Monk
8051316273 Announce title of QS detail views 
When entering a QS detail view announce the title of the view for
accessibility.

Bug: 17578404
Change-Id: I4cfd1bc85604af822b4f5fce852b39687f71cbae
 2014-09-22 10:21:01 -04:00
John Spurlock
76e9454189 am 61ffcaca: Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev 
* commit '61ffcacad7be97c8f102b23298d2c9c80f69e550':
  Doze: Ensure a doze reset happens after leaving keyguard.
 2014-09-22 03:17:40 +00:00
John Spurlock
cf5d3c98d1 Doze: Ensure a doze reset happens after leaving keyguard. 
Bug:17536133
Change-Id: Ibc88a7f2c1a51656676fe62d4de8ab3ec4dd4081
 2014-09-21 18:00:01 -04:00
Baligh Uddin
43c9e64b9a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-21 17:51:34 +00:00
Baligh Uddin
817bb46306 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-21 17:51:04 +00:00
John Spurlock
91e022b426 am bfaadc6b: Merge "Mark sysui config resource as untranslatable." into lmp-dev 
* commit 'bfaadc6b4098c23f5dc1a15522a011ba3cd72bf5':
  Mark sysui config resource as untranslatable.
 2014-09-21 17:06:49 +00:00
John Spurlock
8fefb4281a Merge "Mark sysui config resource as untranslatable." into lmp-dev 2014-09-21 16:57:55 +00:00
Baligh Uddin
bf43691cc9 Import translations. DO NOT MERGE 
Change-Id: Icd10ba35892ef4cfcd116ca9f86ba8fe88a8c62c
Auto-generated-cl: translation import
 2014-09-20 16:23:44 -07:00