drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
143,285 Commits 1 Branch 0 Tags
Commit Graph

9347 Commits

Author SHA1 Message Date
John Spurlock
95112085fc am 47631221: am d75d1ef0: Merge "QS: Fix crash switching users." into lmp-dev 
* commit '47631221aeb7839b0e790423263e50076bb4266a':
  QS: Fix crash switching users.
 2014-07-17 21:29:37 +00:00
Winson Chung
2eaf60c15e am 2a2b956e: am 3bf3d3c0: Merge "Fixing optimization in Task loading. (Bug 16372369)" into lmp-dev 
* commit '2a2b956e3f405b91fb2fdcaabc663a799dec69b2':
  Fixing optimization in Task loading. (Bug 16372369)
 2014-07-17 20:59:26 +00:00
Adrian Roos
ce441452a5 am 627e93b0: am 26f08cdc: Merge "QS Guest fixes" into lmp-dev 
* commit '627e93b0ad11ec90309ca9f5fd69b426696b3069':
  QS Guest fixes
 2014-07-17 20:58:13 +00:00
Winson Chung
7924ba40f5 am 1a1fa42b: am 1e214f1d: Fixing regression in flinging not updating the stack. (Bug 16371020) 
* commit '1a1fa42b9502dc3c95e0103505b276083a2a5692':
  Fixing regression in flinging not updating the stack. (Bug 16371020)
 2014-07-17 20:57:58 +00:00
John Spurlock
7c29da7e35 am d75d1ef0: Merge "QS: Fix crash switching users." into lmp-dev 
* commit 'd75d1ef07c175c8a48a126f4e36172e03c30987c':
  QS: Fix crash switching users.
 2014-07-17 20:02:14 +00:00
Winson Chung
6d984b8f6e am 3bf3d3c0: Merge "Fixing optimization in Task loading. (Bug 16372369)" into lmp-dev 
* commit '3bf3d3c0a283f086f605b1d9497755d854dc852d':
  Fixing optimization in Task loading. (Bug 16372369)
 2014-07-17 19:37:51 +00:00
John Spurlock
8b0249da3e QS: Fix crash switching users. 
Bug:16375449
Change-Id: I971c5b043edcffe669c29bbc566b80696b6251b2
 2014-07-17 15:53:32 -04:00
Adrian Roos
88f4de130a am 26f08cdc: Merge "QS Guest fixes" into lmp-dev 
* commit '26f08cdc82a6534b3acb4eef81c205ab6764bd96':
  QS Guest fixes
 2014-07-17 18:09:59 +00:00
Winson Chung
7cdd4b115e am 1e214f1d: Fixing regression in flinging not updating the stack. (Bug 16371020) 
* commit '1e214f1daa0ee51097a7b7cc4fd4680d9059016a':
  Fixing regression in flinging not updating the stack. (Bug 16371020)
 2014-07-17 18:09:45 +00:00
Winson Chung
ff88d7b39e Fixing optimization in Task loading. (Bug 16372369) 2014-07-17 12:30:07 -07:00
Winson Chung
4fc90de51b Fixing regression in flinging not updating the stack. (Bug 16371020) 
Change-Id: I6397c854dc0d305206eb3b48de855c58cf2740ea
 2014-07-17 17:33:03 +00:00
John Spurlock
0d92094c0d am 799443c0: am 1ae06eb3: Merge "Zen: Maintain selection throughout rocker session." into lmp-dev 
* commit '799443c01742f030ac4b606d0330c7a1676378ee':
  Zen: Maintain selection throughout rocker session.
 2014-07-17 17:06:54 +00:00
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
2ea85672b3 am 1ae06eb3: Merge "Zen: Maintain selection throughout rocker session." into lmp-dev 
* commit '1ae06eb35037256cf4d03c6b4e4f50f26b6b2e0f':
  Zen: Maintain selection throughout rocker session.
 2014-07-17 16:20:41 +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
969265af31 Merge "Zen: Maintain selection throughout rocker session." into lmp-dev 2014-07-17 07:39:11 +00:00
John Spurlock
fbb3d6ff39 Zen: Maintain selection throughout rocker session. 
While the panel is visible, allow toggling between
none + priority (and even 'all') without resetting
the exit condition.

Bug:16350606
Change-Id: I830be8ccad1ba95a64239f00a72f773c4fe739f2
 2014-07-17 12:09:05 -04: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
Adrian Roos
a1b6cfd719 Merge "QS Guest fixes" into lmp-dev 2014-07-17 00:10:10 +00:00
Adrian Roos
e9c7d431da QS Guest fixes 
- Fixes NPE when guest has not been created yet
- Reloads pictures only when they changed
- Adds "Exit guest" affordance

Bug: 16363920
Bug: 15759638
Change-Id: I99ff1c4be06fee96c5169fd7c2d31b1b13f7a389
 2014-07-17 18:31:22 +02: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