9330 Commits

Author SHA1 Message Date
John Spurlock
ce9258c2f9 am 58ac4ba9: am f0580c6e: Merge "Shade: Hide the status icons from the collapsed header." into lmp-dev
* commit '58ac4ba9ef2eb5e0a5f5f7d28e35bdb0d822def1':
  Shade: Hide the status icons from the collapsed header.
2014-07-17 17:06:47 +00:00
John Spurlock
96fbfc4f57 am 649eea00: am 791c827c: Merge "Zen: Return of the alarm warning." into lmp-dev
* commit '649eea00d38cbbfdb9b2e6411124bf1d8764941b':
  Zen: Return of the alarm warning.
2014-07-17 17:06:39 +00:00
Adrian Roos
d685b34956 am f693c9c3: am 3e7b4279: Merge "Update QS user switcher colors to spec" into lmp-dev
* commit 'f693c9c3e595d5a5e19b5234a4999b7fe84bb976':
  Update QS user switcher colors to spec
2014-07-17 17:05:46 +00:00
Dan Sandler
3448d973bf am 24b3cab7: am ce4dc71c: Merge "Album artwork returns triumphantly to the lockscreen." into lmp-dev
* commit '24b3cab7bf8d265d0807d77c4fe34b4b10e20555':
  Album artwork returns triumphantly to the lockscreen.
2014-07-17 17:05:09 +00:00
John Spurlock
df3ef4fb1e am 11d850c1: am efe8514f: Merge "Update data limit notification icon + strings." into lmp-dev
* commit '11d850c11157aab9804d28169f9c72cca431fc1e':
  Update data limit notification icon + strings.
2014-07-17 17:05:05 +00:00
John Spurlock
0bca88ac51 am 02d9aa3f: am fddad887: Merge "QS: Deal with null uuids in BT controller." into lmp-dev
* commit '02d9aa3f961de03827c1e5ce8c4cc7ece402acd3':
  QS: Deal with null uuids in BT controller.
2014-07-17 17:04:35 +00:00
Sailesh Nepal
f980901bca am 03e88771: TTY: frameworks/base changes
* commit '03e88771769c376017af281d3c23ac0e030fee52':
  TTY: frameworks/base changes
2014-07-17 16:58:39 +00:00
John Spurlock
23e85fb6f8 am f0580c6e: Merge "Shade: Hide the status icons from the collapsed header." into lmp-dev
* commit 'f0580c6e818e371b0934d560284f3b8e5606425d':
  Shade: Hide the status icons from the collapsed header.
2014-07-17 15:59:15 +00:00
John Spurlock
3fc3ffd736 am 791c827c: Merge "Zen: Return of the alarm warning." into lmp-dev
* commit '791c827c22c8d0179500f0df201a58bce62ad68e':
  Zen: Return of the alarm warning.
2014-07-17 15:51:21 +00:00
Adrian Roos
5cb7dde7ac am 3e7b4279: Merge "Update QS user switcher colors to spec" into lmp-dev
* commit '3e7b4279abee870d5094f505a9bbdcd42c9a7256':
  Update QS user switcher colors to spec
2014-07-17 14:19:21 +00:00
Dan Sandler
9591597f53 am ce4dc71c: Merge "Album artwork returns triumphantly to the lockscreen." into lmp-dev
* commit 'ce4dc71cfc0ecbfe1bd504b5d906fbd81b2164b1':
  Album artwork returns triumphantly to the lockscreen.
2014-07-17 14:17:16 +00:00
John Spurlock
6530a89c8e am efe8514f: Merge "Update data limit notification icon + strings." into lmp-dev
* commit 'efe8514f89c8f8ecd256f8fc1ef577cbcec05421':
  Update data limit notification icon + strings.
2014-07-17 14:17:12 +00:00
John Spurlock
186f2c40fa am fddad887: Merge "QS: Deal with null uuids in BT controller." into lmp-dev
* commit 'fddad8871e41cedc2b0bb31edd7f3a509ac7c403':
  QS: Deal with null uuids in BT controller.
2014-07-17 14:16:43 +00:00
Winson Chung
56e74d5218 am 24d04eeb: Merge "Don\'t clobber intent flags when starting recent activities anew. (Bug 16327074)" into lmp-dev
* commit '24d04eebfe00e0d8346c2864d84f04b4d046b9e1':
  Don't clobber intent flags when starting recent activities anew. (Bug 16327074)
2014-07-17 14:02:55 +00:00
RoboErik
ce271b0615 am 9b039cf8: Merge "Make MediaSession and MediaController constructors public" into lmp-dev
* commit '9b039cf80a0c0c388ccbd8b6ece9aa5c7b970f26':
  Make MediaSession and MediaController constructors public
2014-07-17 14:02:42 +00:00
John Spurlock
89f060a1e0 Zen: Return of the alarm warning.
- Remove the term timers from subtitle, the term "alarms"
  is now inclusive of timers.
- Resurrect the alarm warning, give it a more prominent
  appearance if we can detect an overlap in a time-based
  exit condition and the next alarm time.

Change-Id: I5d6d67694c7acc9e2a5a7c63e647069744a22cec
2014-07-17 11:41:18 -04:00
John Spurlock
f83fc9b48f Merge "Shade: Hide the status icons from the collapsed header." into lmp-dev 2014-07-17 07:12:45 +00:00
John Spurlock
07f6d3b6dd Shade: Hide the status icons from the collapsed header.
Only show wifi / cell / battery / user, the entire statusIcons
layout s/b hidden when reparented to the header.

Bug:16355667
Change-Id: I4c99ffed82af47c4e67e7915a8cb98fc04ad7017
2014-07-17 10:44:34 -04:00
Adrian Roos
9d32507a86 Merge "Update QS user switcher colors to spec" into lmp-dev 2014-07-17 00:15:07 +00:00
Dan Sandler
d10b2f17a1 Merge "Album artwork returns triumphantly to the lockscreen." into lmp-dev 2014-07-16 23:37:00 +00:00
Dan Sandler
16128f4523 Album artwork returns triumphantly to the lockscreen.
It is pulled from the metadata of the active media
session, which we fetch in one of two ways:

1. From a proper media notification, we can extract the
   session token from EXTRA_MEDIA_SESSION.
2. If none of these is found, we ask MediaSessionManager for
   any outstanding media sessions whose packages match an
   active notification. These include legacy RCC clients,
   whose notifications are oblivious to EXTRA_MEDIA_SESSION.

We then pull the album artwork out of the metadata and fade
it in on the lockscreen.

Bug: 15147533
Bug: 15135254
Change-Id: Ia967bfba310b6c792b14673872cb132ddd7052a5
2014-07-16 23:51:54 -04:00
Adrian Roos
19f653ec19 Update QS user switcher colors to spec
Bug: 15545213
Change-Id: Id0e48e4406c64d2a8a19ed8fdcec398896ca11c0
2014-07-17 01:32:30 +02:00
John Spurlock
0e05ced66c Merge "QS: Deal with null uuids in BT controller." into lmp-dev 2014-07-16 22:04:55 +00:00
John Spurlock
27bdff7750 QS: Deal with null uuids in BT controller.
Fix crash when the device is no longer available.

Bug:16355690
Change-Id: I1cf652a408fa221649950d728bc88dd93fc93b65
2014-07-16 21:19:41 -04:00
Baligh Uddin
6d32e72523 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-16 23:37:00 +00:00
Baligh Uddin
02b73a5f02 Import translations. DO NOT MERGE
Change-Id: I11c9c29232a06253d5edb83b02237ba9a9493213
Auto-generated-cl: translation import
2014-07-16 17:36:26 -07:00
Baligh Uddin
13105e94bf Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-16 23:37:00 +00:00
Baligh Uddin
d1597c4f5f Import translations. DO NOT MERGE
Change-Id: I3abf5d2591425f79a3b1afa86f161d4a5e197796
Auto-generated-cl: translation import
2014-07-16 17:37:09 -07:00
Baligh Uddin
16c14533cd Import translations. DO NOT MERGE
Change-Id: I18d8bb62a43325d925743f8ef6e5ce7562485cf2
Auto-generated-cl: translation import
2014-07-16 17:39:00 -07:00
Baligh Uddin
12eb1ff790 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-16 22:04:55 +00:00
Baligh Uddin
caa601385e Import translations. DO NOT MERGE
Change-Id: I8c040d7092dcdc68fe1e640a759123b306eff507
Auto-generated-cl: translation import
2014-07-16 18:07:09 -07:00
Baligh Uddin
28618a384c Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-16 23:42:05 +00:00
Baligh Uddin
fa8d78019c Import translations. DO NOT MERGE
Change-Id: I499617c1385457c1f844f73b042ef5c360ad14cc
Auto-generated-cl: translation import
2014-07-16 18:13:44 -07:00
John Spurlock
aedebda776 Update data limit notification icon + strings.
- Use a more specific disabled cellular data icon.
- Reword framework strings to use "Cellular" instead of "Mobile"
  and avoid "enabled/disabled"
- Update SystemUI's network limit dialog to follow suit.

Bug:16185238
Change-Id: Ie9191990fab17cd7dc04395fad39f84bfff8349d
2014-07-16 23:32:44 -04:00
Sailesh Nepal
001bbbb239 TTY: frameworks/base changes
This CL makes the following changes:
  1. New public APIs:
    - TelecommManager.getCurrentTtyMode: This is used to
      get current TTY mode. It's used by Telephony to set
      the phone state before calls are created (which is why
      it can't be a Conneciton API).
    - TelecommConstants.TTY_MODE_*: These are constants
      copied from Phone.java
    - TelecommConstants.ACTION_CURRENT_TTY_MODE_CHANGED: This
      action is fired when the current TTY mode changes.
      Apps can listen to this before and during a call.
      The old version of this was in TtyIntent.java which
      I deleted.

  2. New private API
    - TelecommManager.isTtySupported: This is used by
      Telephony to hide the TTY settings on devices
      that don't support TTY

  3. Various updates to use the constants renamed in this CL

Change-Id: I652b095af30cc2732a06829dc23492e5355660da
2014-07-16 21:14:58 +00:00
Jason Monk
8929a5f91b am bc0f6147: Merge "Finalizing lock-to-app UX" into lmp-dev
* commit 'bc0f6147ddc6718a30d12b89d9a39e65c568ef28':
  Finalizing lock-to-app UX
2014-07-16 17:14:35 +00:00
Dan Sandler
4ac5b77a6c am dfd0d68d: Merge "Prevent dismissing autoredacted private notifications." into lmp-dev
* commit 'dfd0d68d406ae3b2fec322ca5fa6c82319a3a2fc':
  Prevent dismissing autoredacted private notifications.
2014-07-16 16:33:11 +00:00
Dan Sandler
5235330251 am af55ea83: Merge "Clean up autoredaction text." into lmp-dev
* commit 'af55ea83aca437b37714c90136556b7061abcb9c':
  Clean up autoredaction text.
2014-07-16 16:33:06 +00:00
Adrian Roos
13f4917bb1 am 66bee705: Implement real QS user switcher
* commit '66bee705e8237df03459e57b26b34af76df3c5ee':
  Implement real QS user switcher
2014-07-16 16:32:58 +00:00
Adrian Roos
00a0b1f397 Implement real QS user switcher
Replaces the stop-gap user switcher with the real deal.
Dimensions may need some further adjustments.

Bug: 15545213
Change-Id: I4399635c03553dac935049d5b8297fe5f5c1dc9a
2014-07-16 16:25:30 +00:00
Narayan Kamath
72e57fdd1a am eab505fa: am f9c79c63: Merge "Removed useless test"
* commit 'eab505fa8dc975c1a41caaec70b92093d6695a24':
  Removed useless test
2014-07-16 13:40:50 +00:00
RoboErik
8b4bffcac9 Make MediaSession and MediaController constructors public
This makes the MediaSession/Controller constructors public and registers
with the system behind the scenes.

This also adds a bit about needing to call setActive(true) to start receiving
commands in MediaSession's docs.

Change-Id: If882d229b54c36bf0831aca0255052dda667a2bc
2014-07-16 12:03:45 -07:00
Winson Chung
cc91208963 Merge "Don't clobber intent flags when starting recent activities anew. (Bug 16327074)" into lmp-dev 2014-07-16 02:25:05 +00:00
Winson Chung
dc9b7e7e6a Don't clobber intent flags when starting recent activities anew. (Bug 16327074)
Change-Id: I3bfee312d5e3167d443be48580da55d8b69b485e
2014-07-16 18:27:22 +00:00
Narayan Kamath
f9c79c63bc Merge "Removed useless test" 2014-07-16 01:09:23 +00:00
Dan Sandler
a3514c3a4d Merge "Prevent dismissing autoredacted private notifications." into lmp-dev 2014-07-16 01:00:53 +00:00
Dan Sandler
0d3e62f3e0 Prevent dismissing autoredacted private notifications.
Bug: 16295169
Change-Id: Ic1a13ae1a501ae4a5633ef9c84c59ff13543eb1b
2014-07-16 12:04:06 -04:00
Dan Sandler
18bb4f9920 Clean up autoredaction text.
Also show the timestamp if the original notification does.

Bug: 16289371
Change-Id: I6898990629c036dc7c1a129609449e556f8afa72
2014-07-16 12:04:05 -04:00
Jason Monk
febcb9d42b Merge "Finalizing lock-to-app UX" into lmp-dev 2014-07-16 00:53:22 +00:00
John Spurlock
50806fc4ce Zen: handle exit conditions across reboots.
- Use the persisted exit condition (and a new
  persisted exit component) to immediately resubscribe
  to the manual exit condition (if present)
- Fire false immediately for old countdown conditions.
- Add a new zen lens to noman dump, and a bit more info.
- Refresh the current exit condition when reopening the panel.

Bug:15844990
Bug:16212455
Change-Id: I8bfaf1b2a6cf3d8818002a9db5c527ad3aa4c05c
2014-07-16 06:54:35 -04:00