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

8903 Commits

Author SHA1 Message Date
Jeff Davidson
b3ae00d85c am f01fac99: am c452bac6: am 3caf0f8e: Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev 
* commit 'f01fac9965f0fd987655fa0a09a29e67503725e2':
  Add string for "Connected via Wi-Fi assistant".
 2014-11-27 00:00:12 +00:00
Jeff Davidson
f01fac9965 am c452bac6: am 3caf0f8e: Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev 
* commit 'c452bac6fc100bf30d4ddde5b4e008dd862750e5':
  Add string for "Connected via Wi-Fi assistant".
 2014-11-26 23:52:56 +00:00
Jeff Davidson
3caf0f8e44 Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev 2014-11-26 23:42:54 +00:00
Jeff Davidson
6903a1a40f Add string for "Connected via Wi-Fi assistant". 
Bug: 18525241
Change-Id: I9900d9216ad1b2d5c4bee584b8f5185b4e552b7d
 2014-11-26 15:38:45 -08:00
John Spurlock
ebf862cc5a am b20cdd3b: am 4a0e40a7: am f17f04a5: Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev 
* commit 'b20cdd3b6be3cb76fd1bf74af111a3140362f125':
  Volume: Avoid making bad forceVolumeControlStream call.
 2014-11-26 19:42:56 +00:00
Jeff Davidson
30d728346d am 48058077: am e5454d57: am f8a3b8e0: Merge "Fix WifiTile\'s Connected indicator for ephemeral networks." into lmp-mr1-dev 
* commit '480580775ee8b12a07a2f4714bc4751a502bb45b':
  Fix WifiTile's Connected indicator for ephemeral networks.
 2014-11-26 19:42:42 +00:00
Jorim Jaggi
ca389b259f am 199d621c: am f1b05619: am 95e89cae: Fix jank when pin/pattern is shown 
* commit '199d621c5fc994e323fa6b73c34729d48fc46c11':
  Fix jank when pin/pattern is shown
 2014-11-26 19:42:24 +00:00
Jorim Jaggi
7d754e0ccb am f1e6d231: am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev 
* commit 'f1e6d2315eea6e9f289b8c1bafc04a4cbc6f05e1':
  Make IKeyguardService interface asynchronous
 2014-11-26 19:42:19 +00:00
John Spurlock
b20cdd3b6b am 4a0e40a7: am f17f04a5: Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev 
* commit '4a0e40a76431cc4ea0c052ea9106616593c1a3de':
  Volume: Avoid making bad forceVolumeControlStream call.
 2014-11-26 18:45:10 +00:00
Jeff Davidson
480580775e am e5454d57: am f8a3b8e0: Merge "Fix WifiTile\'s Connected indicator for ephemeral networks." into lmp-mr1-dev 
* commit 'e5454d5733a4216a5ad0efb158fe090b19faddf1':
  Fix WifiTile's Connected indicator for ephemeral networks.
 2014-11-26 18:44:46 +00:00
Jorim Jaggi
199d621c5f am f1b05619: am 95e89cae: Fix jank when pin/pattern is shown 
* commit 'f1b05619cc44b039721110955695fa261f1746da':
  Fix jank when pin/pattern is shown
 2014-11-26 18:43:52 +00:00
Jorim Jaggi
f1e6d2315e am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev 
* commit 'c5c2e53779c2c2b6d889bdad5d11d47da9e72789':
  Make IKeyguardService interface asynchronous
 2014-11-26 18:43:47 +00:00
John Spurlock
f17f04a51e Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev 2014-11-26 16:32:38 +00:00
Jeff Davidson
f8a3b8e008 Merge "Fix WifiTile's Connected indicator for ephemeral networks." into lmp-mr1-dev 2014-11-26 15:54:25 +00:00
John Spurlock
e506c85eaa Volume: Avoid making bad forceVolumeControlStream call. 
Ensure we don't call audio manager with STREAM_MASTER, which is
a pseudo-stream value internal to volume panel.

Bug: 18250921
Change-Id: I4b6af9fc60d7683e9103be52cc937c33c1c15e31
 2014-11-26 10:11:19 -05:00
Geoff Mendal
8d08e39018 Import translations. DO NOT MERGE 
Change-Id: I281db36394df99897f90cbf5c460cc141a4af569
Auto-generated-cl: translation import
 2014-11-26 07:09:05 -08:00
Geoff Mendal
38499cf8a1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-26 15:08:47 +00:00
Geoff Mendal
b82f42a139 Import translations. DO NOT MERGE 
Change-Id: I885436b95251805a80c4a6edf308448d5ed43ca3
Auto-generated-cl: translation import
 2014-11-26 06:56:43 -08:00
Jorim Jaggi
95e89caeb2 Fix jank when pin/pattern is shown 
- Only update layout params of status bar window when needed
- Do not update security method all the time, only when needed (only
  when reset gets called)
- Check for actual used security method when updating states for
  bouncer

Bug: 18505838
Change-Id: Ib3d0021c0cc364fa5598e06e0a2bae059ae79cbe
 2014-11-26 14:07:49 +00:00
Jorim Jaggi
803a6dc080 Merge "Make IKeyguardService interface asynchronous" into lmp-mr1-dev 2014-11-26 14:07:21 +00:00
Jorim Jaggi
2edf7d6065 am 2f47df83: am dccd3662: am c1de25d8: Merge "Animate notifs depending on touch when exiting doze mode" into lmp-mr1-dev 
* commit '2f47df83343e51214c792dc89874f0bccbeb4593':
  Animate notifs depending on touch when exiting doze mode
 2014-11-26 12:09:37 +00:00
John Spurlock
97abe5040a am a2decb0e: am f74ae93c: am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev 
* commit 'a2decb0e4d50c68391b82e7acf6c425df2f30dd6':
  VolumeZen: Introduce internal vs external ringer mode.
 2014-11-26 12:09:18 +00:00
Jorim Jaggi
2f47df8334 am dccd3662: am c1de25d8: Merge "Animate notifs depending on touch when exiting doze mode" into lmp-mr1-dev 
* commit 'dccd3662da356ed7b0beedc09c8a58103723b463':
  Animate notifs depending on touch when exiting doze mode
 2014-11-26 12:02:13 +00:00
John Spurlock
a2decb0e4d am f74ae93c: am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev 
* commit 'f74ae93cac3c78762fc87cdaa9edd6f86f2dbec8':
  VolumeZen: Introduce internal vs external ringer mode.
 2014-11-26 12:01:35 +00:00
Jim Miller
ab954546dc Make IKeyguardService interface asynchronous 
Add a state callback so lockscreen reports back whenever its state
relevant for PhoneWindowManager changed, instead of synchronously
calling into SysUI which can lead to deadlocks. Directly use
LockPatternUtils for isSecure, and optimize the number of calls to
this method to optimize layout performance.

Bug: 17677097
Change-Id: I5d491fc8884d4f84d9562626b9ea0d5eaa5166fc
 2014-11-25 23:22:52 +01:00
Jorim Jaggi
c1de25d8eb Merge "Animate notifs depending on touch when exiting doze mode" into lmp-mr1-dev 2014-11-25 19:28:39 +00:00
Jorim Jaggi
2a5e452f4f Animate notifs depending on touch when exiting doze mode 
When exiting doze mode during pulsing and the reason for the wakeup
is a touch event, we calculate the delay of the animations to animate
the notification from black/white to color depending on the point
where the touch happened to wake up the screen.

Bug: 18146441
Change-Id: Ica76b235d629acfc2b09b5f56027c688502f89d8
 2014-11-25 20:26:40 +01:00
John Spurlock
661f2cf458 VolumeZen: Introduce internal vs external ringer mode. 
Stabilize mapping between ringer-mode=silent and zen=priority
by keeping track of two ringer modes:
 - Internal ringer mode: Used for underlying stream muting
 - External ringer mode: Reported to clients

The mapping between external ringer mode + zen is:
 - normal = all
 - vibrate = all
 - silent = priority (read-write) or none (read)

Changes include:
 - Remove "zen check" from audio service, back to audio
   service having no knowledge of zen.
 - Maintain a new external ringer mode in audio service,
   this is the ringer mode reported through AudioManager
   to callers, also mapped to the change intent.
 - Introduce a "ringer mode delegate" to the local
   audio manager interface, responsible for observing
   external / internal mode changes, and making changes
   if necessary.
 - Internal ringer mode changes are still interesting
   to the volume dialog, wire up a callback through
   the existing IVolumeController interface.
 - On devices without vibration, the mapping is the same
   but since no ringer mode change is possible, disable
   the icon toggle and remove the mute icon when volume=0.
 - On devices with vibration, volume down presses should
   pulse the vibrate icon (and vibrate) as a hint that this
   is as low as the device can go using the keys.  Since
   the mechanics are similar to the existing zen=none hint,
   pull into shared helper.
 - Log ringer mode changes to the zen log, include calling
   package information for issue diagnosis.
 - Include whether vibration is supported in the audio service
   dump.
 - Update the status bar icon policy to use the internal ringer
   mode, not the external mode (for vibrate icon).
 - Update the "Muted by <x>" logic, include current suppressor
   in dumpsys, ensure suppression icon is enabled & !clickable,
   regardless of zen mode.

Bug: 17884168
Bug: 15471679
Bug: 16824970
Change-Id: Ia7d3bb23ce6d1e37b24fb6521d1c1ab9bb8f60c0
 2014-11-25 13:20:46 -05:00
Jorim Jaggi
c204a065f9 am a6eaf8b3: am 82bb648b: am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev 
* commit 'a6eaf8b38a21bda59ac202093a7dc926cd31f3a3':
  Fix quick settings on Keyguard
 2014-11-25 17:49:14 +00:00
John Spurlock
fc3fa08afc am 98c2090d: am 98a20f68: am 4dfce43e: Merge "QS: Update data usage over limit title." into lmp-mr1-dev 
* commit '98c2090de433a79d8b042652cfdccb1a03953176':
  QS: Update data usage over limit title.
 2014-11-25 17:49:01 +00:00
Jorim Jaggi
a6eaf8b38a am 82bb648b: am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev 
* commit '82bb648b5a1a5a4a0946a252a9cf9b6f8944a15d':
  Fix quick settings on Keyguard
 2014-11-25 17:38:26 +00:00
John Spurlock
98c2090de4 am 98a20f68: am 4dfce43e: Merge "QS: Update data usage over limit title." into lmp-mr1-dev 
* commit '98a20f68e0f31c43d090b16e3802c67226dbd055':
  QS: Update data usage over limit title.
 2014-11-25 17:38:02 +00:00
Adrian Roos
019ab9981e am e33017b4: am 20eb594a: am 8a924242: Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev 
* commit 'e33017b404c2ac0aff858439f9c6301ac887c1e2':
  Revert "Only keep user switcher bitmaps if needed"
 2014-11-25 15:15:44 +00:00
Chris Wren
2bf5a4205d am ff47355d: am 865c73b5: am 1aa63f0b: Merge "Push back notification means snooze the package." into lmp-mr1-dev 
* commit 'ff47355d2beb7257568ae9add24e99b3f3c185f7':
  Push back notification means snooze the package.
 2014-11-25 15:15:27 +00:00
Adrian Roos
e33017b404 am 20eb594a: am 8a924242: Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev 
* commit '20eb594ab27a9e4dee83574b3fe36a5a6d0d7807':
  Revert "Only keep user switcher bitmaps if needed"
 2014-11-25 15:09:39 +00:00
Chris Wren
ff47355d2b am 865c73b5: am 1aa63f0b: Merge "Push back notification means snooze the package." into lmp-mr1-dev 
* commit '865c73b5f66bfd1e5a9eded75b5a5fb24e701042':
  Push back notification means snooze the package.
 2014-11-25 15:09:12 +00:00
Jorim Jaggi
cb17416a8d am 0da89b76: resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp 
* commit '0da89b76402816dade084166a97b1d352ae1f78b':
  Fixed several time related states for secondary users
 2014-11-25 15:04:28 +00:00
Jorim Jaggi
0da89b7640 resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp 
Change-Id: I8f1dbae2ecd14ae4e51a9e86eb6d36dd56a48be1
 2014-11-25 15:34:56 +01:00
Geoff Mendal
5c571b5640 Merge "Import translations. DO NOT MERGE" 2014-11-24 21:15:43 +00:00
Geoff Mendal
597226d6f2 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-24 20:44:58 +00:00
Jorim Jaggi
82bb648b5a am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev 
* commit '6b77074438f191de4fcfa1f1560fb5f038cb8173':
  Fix quick settings on Keyguard
 2014-11-24 20:01:19 +00:00
Geoff Mendal
4e657cf39b Import translations. DO NOT MERGE 
Change-Id: I80d19826bd33d1b0ef9570105df00aa13fb06e3b
Auto-generated-cl: translation import
 2014-11-24 11:35:24 -08:00
Jorim Jaggi
6b77074438 Merge "Fix quick settings on Keyguard" into lmp-mr1-dev 2014-11-24 19:31:30 +00:00
Jorim Jaggi
58bef33499 Fix quick settings on Keyguard 
- Fix that quick settings couldn't be scrolled nor closed on Keyguard
if scrolling was needed.
- Fix jumping in unlock motion when closing both panel and QS
- Fix invalid panel height when closing both QS and panel

Bug: 18481668
Change-Id: Ifd12e29bbc64f72f0dc13b43e36b1a57df7524fa
 2014-11-24 20:30:42 +01:00
Geoff Mendal
de4b74a6ac Import translations. DO NOT MERGE 
Change-Id: I753b271eb5b97b719fe6d4aa50d21431a961d553
Auto-generated-cl: translation import
 2014-11-24 11:21:09 -08:00
John Spurlock
98a20f68e0 am 4dfce43e: Merge "QS: Update data usage over limit title." into lmp-mr1-dev 
* commit '4dfce43e976a294b3b575564c855214a8e5cef58':
  QS: Update data usage over limit title.
 2014-11-24 18:48:59 +00:00
John Spurlock
4dfce43e97 Merge "QS: Update data usage over limit title." into lmp-mr1-dev 2014-11-24 18:34:58 +00:00
Wink Saville
5c11e41b1a am b4c54109: am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit 'b4c5410987a6657b71fb0b86e1ef8337628241dc':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:13:01 +00:00
Wink Saville
b4c5410987 am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit '4f1cce63061976490e2e2cfc4085e1634d3a02de':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:06:09 +00:00
John Spurlock
beaf117889 QS: Update data usage over limit title. 
Bug: 18499916
Change-Id: I468eb40cbbbef52853c52e196e458d72f103765a
 2014-11-24 12:25:32 -05:00