OSDN Git Service
Jorim Jaggi [Fri, 10 Apr 2015 21:46:04 +0000 (21:46 +0000)]
Merge "Keyguard FP UX update"
Jorim Jaggi [Fri, 10 Apr 2015 21:44:06 +0000 (21:44 +0000)]
Merge "Enable incremental SysUI builds on -eng targets"
Jorim Jaggi [Thu, 9 Apr 2015 17:34:49 +0000 (10:34 -0700)]
Keyguard FP UX update
- Add scanning and error states to UI.
- Do not delay dismissing the panel when authenticating via
fingerprint.
Change-Id: I82e71c554c56e53ddf0677dca3e6909f7cedd59d
Jorim Jaggi [Fri, 10 Apr 2015 17:48:58 +0000 (10:48 -0700)]
Enable incremental SysUI builds on -eng targets
Ideally, we would also do incremental builds on userdebug targets,
but this introduces a risk that userdebug builds would be different
to user builds. So we only do it on eng builds for now.
Change-Id: I2778d270052cf26e6c767f1847991a425d8bbd12
Adam Lesinski [Fri, 10 Apr 2015 21:33:47 +0000 (21:33 +0000)]
Merge "Fix deadlock issue in BatteryStatsHelper."
Jeff Tinker [Fri, 10 Apr 2015 21:03:18 +0000 (21:03 +0000)]
Merge "Add a method to associate MediaDrm session with MediaCrypto"
Olawale Ogunwale [Fri, 10 Apr 2015 21:01:22 +0000 (21:01 +0000)]
am
448cb9f9: am
6159f6eb: am
4406568e: Merge "Check caller status precisely when registering receiver."
* commit '
448cb9f9ee8c6bd0a53662362f4a71a1fa4bbd5b':
Check caller status precisely when registering receiver.
John Reck [Fri, 10 Apr 2015 20:52:45 +0000 (20:52 +0000)]
Merge "Remove user of GraphicsJNI::createBitmap"
ztenghui [Fri, 10 Apr 2015 20:48:49 +0000 (20:48 +0000)]
Merge "The ValueAnimator's state need to be totally reset during clone."
Olawale Ogunwale [Fri, 10 Apr 2015 20:48:21 +0000 (20:48 +0000)]
am
6159f6eb: am
4406568e: Merge "Check caller status precisely when registering receiver."
* commit '
6159f6eb231028bc6420edf4157fb335e78aca00':
Check caller status precisely when registering receiver.
Olawale Ogunwale [Fri, 10 Apr 2015 20:37:00 +0000 (20:37 +0000)]
am
4406568e: Merge "Check caller status precisely when registering receiver."
* commit '
4406568ebac6f6bbf627aeb6909b409d948cecf4':
Check caller status precisely when registering receiver.
John Reck [Fri, 10 Apr 2015 20:35:27 +0000 (13:35 -0700)]
Remove user of GraphicsJNI::createBitmap
Change-Id: I2f31bf98ed08eb4bd39a6ce7236c7a23ef309177
ztenghui [Fri, 10 Apr 2015 20:14:17 +0000 (13:14 -0700)]
The ValueAnimator's state need to be totally reset during clone.
b/
20119270
Change-Id: I26365b38e4a9712227aaec6f08f32025dab82ac7
Adam Powell [Fri, 10 Apr 2015 20:23:35 +0000 (20:23 +0000)]
Merge "Relax apilint FW1 error to a warning"
Adam Lesinski [Fri, 10 Apr 2015 20:17:47 +0000 (13:17 -0700)]
Fix deadlock issue in BatteryStatsHelper.
It was assumed that BatteryStatsHelper could safely call into system services.
Because it is used when dumping information from the BatteryStatsService,
this assumption was incorrect.
Now the BatteryStats object carries around the state of the energy reporting
for Bluetooth and WiFi, so BatteryStatsHelper avoids a query into WiFiManager.
b/
19729960
Change-Id: I8745cf6aafeea8e862e34fe63b20056f6ba54b40
Olawale Ogunwale [Fri, 10 Apr 2015 20:14:52 +0000 (20:14 +0000)]
Merge "Check caller status precisely when registering receiver."
Chirag Shah [Fri, 10 Apr 2015 20:13:50 +0000 (20:13 +0000)]
Merge "Add support for schema.org actions in the assist data bundle."
Bryce Lee [Fri, 10 Apr 2015 20:11:39 +0000 (20:11 +0000)]
am
e0233e7e: am
73b56873: am
eccaf729: Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled.
* commit '
e0233e7e1162ce3e699d6eb6648e82d1b403e51e':
Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled.
Ronghua Wu [Fri, 10 Apr 2015 20:10:02 +0000 (20:10 +0000)]
Merge "media: add MediaFormat.KEY_OPERATING_RATE."
Adam Powell [Fri, 10 Apr 2015 20:01:37 +0000 (13:01 -0700)]
Relax apilint FW1 error to a warning
This rule was catching simple getters ("getIntent") as errors even if
the method is a true property get method. Relax to warning until we
can make this a bit more clever.
Change-Id: If183ad5bdc076ce2252399d4abcc8a3a6cbb55c3
Bryce Lee [Fri, 10 Apr 2015 20:02:01 +0000 (20:02 +0000)]
am
73b56873: am
eccaf729: Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled.
* commit '
73b56873f1c39d29bc9f98e727b83b05bb74a44d':
Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled.
Jeff Brown [Fri, 10 Apr 2015 20:01:12 +0000 (20:01 +0000)]
Merge "Tweak systrace for power manager."
Jeff Brown [Fri, 10 Apr 2015 19:58:52 +0000 (12:58 -0700)]
Tweak systrace for power manager.
Add name to photonic modulator thread.
Print light color in hex.
Change-Id: I813e875b04c381b26e0f79773a209417eca21e21
Bryce Lee [Fri, 10 Apr 2015 19:51:32 +0000 (19:51 +0000)]
am
eccaf729: Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled.
* commit '
eccaf7290ab833d12049a184747603cd74261490':
Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled.
Alan Viverette [Fri, 10 Apr 2015 18:05:50 +0000 (11:05 -0700)]
Fix application of default dialog theme
Cleans up lint annotations.
Bug:
20149703
Change-Id: I2ed4eb002b6679a55ea4d5fcc1ea958a4dcb08df
Svetoslav [Fri, 10 Apr 2015 18:45:04 +0000 (18:45 +0000)]
Merge "Allow only system signed apps to grant permissions at install"
Svetoslav [Fri, 10 Apr 2015 00:28:54 +0000 (17:28 -0700)]
Allow only system signed apps to grant permissions at install
bug:
20099946
Change-Id: Ifcc5c6638b4174ffb3ba452ae68a5a53b2d1ff0a
Ashutosh Joshi [Fri, 10 Apr 2015 18:36:41 +0000 (18:36 +0000)]
Merge "Adding a feature string for high capability sensors."
Alex Klyubin [Fri, 10 Apr 2015 18:29:53 +0000 (18:29 +0000)]
am
d31d4771: am
c5f9683c: am
a270264c: Merge "Track more changes to keymaster_defs.h"
* commit '
d31d4771d90277eb246814b6a6f981e0842eb614':
Track more changes to keymaster_defs.h
Alex Klyubin [Fri, 10 Apr 2015 18:18:42 +0000 (18:18 +0000)]
am
c5f9683c: am
a270264c: Merge "Track more changes to keymaster_defs.h"
* commit '
c5f9683c065e6ddf906a354603d19ce57448993f':
Track more changes to keymaster_defs.h
Alex Klyubin [Fri, 10 Apr 2015 18:09:27 +0000 (18:09 +0000)]
am
a270264c: Merge "Track more changes to keymaster_defs.h"
* commit '
a270264c61daa42a5b03bbb1e7f23e77780f8fc0':
Track more changes to keymaster_defs.h
Alex Klyubin [Fri, 10 Apr 2015 17:51:44 +0000 (17:51 +0000)]
Merge "Track more changes to keymaster_defs.h"
Alan Viverette [Fri, 10 Apr 2015 17:50:19 +0000 (17:50 +0000)]
Merge "Don't change state when inflating LayerDrawable"
Scott Kennedy [Fri, 10 Apr 2015 17:38:51 +0000 (17:38 +0000)]
Merge "Fix a typo in BluetoothLeScanner documentation"
Ben Kwa [Fri, 10 Apr 2015 17:33:32 +0000 (17:33 +0000)]
Merge "Enable directory copying."
Nancy Chen [Fri, 10 Apr 2015 17:32:22 +0000 (17:32 +0000)]
Merge "Create interface for SmsManager text sending methods."
Ben Kwa [Wed, 8 Apr 2015 22:03:35 +0000 (15:03 -0700)]
Enable directory copying.
- Enable directory picking for copying.
- Implement recursive copying inside the CopyService.
- Pretty up the notification (use an indeterminate notification while
calculating copy size)
- Do two recursive walks: one to determine the size of the copy job,
and then another to actually copy the files.
- Switch to using ContentProviderClient instances, for better error
detection and handling
- Disable copying from the Recents view.
Change-Id: Ieb38cca80edf84a487547b68f0d6b328fc4d7701
Scott Kennedy [Fri, 10 Apr 2015 17:25:34 +0000 (10:25 -0700)]
Fix a typo in BluetoothLeScanner documentation
Change-Id: Id19dae9a583c0ef621789604277e3f6c6aead80c
Clara Bayarri [Fri, 10 Apr 2015 17:22:39 +0000 (17:22 +0000)]
Merge "Editor: Account for a split cursor in the content rect calculation"
Doris Liu [Fri, 10 Apr 2015 17:19:41 +0000 (17:19 +0000)]
Merge "Add a check for color type in property values holder"
Craig Lafayette [Fri, 10 Apr 2015 17:15:47 +0000 (17:15 +0000)]
Merge "Reset protection in PersistentDataBlockManager"
Craig Lafayette [Fri, 27 Mar 2015 13:01:43 +0000 (09:01 -0400)]
Reset protection in PersistentDataBlockManager
Add method to allow authorized data block wipe in support of factory
reset protection. This will allow ManagedProvisioning to respond to
and pass factory reset protection challenges during automated device
setup.
- Adds the wipeIfAllowed method to clear the data block
- Creates a protected-broadcast to send to allowed package
Bug:
19792435
Change-Id: I897f2ea2afb1222a1fc8ac49290ee45ea4d3f2d7
Nick Kralevich [Fri, 10 Apr 2015 16:58:17 +0000 (16:58 +0000)]
am
12a597a2: am
a55ec9c2: am
08d76a94: Merge "Impose an ordering on created SELinuxMMAC Policy objects."
* commit '
12a597a2bc92eda2f33bc85bb1c525989c261abf':
Impose an ordering on created SELinuxMMAC Policy objects.
Mike Lockwood [Fri, 10 Apr 2015 16:54:00 +0000 (16:54 +0000)]
Merge changes I075a54dc,I0a9bc7c3
* changes:
Add user visible name for USB peripheral MIDI device
Add MidiDeviceInfo.getPortList()
Nick Kralevich [Fri, 10 Apr 2015 16:42:25 +0000 (16:42 +0000)]
am
a55ec9c2: am
08d76a94: Merge "Impose an ordering on created SELinuxMMAC Policy objects."
* commit '
a55ec9c2abfd8a8bd216f133ec925e9db1d69ae7':
Impose an ordering on created SELinuxMMAC Policy objects.
Ashutosh Joshi [Thu, 9 Apr 2015 17:30:07 +0000 (10:30 -0700)]
Adding a feature string for high capability sensors.
Adding a feature string for higher capability sensor platforms.
The string is supposed to signal the availability of lower power and
higher accuracy sensor processing on a supporting device.
Change-Id: I8093065278589fc9cc41fcc7f9b898c7eae20dff
Nick Kralevich [Fri, 10 Apr 2015 16:31:23 +0000 (16:31 +0000)]
am
08d76a94: Merge "Impose an ordering on created SELinuxMMAC Policy objects."
* commit '
08d76a946b898af28f3c8125cdf4966195b718fb':
Impose an ordering on created SELinuxMMAC Policy objects.
Nick Kralevich [Fri, 10 Apr 2015 16:10:26 +0000 (16:10 +0000)]
Merge "Impose an ordering on created SELinuxMMAC Policy objects."
John Reck [Fri, 10 Apr 2015 16:06:04 +0000 (16:06 +0000)]
am
18ae2a02: am
32eafe9b: am
a08f6a66: Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited."
* commit '
18ae2a020d3c720f8b6125b9f4567e953f04c7b0':
Fix GL_INVALID_OPERATION in font renderer when font cache is limited.
John Reck [Fri, 10 Apr 2015 16:05:50 +0000 (16:05 +0000)]
am
6b6645c8: am
1a595833: am
d56e087b: Merge "Fixing memory leak in RenderBufferCache"
* commit '
6b6645c8951e95b2802c489ab2d87f004c610ffc':
Fixing memory leak in RenderBufferCache
Alex Klyubin [Fri, 10 Apr 2015 02:59:00 +0000 (19:59 -0700)]
Track more changes to keymaster_defs.h
KeyStoreTest needed to be adjusted because OCB is no longer supported.
Bug:
18088752
Change-Id: I7594daaa5e97423d34726b07cc79e3ee28418d95
John Reck [Fri, 10 Apr 2015 15:55:33 +0000 (15:55 +0000)]
am
32eafe9b: am
a08f6a66: Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited."
* commit '
32eafe9b715b08453eea213d7dcad174ac5e80d2':
Fix GL_INVALID_OPERATION in font renderer when font cache is limited.
John Reck [Fri, 10 Apr 2015 15:55:27 +0000 (15:55 +0000)]
am
1a595833: am
d56e087b: Merge "Fixing memory leak in RenderBufferCache"
* commit '
1a5958331ef5f51d7722682d7e980204a1c50a04':
Fixing memory leak in RenderBufferCache
Mike Lockwood [Fri, 10 Apr 2015 15:25:55 +0000 (08:25 -0700)]
Add user visible name for USB peripheral MIDI device
Change-Id: I075a54dc3890bc5cf3927cecba3750e1d342d290
Mike Lockwood [Fri, 10 Apr 2015 00:51:32 +0000 (17:51 -0700)]
Add MidiDeviceInfo.getPortList()
This replaces MidiDeviceInfo.getInputPortInfo() and getOutputPortInfo()
Change-Id: I0a9bc7c34a172a072e86718d465967c6c618fb3b
John Reck [Fri, 10 Apr 2015 15:44:34 +0000 (15:44 +0000)]
am
a08f6a66: Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited."
* commit '
a08f6a66e91c7bacd50e64c039aaaa6b9fe2625c':
Fix GL_INVALID_OPERATION in font renderer when font cache is limited.
John Reck [Fri, 10 Apr 2015 15:44:26 +0000 (15:44 +0000)]
am
d56e087b: Merge "Fixing memory leak in RenderBufferCache"
* commit '
d56e087b550f7ee351f15ac6c5ff9d57a08387fc':
Fixing memory leak in RenderBufferCache
riddle_hsu [Wed, 4 Feb 2015 12:52:03 +0000 (20:52 +0800)]
Check caller status precisely when registering receiver.
Fine tune commit
9ac9609f.
Because process may reuse same process record to restart.
It is better to check below conditions to skip:
1. Simple dead and has been cleaned.
=> .thread will be null
2.The process has restarted with new pid but has not attached yet.
=> .thread will be null
3.The process has restarted and attached.
=> The IBinder will be different
Change-Id: Ic052f5025558ca93e1a6ab11bca61fe995126bb9
John Reck [Fri, 10 Apr 2015 15:32:00 +0000 (15:32 +0000)]
Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited."
John Reck [Fri, 10 Apr 2015 15:27:01 +0000 (15:27 +0000)]
Merge "Fixing memory leak in RenderBufferCache"
Robert Craig [Fri, 10 Apr 2015 15:02:33 +0000 (11:02 -0400)]
Impose an ordering on created SELinuxMMAC Policy objects.
Imposing an order on Policy objects allows us to extend the
policy writers ability to union mac_permissions.xml files.
Policy developers can now create new mac_permissions.xml
entries under their device specific directories. This is
in contrast to current methods which only allow differing
stanzas to appear outside the base mac_permissions.xml.
Also, report on stanzas with duplicate input selectors and
treat these as errors. There are some ambiguities that can
arise otherwise.
Lastly, impose an XOR condition on signer stanzas w.r.t seinfo
and package tags. This finer distinction helps the union feature
of policy to become clearer and simpler to code.
Change-Id: Idd86df8ad9a63d1b8ba6e8270670814ca6cee8d2
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Clara Bayarri [Thu, 9 Apr 2015 14:24:58 +0000 (15:24 +0100)]
Editor: Account for a split cursor in the content rect calculation
In some cases, the cursor in a TextView is split. This happens with
RTL languages. For this case we need to ensure neither of the half
cursors is obscured by the Floating Toolbar, hence we take the
minimal rectangle that contains both cursors as the content rect.
Change-Id: I2ce411793fcba2140c4ad7fb7caaf03593620484
George Mount [Fri, 10 Apr 2015 14:25:37 +0000 (14:25 +0000)]
Merge "Revert "Revert "Allow delay of showing/hiding shared element when transferring."""
Chris Wren [Fri, 10 Apr 2015 14:12:23 +0000 (14:12 +0000)]
Merge "Support ad hoc counters in the framework"
Andrew Flynn [Fri, 10 Apr 2015 14:04:56 +0000 (14:04 +0000)]
Merge "Consolidate SystemUI SharedPreferences."
Andrew Flynn [Wed, 1 Apr 2015 18:22:37 +0000 (14:22 -0400)]
Consolidate SystemUI SharedPreferences.
Makes it easier to use from any place and gets us type-safety.
Change-Id: I472e340e8332d9a173335b6f337525d58d801881
John Spurlock [Fri, 10 Apr 2015 12:10:22 +0000 (08:10 -0400)]
Zen: New option to allow repeat callers.
Bug:
20064962
Change-Id: I11a5519c02bf8fa8e332559092c865c5e612fbd2
Jeff Tinker [Fri, 10 Apr 2015 11:05:25 +0000 (04:05 -0700)]
Add a method to associate MediaDrm session with MediaCrypto
Previously, to associate a MediaDrm session with MediaCrypto,
the MediaDrm sessionId was passed as initData to the MediaCrypto
constructor. This is not ideal for two reasons: it's pretty
obscure and you can't change the association without tearing
down the MediaCodec/MediaCrypto and starting all over. Use
cases like key rotation require being able to update the
MediaDrm session post-construction. This CL addresses both of
these issues.
bug:
19570317
Change-Id: Ie3d3eda16651b598cdd41f2180074a43cb6c0884
Clara Bayarri [Fri, 10 Apr 2015 10:02:19 +0000 (10:02 +0000)]
Merge "Editor: Allow invalidation of the Text Selection Action Mode"
Narayan Kamath [Wed, 8 Apr 2015 12:24:13 +0000 (13:24 +0100)]
Create DropboxService lazily.
We seldom use it from libcore.io.DropBox so there's not much point
(there's only one usage, from a conscrypt SSL error). This saves > 10ms
from ActivityThread.attach.
Change-Id: I360158ef9a36a9ababd700e4f3243c92b74047eb
Seigo Nonaka [Tue, 7 Apr 2015 12:02:13 +0000 (21:02 +0900)]
Introduce Ctrl+Backspace/Ctrl+ForwardDelete shortcut.
Ctrl+Backspace deletes preceding one word and Ctrl+ForwardDelete delets
following one word.
Used Chrome's implementation/behvior as a reference.
Bug:
17810742
Change-Id: I7b2ca515b2f017e457f7104ec7b8e7473ca4e081
Pirama Arumuga Nainar [Fri, 10 Apr 2015 04:37:01 +0000 (04:37 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Seigo Nonaka [Fri, 10 Apr 2015 04:35:36 +0000 (04:35 +0000)]
Merge "Fix unexpected selection cancellation"
Tim Murray [Fri, 10 Apr 2015 04:35:04 +0000 (04:35 +0000)]
am
72fcf9eb: am
af61d43d: am
6d718c2f: Merge "Add support for setting the cache directory."
* commit '
72fcf9eb1079312afd7bdbee167c759109af4244':
Add support for setting the cache directory.
Alex Klyubin [Fri, 10 Apr 2015 04:34:13 +0000 (04:34 +0000)]
am
037dfb94: am
5f8c17b9: am
ba2836e6: Merge "Track recent keymaster_defs.h changes."
* commit '
037dfb9423a0988398b67520546dae5673aa54bb':
Track recent keymaster_defs.h changes.
Alex Klyubin [Fri, 10 Apr 2015 04:33:48 +0000 (04:33 +0000)]
am
04a99c7b: am
82cba6aa: am
c6eb6288: Merge "Split key origin into TEE/not and generated/imported."
* commit '
04a99c7b4435598e4f9d53fadbe5faca4ad7ebdc':
Split key origin into TEE/not and generated/imported.
Mathieu Chartier [Fri, 10 Apr 2015 04:33:25 +0000 (04:33 +0000)]
am
6951d555: am
56a6d371: am
da164973: Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""
* commit '
6951d555c2060e19bd9db46a772852db8aa24dfe':
Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"
Seigo Nonaka [Fri, 10 Apr 2015 03:35:29 +0000 (03:35 +0000)]
Merge "Use TextView's text locale for capitalization."
Jeff Brown [Fri, 10 Apr 2015 03:11:41 +0000 (03:11 +0000)]
Merge "Expose Cursor.setExtras()."
Doris Liu [Fri, 10 Apr 2015 03:11:22 +0000 (20:11 -0700)]
Add a check for color type in property values holder
Bug:
20140483
Change-Id: Ic6cc72388811a450e29a346625c785456834452b
Jeff Brown [Fri, 10 Apr 2015 02:50:05 +0000 (02:50 +0000)]
Merge "Clean up AbstractCursor API."
Jeff Brown [Fri, 10 Apr 2015 02:49:34 +0000 (02:49 +0000)]
Merge "Remove deprecated fields in AbstractCursor."
Jeff Brown [Fri, 10 Apr 2015 01:28:24 +0000 (18:28 -0700)]
Expose Cursor.setExtras().
Bug:
19369537
Change-Id: I78e319667cbfaeb51f471d18c4fefeac01d49d80
Jeff Brown [Fri, 10 Apr 2015 01:52:52 +0000 (18:52 -0700)]
Clean up AbstractCursor API.
Deprecated three protected fields that should not have been
exposed in the API.
Bug:
6353797
Change-Id: Ic6710f880a452dd1508abf0613907a1d2b1fb557
Jeff Brown [Fri, 10 Apr 2015 01:32:35 +0000 (18:32 -0700)]
Remove deprecated fields in AbstractCursor.
Bug:
6353797
Change-Id: Ibf760f0aeef82c176e3c659a2ced3de07f8e8abe
Chong Zhang [Fri, 10 Apr 2015 02:29:36 +0000 (02:29 +0000)]
Merge "MediaMetadataRetriever: add key for capture fps"
John Spurlock [Fri, 10 Apr 2015 02:07:51 +0000 (02:07 +0000)]
Merge "Volume: Update media bluetooth icons."
John Spurlock [Fri, 10 Apr 2015 02:04:14 +0000 (22:04 -0400)]
Volume: Update media bluetooth icons.
Note + bt logo.
Bug:
19260237
Change-Id: I32cb497505f7dea94d761637064f8f8e585ffa94
John Spurlock [Fri, 10 Apr 2015 01:48:02 +0000 (01:48 +0000)]
Merge "An update on Downtime."
John Spurlock [Tue, 7 Apr 2015 16:47:12 +0000 (12:47 -0400)]
An update on Downtime.
The update is that Downtime is obsolete. Replaced by the
ability to define multiple named schedule calendars.
- Make changes to ZenModeConfig to properly model manual
and automatic rules.
- Refactor the zen mode helper (and supporting classes) to
properly handle / report multiple claims on zen mode.
The "manual" rule (specified by the user in the UI) vs
one or more automatic rules.
- Automatic rules are still backed by condition providers,
but the layering is now cleaner. ConditionProviders is now
completely generic, has no ties to zen mode.
- Specifically, the new layering for zen mode (below noman) is:
ZenModeHelper: Source of truth for zen state
ZenModeFiltering: Subhelper dedicated to filtering rules.
ZenModeConditions: Subhelper dedicated to managing automatic rules.
ConditionProviders: Underlying engine for reporting named boolean state.
- Migration story for users with existing downtime config, migrated
to a single new calendar named downtime.
- For users with no existing downtime, two default calendars are created
for weeknights + weekends (icu4j for all locales will be done in a followup).
- Remove obsolete DowntimeConditionProvider/NextAlarmConditionProvider and tracking.
- Clean up obsolete resources.
- Add common zen summary description string computation.
- Add proper noman wrappers for the new model.
- Change the semantics of the global zen setting. It is now read-only. Setters
must call noman, added a "reason" to all calls for better attribution.
- Update zenmodepanel + volumedialog to the new model.
- Display the one or more automatic rules in the new zen footer summary.
- "Snooze" the automatic rules when the user explicitly turns zen off.
Bug:
20064962
Change-Id: Idd9deb865a6035ad0cfae660198dccb517e6d7cc
Tim Murray [Fri, 10 Apr 2015 01:30:14 +0000 (01:30 +0000)]
am
af61d43d: am
6d718c2f: Merge "Add support for setting the cache directory."
* commit '
af61d43d6ce065832f906757c2185c3dad74d489':
Add support for setting the cache directory.
Nancy Chen [Fri, 10 Apr 2015 01:21:41 +0000 (18:21 -0700)]
Create interface for SmsManager text sending methods.
This is part of set of changes to make looser changes just internally to
send SMS from packages/services/Telephony.
Bug:
19236241
Change-Id: I207ab73b2f63f745a55cefd12c85a044f7bbf11d
Tim Murray [Fri, 10 Apr 2015 01:07:26 +0000 (01:07 +0000)]
am
6d718c2f: Merge "Add support for setting the cache directory."
* commit '
6d718c2f43f6be057f9a519bc02f6b123405b79d':
Add support for setting the cache directory.
Tim Murray [Fri, 10 Apr 2015 00:51:14 +0000 (00:51 +0000)]
Merge "Add support for setting the cache directory."
Tim Murray [Tue, 7 Apr 2015 22:43:24 +0000 (15:43 -0700)]
Add support for setting the cache directory.
Change-Id: I2bf1874705b877a8a8262ab49b47fe8241e603d5
Alex Klyubin [Fri, 10 Apr 2015 00:35:55 +0000 (00:35 +0000)]
am
5f8c17b9: am
ba2836e6: Merge "Track recent keymaster_defs.h changes."
* commit '
5f8c17b9f6d574eca6a24ddb2f7cc98a37f5aaea':
Track recent keymaster_defs.h changes.
Adam Lesinski [Fri, 10 Apr 2015 00:32:27 +0000 (00:32 +0000)]
Merge "Add PNG and 9-patch support"
Alan Viverette [Fri, 10 Apr 2015 00:28:24 +0000 (17:28 -0700)]
Don't change state when inflating LayerDrawable
Bug:
20098214
Change-Id: I6968697053587454bba42c0652efd99b9c8a8e25
Alex Klyubin [Fri, 10 Apr 2015 00:22:45 +0000 (00:22 +0000)]
am
ba2836e6: Merge "Track recent keymaster_defs.h changes."
* commit '
ba2836e6cf5a00855e470705741d9e4b9b1a9df9':
Track recent keymaster_defs.h changes.
Adam Lesinski [Mon, 6 Apr 2015 18:46:52 +0000 (11:46 -0700)]
Add PNG and 9-patch support
Change-Id: I9ecdfdf82b82d59084490da518e167e256afd5f2