Commit Graph

4470 Commits

Author SHA1 Message Date
Jason Monk
1229a372a7 am 733bcc7f: Merge "Hide hotspot tile if \'provisioning\' is needed" into lmp-dev
* commit '733bcc7fbe8f03c92f20c57dd25cbc3b011cef9e':
  Hide hotspot tile if 'provisioning' is needed
2014-10-07 20:47:09 +00:00
Jorim Jaggi
c746ef5179 am 988a8a98: Merge "Update \'No notifications\' text on configuration change" into lmp-dev
* commit '988a8a9820bb3ae331be4932eb9e672a4614efd5':
  Update 'No notifications' text on configuration change
2014-10-07 19:58:56 +00:00
Jason Monk
733bcc7fbe Merge "Hide hotspot tile if 'provisioning' is needed" into lmp-dev 2014-10-07 18:53:20 +00:00
Jason Monk
20ef4024ed Hide hotspot tile if 'provisioning' is needed
If we need carrier entitlement checks don't show the hotspot tile
which could bypass them, instead make the user go to settings.

Bug: 17879554
Change-Id: I30a5b51b26a2d4e977579b71a16c3c7a8d004eea
2014-10-07 14:43:11 -04:00
Amith Yamasani
53322b9f7b am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
* commit '41bb3455e44dc8fde4569bbfd56fa20c6da8a27d':
  Set the default user restrictions to disallow calling and sms
2014-10-07 18:27:10 +00:00
Jorim Jaggi
988a8a9820 Merge "Update 'No notifications' text on configuration change" into lmp-dev 2014-10-07 17:48:01 +00:00
Amith Yamasani
41bb3455e4 Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 2014-10-07 17:11:34 +00:00
John Spurlock
c32105d7b9 am 0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev
* commit '0d334365c6123388a0df81438b82122be29d19ab':
  Doze: Avoid pulsing in pockets.
2014-10-07 16:22:24 +00:00
John Spurlock
92b8d41096 Doze: Avoid pulsing in pockets.
Query for the current proximity value before starting a pulse.
If a "near" value is returned, skip the entire pulse.

Bug: 17350239
Change-Id: Ib930d84b163c8e54b7be5d1c975e547692f8529f
2014-10-07 12:01:56 -04:00
PauloftheWest
2b5fe1cd2e am 53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev
* commit '53c84002911362c913bc72cd28d186718a33149d':
  Fixed a Bluetooth Quick Settings update bug.
2014-10-07 13:06:06 +00:00
Amith Yamasani
aa6634eaca Set the default user restrictions to disallow calling and sms
When creating a user via the UI, disallow phone calls and SMS by
default. Primary user must explicitly enable it via Settings.

Bug: 17832802
Change-Id: I18cad4be8493ddc8890b5d90da2df256cb3f1ec9
2014-10-06 18:24:32 -07:00
Jorim Jaggi
8cc8dfed32 Update 'No notifications' text on configuration change
Bug: 17821946
Change-Id: Ia4518426ce059be5312d652bb27bbe11a1626518
2014-10-06 12:27:55 -07:00
PauloftheWest
6cdeaa0d03 Fixed a Bluetooth Quick Settings update bug.
+ Now when a Bluetooth device disconnects, and the user is looking at quick
settings, the Bluetooth icon and text will update with the new state of
diconnected.

Bug: 17677593
Change-Id: Iccaf16a23f7e0b8690a32945906a9ccc2382cdd0
2014-10-06 09:31:48 -07:00
Jorim Jaggi
b6606c523e am eae1c3d5: Merge "Fix blank Keyguard #4" into lmp-dev
* commit 'eae1c3d5c1d7b292823c668eaedc72ffa707a5d6':
  Fix blank Keyguard #4
2014-10-04 00:03:12 +00:00
Jorim Jaggi
1918842e10 am f009e358: Merge "Fix blank lockscreen #3" into lmp-dev
* commit 'f009e3583f2843a463d75f06675ef18c398b0efd':
  Fix blank lockscreen #3
2014-10-03 23:57:13 +00:00
Jorim Jaggi
5e08e6957d Fix blank Keyguard #4
When we were fading out the preview for phone/camera to crossfade to
the real application, it might have been that showKeyguard was
called in the middle of this transition. This change makes sure that
we cancel this animation when showing the keyguard.

Bug: 17439581
Change-Id: I89cacf7ecf43d37ea979418b976390272510a09d
2014-10-03 15:52:24 -07:00
Jorim Jaggi
449981be16 Fix blank lockscreen #3
Bug: 17439581
Change-Id: Ic8cb7f32200b541ecc8fa36ad2517975cec0b545
2014-10-03 14:24:55 -07:00
John Spurlock
0c6964f359 am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev
* commit 'a79caa53405ea3efdd77d59ea7aa6dd64ecf09d3':
  Update framework icons for media & alarm streams.
2014-10-03 14:00:18 +00:00
John Spurlock
4bebb1dc5e Update framework icons for media & alarm streams.
Update resources to new style and remove obsolete items.

Bug: 17762712
Change-Id: Ibec121828084934cc066afe117f66b6a0eea603f
2014-10-02 20:11:37 -04:00
Neil Fuller
f7cf5d43aa resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp
Change-Id: I97671e62de26919e391dbb2686511584c59ab990
2014-10-02 11:48:08 +01:00
John Spurlock
b208f618cf am c403a340: Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev
* commit 'c403a340cbb097a95b35b198b27cf44c80a7242e':
  Doze: Route volume keys to music only while pulsing.
2014-10-01 22:38:16 +00:00
Winson Chung
3515d34b0d am d092fc70: Merge "Ensure that we don\'t show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode o
* commit 'd092fc7076310fca5edd089df5bb5398096f6627':
  Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option
2014-10-01 22:38:02 +00:00
John Spurlock
c403a340cb Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev 2014-10-01 20:17:36 +00:00
Winson Chung
d092fc7076 Merge "Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option" into lmp-dev 2014-10-01 20:03:19 +00:00
John Spurlock
0b99ea94f0 Doze: Route volume keys to music only while pulsing.
Avoid waking up the device on hw vol key presses during a doze
pulse.  Instead, behave as if the screen was off for these keys,
namely forwarding them over to the session manager.

Bug:17672775
Change-Id: I566b93f0bdea79253ac3eca41d3876b271c61306
2014-10-01 15:32:22 -04:00
Winson Chung
9cb5c4e385 Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618)
- Fix regression with launching an affiliated task due to clipping changes (Bug 17755902)
- Tweaking previous changes to home transition
- Disable the debug mode option
2014-10-01 17:48:05 +00:00
Neil Fuller
33253a4baa Switch from FloatMath -> Math and Math.hypot where possible
The motivation is an API change: FloatMath is going to be
deprecated and/or removed. Performance is not the goal of
this change.

That said...

Math is faster than FloatMath with AOT compilation.

While making the change, occurances of:

{Float}Math.sqrt(x * x + y * y) and
{Float}Math.sqrt({Float}Math.pow(x, 2) + {Float}Math.pow(y, 2))

have been replaced with:

{(float)} Math.hypot(x, y)

Right now there is no runtime intrinsic for hypot so is not faster
in all cases for AOT compilation:

Math.sqrt(x * x + y * y) is faster than Math.hypot(x, y) with
AOT, but all other combinations of FloatMath, use of pow() etc.
are slower than hypot().

hypot() has the advantage of being self documenting and
could be optimized in future. None of the behavior differences
around NaN and rounding appear to be important for the cases
looked at: they all assume results and arguments are in range
and usually the results are cast to float.

Different implementations measured on hammerhead / L:

AOT compiled:

[FloatMath.hypot(x, y)]
benchmark=Hypot_FloatMathHypot} 633.85 ns; σ=0.32 ns @ 3 trials

[FloatMath.sqrt(x*x + y*y)]
benchmark=Hypot_FloatMathSqrtMult} 684.17 ns; σ=4.83 ns @ 3 trials

[FloatMath.sqrt(FloatMath.pow(x, 2) + FloatMath.pow(y, 2))]
benchmark=Hypot_FloatMathSqrtPow} 1270.65 ns; σ=12.20 ns @ 6 trials

[(float) Math.hypot(x, y)]
benchmark=Hypot_MathHypot} 96.80 ns; σ=0.05 ns @ 3 trials

[(float) Math.sqrt(x*x + y*y)]
benchmark=Hypot_MathSqrtMult} 23.97 ns; σ=0.01 ns @ 3 trials

[(float) Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2))]
benchmark=Hypot_MathSqrtPow} 156.19 ns; σ=0.12 ns @ 3 trials

Interpreter:

benchmark=Hypot_FloatMathHypot} 1180.54 ns; σ=5.13 ns @ 3 trials
benchmark=Hypot_FloatMathSqrtMult} 1121.05 ns; σ=3.80 ns @ 3 trials
benchmark=Hypot_FloatMathSqrtPow} 3327.14 ns; σ=7.33 ns @ 3 trials
benchmark=Hypot_MathHypot} 856.57 ns; σ=1.41 ns @ 3 trials
benchmark=Hypot_MathSqrtMult} 1028.92 ns; σ=9.11 ns @ 3 trials
benchmark=Hypot_MathSqrtPow} 2539.47 ns; σ=24.44 ns @ 3 trials

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I06c91f682095e627cb547d60d936ef87941be692
2014-10-01 14:04:15 +01:00
Winson Chung
2a44d2333c am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev
* commit 'e3206407a5968dcf6690793f047bdfede0424df5':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
2014-09-30 16:45:44 +00:00
John Spurlock
ffca85400f am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev
* commit 'a1b84165f9520c025c59f5b2d93a65d4609b8088':
  Don't play hint animations when dozing
2014-09-30 16:41:14 +00:00
Winson Chung
e3206407a5 Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 2014-09-30 16:39:43 +00:00
John Spurlock
a1b84165f9 Merge "Don't play hint animations when dozing" into lmp-dev 2014-09-30 16:35:26 +00:00
Jason Monk
d1b1947b89 am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev
* commit 'e7b18d2bab30ca257b63e9029c6e08b9700b89a6':
  Pull roaming from mServiceState for consistency
2014-09-30 15:55:07 +00:00
John Spurlock
72fd266961 am ee98df79: Doze: Log screenOnFromTouch when flinging.
* commit 'ee98df79a1797323aaa6d645e9cd5dc6a7cc0ee4':
  Doze: Log screenOnFromTouch when flinging.
2014-09-30 15:54:55 +00:00
Jorim Jaggi
d7912d2f10 Don't play hint animations when dozing
Bug: 17718416
Change-Id: I2c27b4ea479ee46612eb5284a2c872d03dc52ab0
2014-09-30 17:38:19 +02:00
Jason Monk
e7b18d2bab Merge "Pull roaming from mServiceState for consistency" into lmp-dev 2014-09-30 15:30:11 +00:00
Jorim Jaggi
6db0bd8bbb am b5140130: Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev
* commit 'b5140130839e70f1fb55a0bc81b11354b42b820b':
  Revert "Add massive logging to investigate blank Keyguard"
2014-09-30 14:55:19 +00:00
John Spurlock
e88efd75bb am e5238f7a: Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev
* commit 'e5238f7a8db90ebc0e8875adaff84efc198f0800':
  DozeLog: Keep keyguard monitor alive, keep emer call stats.
2014-09-30 14:55:12 +00:00
Jorim Jaggi
227339fde2 am 79107083: Merge "Add option to enable scrim SRC optimization" into lmp-dev
* commit '79107083ca50b99c9e7b678d7739b9ab4798db0f':
  Add option to enable scrim SRC optimization
2014-09-30 14:55:10 +00:00
Jorim Jaggi
e7d9475a91 am e2ff1a4e: Merge "Fix overdraw" into lmp-dev
* commit 'e2ff1a4edbe5c8eeb2610a62b8cfe7a58d4c8150':
  Fix overdraw
2014-09-30 14:55:09 +00:00
Selim Cinek
6f0975d0dd am 311fc0b3: Fixed a crash that could occur in the ObservableScrollView
* commit '311fc0b399f01a79169ae69aea05556043a7d7df':
  Fixed a crash that could occur in the ObservableScrollView
2014-09-30 14:55:08 +00:00
John Spurlock
ee98df79a1 Doze: Log screenOnFromTouch when flinging.
Bug: 17350239
Bug: 17496795
Change-Id: I4a8e26c2fc05cf4396e9c8cb58e81b4f95c531e6
2014-09-30 14:07:23 +00:00
Jason Monk
1cd44e3ab4 Pull roaming from mServiceState for consistency
Also consolidate roaming logic while here, to make it easier to
maintain.

Bug: 17514906
Bug: 17619763
Change-Id: I8efabdecc26722ff6ac70d715f3befaae989abdc
2014-09-30 10:05:46 -04:00
Winson Chung
8bf05afc26 Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
Change-Id: I016dd8b7be9efa786291051152b1b56aac708e33
2014-09-29 13:42:49 -07:00
Jorim Jaggi
b514013083 Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev 2014-09-29 16:31:55 +00:00
John Spurlock
e5238f7a8d Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev 2014-09-29 16:28:52 +00:00
John Spurlock
bee3b0a023 DozeLog: Keep keyguard monitor alive, keep emer call stats.
Ensure the existing keyguard callback survives weak reference
collection, and add missing emergency call stats append.

Bug:17496795
Change-Id: Iecec4646562cf1f6edb5bc5972767127f4419035
2014-09-29 11:30:12 -04:00
Jorim Jaggi
8a63806a8d Revert "Add massive logging to investigate blank Keyguard"
This reverts commit 10ead64346b2651be144ac591117cc2413d8caa3.

Bug: 17475334
Change-Id: Ie7103a2ede1f00a91a2afc51d9e6ecf5ae569545
2014-09-29 16:24:55 +02:00
Jorim Jaggi
79107083ca Merge "Add option to enable scrim SRC optimization" into lmp-dev 2014-09-29 13:44:07 +00:00
Jorim Jaggi
e2ff1a4edb Merge "Fix overdraw" into lmp-dev 2014-09-29 13:43:20 +00:00
Selim Cinek
311fc0b399 Fixed a crash that could occur in the ObservableScrollView
Bug: 17644848
Change-Id: I771c27f9fee8c0d5edfbd21998ea015fd1d6f685
2014-09-29 12:21:48 +00:00