110436 Commits

Author SHA1 Message Date
Wink Saville
cbad1243ad Merge "Check that hipri has started." into jb-mr2-dev 2013-08-08 22:03:45 +00:00
Dianne Hackborn
8a0de58ece Get ProcessStats callable from other processes.
Also fix a bug where, when parceling the stats, we were
computing the final duration values too late.  We need to
do that before we write the long table.

Change-Id: Idb6c1ed95417448c56973fe5866bfb3570e525f4
2013-08-08 15:00:18 -07:00
David Christie
8ffe17ae32 Merge "Update gps status icon to be a "high power" location icon. Move icon to right side of the screen and synchronize status with AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION." into klp-dev 2013-08-08 21:41:04 +00:00
Vinit Deshapnde
ce65961d4d Merge "Use a single socket to communicate with supplicant" into klp-dev 2013-08-08 21:23:50 +00:00
David Christie
d4544b75f1 Update Quick Settings to use new consolidated master location method.
This is an effort to consolidate the logic of what the "master
location switch" means.  Quick settings will no longeer explicitly
enable/disable gps and network providers.

Change-Id: I78e1337561f72aca81ba5b14321845a0a9d0b597
2013-08-08 14:23:20 -07:00
Joe Malin
58930af048 am 68091b9e: am 72289702: am 6180f104: DOC CHANGE: Fixed bug 10210178
* commit '68091b9e108336af21ff1248aac960e9544668af':
  DOC CHANGE: Fixed bug 10210178
2013-08-08 14:14:23 -07:00
The Android Open Source Project
350b9b9bf1 am 9d42e438: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '9d42e438cb86a398bd1f9255a7ede35e8c455139':
  Add new app ops method to reset all op modes.
  Add new app ops method to reset all op modes.
  Revert "Add version identifier to app ops."
  Add version identifier to app ops.
  Allow the user to block notifications for foreground services.
  (DO NOT MERGE) Fix pub issue #58043: Copy crash in Android 4.3...
2013-08-08 14:14:15 -07:00
Marco Nelissen
84135337d1 am 53d86f6e: am f5cfe708: am e8acd367: Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."
* commit '53d86f6e495e3f950191419645e34970779a3fea':
  When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together.
2013-08-08 14:14:10 -07:00
Marco Nelissen
d6aa247155 am ca4553d3: am 7ffbcb28: am ca5d99ac: Merge "Guarantee that all db related files are deleted together."
* commit 'ca4553d33fe779dcdf2daad4590e4dbcfec7b62f':
  Guarantee that all db related files are deleted together.
2013-08-08 14:14:06 -07:00
David Christie
c750c1fb83 Update gps status icon to be a "high power" location icon.
Move icon to right side of the screen and synchronize status with
AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION.

Change-Id: Iea2570501cb18be0489669fd4ea240dc63f9567a
2013-08-08 14:06:25 -07:00
Amith Yamasani
672d323bb4 Merge "Developer option to force RTL layout" into klp-dev 2013-08-08 20:45:47 +00:00
Amith Yamasani
d8415f4bf0 Developer option to force RTL layout
Make sure screen layout changes are taken into account in Configuration diffs.
Initialize the SystemProperty from Global settings on startup of
ActivityManagerService.

TextUtils checks the override flag to decide if the default layout direction
should be forced to RTL.

Bug: 10244047
Change-Id: I23a2583d790a355060d0d898ba44e5f7dc896b46
2013-08-08 13:42:02 -07:00
David Christie
4104d32952 Merge "Add helper methods to set/query the location master switch. Consolidates the logic of exactly what the master switch means so that if we change in the future, we don't have to find all the different parts of the code that use it (location settings, location quick settings, power widget, etc)." into klp-dev 2013-08-08 19:43:17 +00:00
John Spurlock
c059dbe9c4 Merge "Fix recent regression in hideytoast." into klp-dev 2013-08-08 19:17:31 +00:00
Vinit Deshapnde
c249c2cc6b Use a single socket to communicate with supplicant
This helps to prepare for future updates from external sources.

Bug: 9298955

Change-Id: I4c63ad5fc1ea3564aab38cfce955de19bad75c0c
(cherry picked from commit fb40801ed8c217ae01082fb1cbd0c30bbf5532ac)
2013-08-08 18:38:53 +00:00
Daniel Sandler
d646882af9 Add missing densities for HUN backgrounds.
Bug: 10242598
Change-Id: I4bb48102c1d1f94e61c6c8f61e567be919a5fbdf
2013-08-08 14:32:53 -04:00
David Christie
3f7b652cd3 Add helper methods to set/query the location master switch.
Consolidates the logic of exactly what the master switch means
so that if we change in the future, we don't have to find
all the different parts of the code that use it (location
settings, location quick settings, power widget, etc).

Change-Id: Ib918143b82e16541f0873c4d9141adb11fb815fc
(cherry picked from commit db3720d42dcaa1d26022a392d24f60d0b711f3b7)
2013-08-08 18:29:01 +00:00
Daniel Sandler
f6971c80fd Merge "OK, now it's a release." into klp-dev 2013-08-08 17:50:00 +00:00
John Spurlock
bcb21a8390 Fix recent regression in hideytoast.
Bug:10240896
Change-Id: Iba7af673bdfd878a02932e19dd594e3f9667d7a1
2013-08-08 13:31:47 -04:00
Joe Malin
bc8bb009ae am 93bb7bf2: am 5986f497: Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs
* commit '93bb7bf22df96368392199997aa401eef2c12a9c':
  Doc Change: Fix 10224981 error in code snippet
2013-08-08 10:20:40 -07:00
Joe Malin
93bb7bf22d am 5986f497: Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs
* commit '5986f49751e563adf443baca589419e1eb9fbf84':
  Doc Change: Fix 10224981 error in code snippet
2013-08-08 10:17:31 -07:00
Joe Malin
5986f49751 Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs 2013-08-08 17:12:02 +00:00
Craig Mautner
bd6a6e6019 Use package CompatibilityInfo as default. DO NOT MERGE
Do not use CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO as default
if there is one for the package.

Partial fix for 10191318.

Change-Id: Ie218f0717398bb86e5c35066c8fe6a462b7d5273
2013-08-08 09:52:46 -07:00
Daniel Sandler
06c0e408c4 OK, now it's a release.
Bug: 10239687
Change-Id: I38a86926f32e5877cd47ae5e4b625a811478aadc
2013-08-08 12:03:38 -04:00
John Spurlock
7a605df313 Merge "Don't always auto-collapse an empty notification shade." 2013-08-08 11:27:30 +00:00
Chris Wren
e97f90b9bb on screen off: convert heads up to full screen intent.
Let the app handle screen off as appropriate.

Bug: 10209767
Change-Id: I3949def1980118c0380b173a83148321ad8c5d95
2013-08-08 07:23:13 -04:00
Chris Wren
6ccf0affd0 Merge "heads up notifications always take the top spot" 2013-08-08 11:21:09 +00:00
Ben Murdoch
137e5a3b5a Merge "Fix the build" 2013-08-08 11:18:04 +00:00
Chris Wren
f0048ce66f heads up notifications always take the top spot
If it was important enough to be a heads up, it should get top spot.
Make this sticky so bumping out of the HUN doesn't require a shade sort.
Split view creation and insertion so we can get the shade order correct.

Bug: 10001616
Change-Id: I4c1f2581e11a94241269984a01b92289a8943065
2013-08-08 07:16:38 -04:00
Ben Murdoch
3650382175 Fix the build
Change-Id: If34523c4b25b3d60edc00b0f37b636bedfc756c2
2013-08-08 12:16:10 +01:00
Chris Wren
d4db6cbc0f don't bump an active heads up for a corrupt notification
Change-Id: I405d6438e003b08fc3e144bb870c3b3233f71e26
2013-08-08 07:06:15 -04:00
Chris Wren
464a8ce9cc Merge "Animate the heads up notification into the shade." 2013-08-08 10:48:31 +00:00
Chris Wren
bb8b602b78 Merge "ensure heads up slider is initialized." 2013-08-08 10:47:02 +00:00
Chris Wren
10dc5d97d4 Merge "proper geometry for heads up on tablets." 2013-08-08 10:46:02 +00:00
Matt Casey
77ece7b192 Merge "Extend assist context to foreground services" 2013-08-08 09:33:08 +00:00
Martijn Coenen
81ba978410 Merge "NFC: Unify ApduServiceInfo for on/off host." 2013-08-08 04:25:55 +00:00
Ying Wang
610247fbb9 Merge "Fix for build breakage. Correcting the documentatation link in Sensor.java. I added a wrong link {@link #SENSOR_TYPE_ROTATION_VECTOR} instead of {@link #TYPE_ROTATION_VECTOR}." 2013-08-08 04:03:25 +00:00
Aravind Akella
f0f4a83112 Fix for build breakage. Correcting the documentatation link in Sensor.java. I added a wrong link {@link #SENSOR_TYPE_ROTATION_VECTOR} instead of {@link #TYPE_ROTATION_VECTOR}.
Change-Id: I55be472c554a5170f3db64b9cb49337a1f4691c0
2013-08-07 20:11:27 -07:00
Martijn Coenen
38d3bb7696 NFC: Unify ApduServiceInfo for on/off host.
Change-Id: I4f8bb441d7eb564da0486f3e8a1ac08dd18d0dc8
2013-08-07 20:03:03 -07:00
Lorenzo Colitti
a50f4b1d05 Merge "Simplify LinkPropertiesTest." 2013-08-08 02:54:29 +00:00
Svetoslav Ganov
1194d3f733 Merge "Print UI polish based on UX feedback." 2013-08-08 02:48:01 +00:00
Svetoslav Ganov
695c7fa7a3 Print UI polish based on UX feedback.
1. Refreshed the print UI based on UX redlines.

2. Implemented tap outside cancel for the print job config activity
   which is full-screen but pretends to be a dialog.

Change-Id: I5afc7cd40c696109d70af31536898cfcad91b2ab
2013-08-07 19:47:05 -07:00
Satoshi Kataoka
b3c21ac7c6 Reduce the transaction fee of getEnabledInputMethodSubtypeList
Bug: 8467480
Change-Id: If18cce8fbe567df51f29adcdcedff3f743460b8b
2013-08-08 11:32:31 +09:00
Lorenzo Colitti
3f1e1b2ce4 Simplify LinkPropertiesTest.
Instead of converting IP addresses to strings throughout the
test, do so once at the beginning.

Change-Id: I7f0dae5d2e9e2cdc6ec808e2cf71197ba6ade0a4
2013-08-08 11:03:46 +09:00
Jeff Sharkey
26d4adf30f Merge "Better handling of broken storage providers." 2013-08-08 01:37:59 +00:00
Jeff Sharkey
0c2d31bfa1 Better handling of broken storage providers.
Begin throwing FNFE when storage provider doesn't know about document
or when it's having trouble.  Treat all provider errors as FNFE and
avoid crashing our UI.

Change-Id: I946f1ae4125791999464dc4ce494853d5d1c0629
2013-08-07 18:36:41 -07:00
Aravind Akella
52df1db3ce Merge "Adding new constants for STEP_DETECTOR, STEP_COUNTER and GEOMAGNETIC_ROTATION_VECTOR." 2013-08-08 01:26:40 +00:00
Jeff Brown
16ae0cf1af Merge "Add more virtual display tests." 2013-08-08 01:14:05 +00:00
Jeff Brown
7a54069ad5 Merge "Dump information about recent input events." 2013-08-08 01:10:06 +00:00
Jeff Brown
1dc14aeb2f Merge "Fix propagation of display overscan information." 2013-08-08 01:09:42 +00:00