112792 Commits

Author SHA1 Message Date
Baligh Uddin
ac5926df6c Import translations. DO NOT MERGE
Change-Id: I9201a5c9e75f3f26a9f7e06d54b0ebf70dad0aa4
Auto-generated-cl: translation import
2013-10-04 12:52:45 -07:00
Svetoslav Ganov
2658f35a5e am 6bf10299: Merge "Deleting print job files when we do not have to." into klp-dev
* commit '6bf1029900d09d0432fb82f8c076bdb3eefc1f6c':
  Deleting print job files when we do not have to.
2013-10-04 09:51:40 -07:00
Dianne Hackborn
2d91368aea am 2d94c573: Merge "Fix issue #11069176: Crash showing process stats" into klp-dev
* commit '2d94c57345ba3e837ef780de9dae172c3abd5ae8':
  Fix issue #11069176: Crash showing process stats
2013-10-04 09:51:38 -07:00
Svetoslav Ganov
6bf1029900 Merge "Deleting print job files when we do not have to." into klp-dev 2013-10-04 16:50:53 +00:00
Dianne Hackborn
2d94c57345 Merge "Fix issue #11069176: Crash showing process stats" into klp-dev 2013-10-04 16:49:05 +00:00
Svetoslav
2f6aabd7c3 am 5c126892: Merge "Print UI tweaks as per UX request." into klp-dev
* commit '5c126892ec53772d784fcf9cef9165acf1d92ce3':
  Print UI tweaks as per UX request.
2013-10-04 09:00:52 -07:00
Svetoslav
5c126892ec Merge "Print UI tweaks as per UX request." into klp-dev 2013-10-04 15:58:10 +00:00
Svetoslav Ganov
2b40c83ae1 Deleting print job files when we do not have to.
The print job file name was not properly parsed. This resulted
in incorrect mapping from file to print job, thus deleting the
file when we do not have to.

bug:11069354

Change-Id: I7b8a7a7f98dd77b34119f2a9cd16a6ec3c22b63b
2013-10-04 08:49:32 -07:00
Eric Laurent
4b292317f0 am 15bcc2d8: Merge "audioservice: fix DTMF stream volume" into klp-dev
* commit '15bcc2d82f1368ee4002b2eb6d652591dc2028af':
  audioservice: fix DTMF stream volume
2013-10-04 08:23:07 -07:00
Eric Laurent
15bcc2d82f Merge "audioservice: fix DTMF stream volume" into klp-dev 2013-10-04 15:18:32 +00:00
Jonathan Dixon
6079dbc1ae am 050c552f: Fix CookieSyncManager for WebViewClassic
* commit '050c552f096a6f8f2283162edcb9c6b015cfb3dd':
  Fix CookieSyncManager for WebViewClassic
2013-10-04 07:20:49 -07:00
Jonathan Dixon
050c552f09 Fix CookieSyncManager for WebViewClassic
Add a workaround to ensure that the WebViewDatabase and JniUtil can
still be initialized as side effect of making a CookieSyncManager

This was collateral damage from the fixes for Bug 10932261

Change-Id: If5ba65a7822d5b0afc14139dd84125058bf96897
2013-10-04 14:23:47 +01:00
Jim Miller
43bd3f2459 am 3d61bf45: Merge "Replace searchlight asset" into klp-dev
* commit '3d61bf45e559e084fa173bd50e2e7d7286dc9a35':
  Replace searchlight asset
2013-10-03 21:27:20 -07:00
Jim Miller
3efc75acce am fea784dd: Merge "Fix bug where dismiss() was being called from the wrong thread" into klp-dev
* commit 'fea784ddec162951e95e91010b25ffb65fe704db':
  Fix bug where dismiss() was being called from the wrong thread
2013-10-03 21:27:17 -07:00
Adam Powell
049e663c3b am 8c5b15c6: Merge "Fix a bug in action menu measurement" into klp-dev
* commit '8c5b15c628b89c4fb832b7311e5d13ccea4aff04':
  Fix a bug in action menu measurement
2013-10-03 21:27:14 -07:00
Wink Saville
fe587dba3a am a48ccdd6: Merge "Use networkType to display wifi and mobile notification separately." into klp-dev
* commit 'a48ccdd6fb671435ed2583830b2828450bfc3cde':
  Use networkType to display  wifi and mobile notification separately.
2013-10-03 21:27:11 -07:00
Vinit Deshapnde
78624d61f1 am 5eb2b0ca: Merge "Set P2p statemachine\'s network manager before starting Wifi" into klp-dev
* commit '5eb2b0ca76560cb8d707295aec42cb72f379eafe':
  Set P2p statemachine's network manager before starting Wifi
2013-10-03 21:27:09 -07:00
Adam Powell
cf51fefde3 am c7c7f5b5: Merge "Fix docs" into klp-dev
* commit 'c7c7f5b5d5346a31db87e98ad5214e8110f1846c':
  Fix docs
2013-10-03 21:27:06 -07:00
Yuhao Zheng
4ee58568b6 am f3ca9477: Merge "New Telephony APIs to return MMS UA and UAProfUrl" into klp-dev
* commit 'f3ca947784571a554ef862e0e8ba01eff3cfa004':
  New Telephony APIs to return MMS UA and UAProfUrl
2013-10-03 21:27:04 -07:00
Jim Miller
3d61bf45e5 Merge "Replace searchlight asset" into klp-dev 2013-10-04 02:26:56 +00:00
Jim Miller
d34de7304c Replace searchlight asset
Fixes bug 11030712

Change-Id: Ia25dec35dd3a8d59f98521e579bc1d269518c395
2013-10-03 19:20:58 -07:00
Jim Miller
fea784ddec Merge "Fix bug where dismiss() was being called from the wrong thread" into klp-dev 2013-10-04 02:18:42 +00:00
Jim Miller
6001379bff Fix bug where dismiss() was being called from the wrong thread
One-way calls to binder do not guarantee the call will always
occur on the originating thread.  This fixes a rare case where
keyguard would crash due to dismiss() being called from the wrong
thread.

Fixes bug 11065316

Change-Id: Iddd281964231a152e3342e21b6b88527eab94caf
2013-10-03 18:31:34 -07:00
Adam Powell
8c5b15c628 Merge "Fix a bug in action menu measurement" into klp-dev 2013-10-04 01:29:34 +00:00
Adam Powell
da9710806b Fix a bug in action menu measurement
Thanks to a measurement optimization in KK, the view recycling
behavior of ActionMenuPresenter could get into a state where the
resulting ActionMenuView had changed but no layout was
requested. Explicitly request a layout during menu update. Also fix an
ancient typo.

Bug 11047996

Change-Id: I6289fd2d142ac7d2101fbec6de19b7d3d7fbd6a2
2013-10-03 18:21:58 -07:00
Eric Laurent
24e0d9b6c4 audioservice: fix DTMF stream volume
DTMF stream must also be muted by silent mode when following ring
stream volume in order to be properly muted and unmuted when ringer
mode changes.

Also fix a problem in VolumeStreamState.setAllIndexes() when some
devices are not present in the stream state from which indexes
are copied.

Bug: 10932676.
Change-Id: I373d0fd1a475980786d97d97348d46a7e7421461
2013-10-03 18:15:07 -07:00
Wink Saville
a48ccdd6fb Merge "Use networkType to display wifi and mobile notification separately." into klp-dev 2013-10-04 00:52:59 +00:00
Vinit Deshapnde
5eb2b0ca76 Merge "Set P2p statemachine's network manager before starting Wifi" into klp-dev 2013-10-04 00:40:32 +00:00
Dianne Hackborn
d94d533b5a Fix issue #11069176: Crash showing process stats
Change-Id: Ie568ebcb9863bed95c775b9b28654a5e2dc464cd
2013-10-03 17:32:19 -07:00
Adam Powell
c7c7f5b5d5 Merge "Fix docs" into klp-dev 2013-10-04 00:28:57 +00:00
Yuhao Zheng
f3ca947784 Merge "New Telephony APIs to return MMS UA and UAProfUrl" into klp-dev 2013-10-04 00:14:18 +00:00
Adam Powell
70cb8021ef Fix docs
Change-Id: I19e0cdab6c526f7eed376fc2067b5c49b31a3ea9
2013-10-03 16:39:30 -07:00
Vinit Deshapnde
04675f6ae9 Set P2p statemachine's network manager before starting Wifi
Wifi statemachine starts P2p statemachine; which uses network management
service to (i.e. netd) to start p2p0 interface. But it only gets a
reference to network management service in conenctivityServiceReady().
Calling that later means there's a chance of a race between this
thread's setting of the network manager, and P2p statemachine thread's
usage of the same.

Bug: 11048296
Change-Id: If151026ed5fbb12db57ee7f9bdd47c67dd7142e5
2013-10-03 16:18:56 -07:00
Chet Haase
f37696b70c am 76a5c86d: Merge "Fix lockscreen wave animation artifacts" into klp-dev
* commit '76a5c86df7902870c87ff07ffd0628cb10f32c00':
  Fix lockscreen wave animation artifacts
2013-10-03 16:11:42 -07:00
Chet Haase
76a5c86df7 Merge "Fix lockscreen wave animation artifacts" into klp-dev 2013-10-03 23:08:23 +00:00
Chet Haase
167a32326e Fix lockscreen wave animation artifacts
On some display sizes, the wave animation was sometimes
running more than once, starting over in the center and animating
outward... partially.

The problem was that the calculations determining the alpha value
of the dots was returning bogus values when the display area was
large enough, which is why the bug is only on some devices.

This fix simplifies the math and ensures that the wave only animates
once, from start to finish.

Issue #11005936 regression on lockscreen animation for multi-wave widget

Change-Id: Id21a2e4d2271f01c82c4bc6e1f37d78e68b9b6e4
2013-10-03 15:50:35 -07:00
Adam Powell
310796de0b am d6239b92: Merge "Add a scrubber to keyguard; layout tweaks" into klp-dev
* commit 'd6239b922901420b6855a7dad903632c85ccde68':
  Add a scrubber to keyguard; layout tweaks
2013-10-03 15:41:59 -07:00
Jim Miller
44c4dd9316 am 8990e28b: Merge "Update default keyguard clock to new UX specification" into klp-dev
* commit '8990e28b5a7fcbd5e80862a74fff621c18aca2a6':
  Update default keyguard clock to new UX specification
2013-10-03 15:38:25 -07:00
Adam Powell
d6239b9229 Merge "Add a scrubber to keyguard; layout tweaks" into klp-dev 2013-10-03 22:35:35 +00:00
Jim Miller
8990e28b5a Merge "Update default keyguard clock to new UX specification" into klp-dev 2013-10-03 22:32:25 +00:00
Jim Miller
b0da1e70ad Update default keyguard clock to new UX specification
Change-Id: I0d5f302d8bd5922acd45cfe1de42cb76cebc02e5
2013-10-03 15:19:21 -07:00
Yuhao Zheng
d2078bc8c9 New Telephony APIs to return MMS UA and UAProfUrl
Added two public APIs under TelephonyManager to return MMS UserAgent and
UAProfUrl strings, for apps that handle SMS/MMS.

Bug: 11054501

Change-Id: Ifa1a64990fa2bf7d0e340d784a9672bf79525338
2013-10-03 15:06:21 -07:00
Adam Powell
f8895248e2 Add a scrubber to keyguard; layout tweaks
Switch KeyguardTransportControlView over to using RemoteController
instead of the internal API.

Guard transition animations behind a flag until we can work out some
intermittent issues.

Change-Id: Ie9f41339ce6e735c5d524db88437672f2c9859e2
2013-10-03 14:55:18 -07:00
Michael Wright
448a1f6fed am cf5b34b0: Merge "Ensure WallpaperEngine has correct size information" into klp-dev
* commit 'cf5b34b0c43df076cfe8b774c1c919303793fa7c':
  Ensure WallpaperEngine has correct size information
2013-10-03 14:53:51 -07:00
Michael Wright
cf5b34b0c4 Merge "Ensure WallpaperEngine has correct size information" into klp-dev 2013-10-03 21:51:59 +00:00
Craig Mautner
63c375d325 am 27b82632: Merge "Retain IME assignment if no windows accept input." into klp-dev
* commit '27b826325c6201a0bb96efb1011c752408ece18a':
  Retain IME assignment if no windows accept input.
2013-10-03 14:33:15 -07:00
Craig Mautner
27b826325c Merge "Retain IME assignment if no windows accept input." into klp-dev 2013-10-03 21:28:38 +00:00
Vinit Deshapnde
e72aa641d3 am 3eb6e4b4: Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev
* commit '3eb6e4b4e46d64f96cba2d92265f7d3da0b8106a':
  Fix EAP-TLS reconnect after reboot issue
2013-10-03 14:23:28 -07:00
Vinit Deshapnde
3eb6e4b4e4 Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev 2013-10-03 21:19:52 +00:00
Michael Wright
5203a8b50b Ensure WallpaperEngine has correct size information
Currently it's possible for the WallpaperManagerService to receive a
request to change the desired wallpaper size between when it attaches
to the WallpaperService and when the Engine attaches back to it. This
means that the Engine will be created with the prior dimensions and
won't receive the update. Check to see if we're in this state and
make note to update the Engine once it attaches to ensure that the
Engine always has the correct dimensions.

Bug: 10853302
Change-Id: I8d5cd3371b269dbb4c0ff2d75c68529b69028ae5
2013-10-03 14:16:42 -07:00