Commit Graph

59822 Commits

Author SHA1 Message Date
John Reck
7d74cb6c61 am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev
* commit '14c436897ca56800a3758008f0631c559a898967':
  Fix issue with RNA destruction mid-animation
2014-12-09 22:08:42 +00:00
John Reck
14c436897c Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev 2014-12-09 20:37:17 +00:00
John Reck
c47c98be04 Fix issue with RNA destruction mid-animation
Bug: 18521508

Fix an issue where an RNA's native object was destroyed
before the java-side object was started

Change-Id: I487fb476e0ecdf7000515f4f7320e8cfbc50a52b
2014-12-09 12:35:12 -08:00
Pavel Zhamaitsiak
bf7b4d9489 am f996d6b7: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev
* commit 'f996d6b7ffcfa813727ba57a30903d1f9e2666da':
  Added configuration to determine whether VoLTE requires provisioning.
2014-12-09 20:17:26 +00:00
Pavel Zhamaitsiak
f996d6b7ff Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev 2014-12-09 20:06:55 +00:00
Adrian Roos
a7065ea363 am c3642ef5: Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev
* commit 'c3642ef5c8582193f26b3875cebd902253709d5e':
  Revert "Add overscan insets to surface frame dimensions in WallpaperService."
2014-12-09 18:52:13 +00:00
Adrian Roos
c3642ef5c8 Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev 2014-12-09 18:44:31 +00:00
Adrian Roos
2ae3805efb Revert "Add overscan insets to surface frame dimensions in WallpaperService."
This reverts commit a2838dfc2c.

Bug: 18630625
Bug: 18659737
Change-Id: Ic02930e0200498289b781436cda1da6e4e1752bb
2014-12-09 18:32:07 +00:00
Etan Cohen
b332eda5eb Added configuration to determine whether VoLTE requires provisioning.
Bug: 18576107
Change-Id: I7e2e7f6549e3e1b94ad7aa4126b26fcb5dcd807b
2014-12-09 10:03:21 -08:00
Wink Saville
2f5cb84355 am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
* commit '15b29ac7faf3b8b7845e6623f68ae7a7391dab78':
  Add subId as parameter for get/setDataEnabled.
2014-12-09 17:58:37 +00:00
Wink Saville
15b29ac7fa Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 2014-12-09 17:52:27 +00:00
Dianne Hackborn
beb84982a1 am 8b33cf4d: Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev
* commit '8b33cf4d34a9ea75e1121ee2f1d829b21f3cb5d6':
  Work on issue #18640385: Add procstats test mode
2014-12-09 01:57:26 +00:00
Dianne Hackborn
8b33cf4d34 Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 2014-12-09 01:53:37 +00:00
Dianne Hackborn
1a4b5a4f02 Work on issue #18640385: Add procstats test mode
You can now do "adb shell dumpsys procstats --start-testing" to
enable high frequency pss sampling.

Also improved the low on RAM mem reporting to separate out RAM
from memtrack, in case the data we are getting from that is bad.

And fixed meminfo --oom to work correctly again.

Change-Id: I7af17eab110a82298bd7b0ce381f8fa5c96c1f6a
2014-12-08 17:43:31 -08:00
Mathieu Chartier
4ec1bdf52f am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev
* commit '52070f81f2c4c41ffe74adcabda64c2b0349c62d':
  Add more -d dalvik details to dumpsys
2014-12-09 01:31:11 +00:00
Mathieu Chartier
25c5e2b12d Add more -d dalvik details to dumpsys
Added .NonMoving for the non moving space.
Added .Zygote for the zygote.
Added .IndirectRef for indirect reference tables (jobjects).

Example:
 Dalvik Details
        .Heap     2264     2264        0        0
         .LOS       80       80        0        0
          .GC      144      144        0        0
      .Zygote      331      196        0     2428
   .NonMoving      540      540        0        0
 .IndirectRef       20       20        0        0

Bug: 18672069
Change-Id: Id14e5bc92ceb15fe7a17d9fb035f18aa2925e50c
2014-12-08 16:38:20 -08:00
Alan Viverette
4b944f3ab8 am 7781647a: Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev
* commit '7781647aa90d7d7a070ecd79e52c2d8a11b59b5c':
  Fix auto-advance regression in radial time picker
2014-12-09 00:18:40 +00:00
Alan Viverette
7781647aa9 Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev 2014-12-09 00:08:01 +00:00
Jeff Sharkey
2f1e953f8f am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev
* commit '4df65bf1eb454814954421403da9f8b5fcb82180':
  Direct notification of network interface changes.
2014-12-09 00:07:37 +00:00
Alan Viverette
c3e16fe33d am 3ba83288: Merge "Add focused & disabled states for spinner assets" into lmp-mr1-dev
* commit '3ba832882566891f643b25f8f89c4341f472b30d':
  Add focused & disabled states for spinner assets
2014-12-09 00:07:31 +00:00
Alan Viverette
32230b2bde am 882a1e89: Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev
* commit '882a1e89742607a3f1fdaa8f5bbd0eb894fc0150':
  Let host view handle long-press when using drag-to-open
2014-12-09 00:07:17 +00:00
Alan Viverette
5a8b956fd2 am db82c9e0: Merge "Fix regression, don\'t NPE if Switch doesn\'t have a thumb set" into lmp-mr1-dev
* commit 'db82c9e00ee9eefab68f6b8fff5db60736583490':
  Fix regression, don't NPE if Switch doesn't have a thumb set
2014-12-09 00:07:12 +00:00
Svet Ganov
7f980d7508 am 381a4236: Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev
* commit '381a423634a293d53f972a0ce4abd7fe7cf7d703':
  When accessibility on cannot click on a view covered by a HorizontalScrollView
2014-12-09 00:07:06 +00:00
Svet Ganov
a91256bc75 am e232d4a6: Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev
* commit 'e232d4a6aadbd32cb80ffd0da9a5d164910b1b79':
  Clear clicked nodes from the accessibiliy cache.
2014-12-09 00:07:01 +00:00
Alan Viverette
11a68e1803 Fix auto-advance regression in radial time picker
If autoAdvance is set, we need to always fire the listener. We should
create a separate callback for auto-advance, but this is a minimal fix.

BUG: 18654878
Change-Id: Ie7b8a3ff91761325a508f580b27fa3b08f7b4e16
2014-12-08 15:54:38 -08:00
Jeff Sharkey
4df65bf1eb Merge "Direct notification of network interface changes." into lmp-mr1-dev 2014-12-08 23:12:46 +00:00
Jeff Sharkey
6973634ce6 Direct notification of network interface changes.
Connectivity broadcasts recently changed and are no longer sent for
certain types of network changes.  For example, when stacked network
interfaces change for a mobile network.  To ensure that we pick up
all these details, directly wire the two services together.

Also remove some unused code for split network types.

Bug: 18666753
Change-Id: I0467bd5b330c0e0cb51af2306d821b41ad16337a
2014-12-08 14:50:14 -08:00
Alan Viverette
3ba8328825 Merge "Add focused & disabled states for spinner assets" into lmp-mr1-dev 2014-12-08 22:08:07 +00:00
Alan Viverette
07ac7fbcab Add focused & disabled states for spinner assets
Regression from KK. Bad copy/paste from another asset. Checked should
have been changed to focused.

BUG: 18669124
Change-Id: I0b86c0437cbe14b46b6a0b7047656ec15bf2d758
2014-12-08 13:47:21 -08:00
Alan Viverette
882a1e8974 Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev 2014-12-08 21:29:08 +00:00
Alan Viverette
db82c9e00e Merge "Fix regression, don't NPE if Switch doesn't have a thumb set" into lmp-mr1-dev 2014-12-08 21:29:04 +00:00
Svet Ganov
381a423634 Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev 2014-12-08 21:28:19 +00:00
Svet Ganov
e232d4a6aa Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev 2014-12-08 21:08:36 +00:00
Alan Viverette
01a0963006 Fix regression, don't NPE if Switch doesn't have a thumb set
BUG: 18670202
Change-Id: Iecb3498032c121c007ec87740ddebadb8e71c7a3
2014-12-08 13:02:06 -08:00
Alan Viverette
298536b1a0 Let host view handle long-press when using drag-to-open
BUG: 18605860
Change-Id: I75850138614f17cf728d4411c142a07bdf15d085
2014-12-08 12:31:14 -08:00
Alan Viverette
e615da7eb7 am f1792c42: Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev
* commit 'f1792c4219fb341a59c4b90c0ce5dd6e0e7b87f0':
  Fix hotspot coordinate propagation in ViewGroup and AbsListView
2014-12-08 18:47:46 +00:00
Alan Viverette
f1792c4219 Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev 2014-12-08 18:39:56 +00:00
Alan Viverette
b942b6f15c Fix hotspot coordinate propagation in ViewGroup and AbsListView
There was a weird disconnect between setPressed() and hotspot propagation
behavior. This makes hotspot propagation work like setPressed(). Also
fixes ripple animation during drag-to-open.

BUG: 18631557
BUG: 18593243
Change-Id: Id4adf5d815e4d426b4182aac4d0c780f04472ae4
2014-12-08 10:37:39 -08:00
Jeff Sharkey
5b41696c56 am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
* commit 'a8fb580379b83b7fc76ee5b99149bbc8a2ce44ab':
  Offer to "merge" subscribers for data usage.
2014-12-08 18:04:02 +00:00
Alan Viverette
3891784f30 am 3ad41537: Merge "Adjust edit text layout, ripple alphas to be closer to Material spec" into lmp-mr1-dev
* commit '3ad41537100e54d35d48f677eaae7f10934f3a15':
  Adjust edit text layout, ripple alphas to be closer to Material spec
2014-12-08 18:03:54 +00:00
Jeff Sharkey
a8fb580379 Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev 2014-12-08 17:57:16 +00:00
Alan Viverette
3ad4153710 Merge "Adjust edit text layout, ripple alphas to be closer to Material spec" into lmp-mr1-dev 2014-12-08 17:57:16 +00:00
Geoff Mendal
654d8805b2 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-08 17:46:53 +00:00
Geoff Mendal
5b571c7a3f Import translations. DO NOT MERGE
Change-Id: Ia87be1197cb5c3a0f5b5ae39384a878fd8e93efb
Auto-generated-cl: translation import
2014-12-08 09:44:34 -08:00
John Spurlock
20a46fb14f am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev
* commit '2ea3650d18ab0ce4dba2cee101d639400b411452':
  Zen: New behavior for built-in downtime + nextalarm conditions.
2014-12-08 16:52:49 +00:00
John Spurlock
2ea3650d18 Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev 2014-12-08 16:47:28 +00:00
Jeff Sharkey
3256601f5e Offer to "merge" subscribers for data usage.
There are some cases where multiple subscriber identities (IMSI)
should be treated as "merged together" from a data usage
perspective.  This is done by extending the template used for
matching purposes to support multiple subscribers.

Then, when we query historical usage or set network policies, we
normalize the matching template to merge to any other identities
that should be included.  When normalizing, the "lowest" identity
is always used for equality and storage purposes, which allows
identities to come and go over time.

This change also fixes data usage recording for multi-SIM devices
by passing along the concrete subscriber identity for each network
interface.  Also correctly create default policies for multi-SIM
devices.  This change also drops setPolicyDataEnable() until it can
be wired up to the right underlying NetworkAgent.  (This means we
still bring up the network, and then rely on iptables rules to block
traffic when over the limit, instead of proactively disabling the
connection.)

Bug: 18012787
Change-Id: If6acf32009fdfea2b836f5aff8e2f3e5e0248b4a
2014-12-08 08:42:59 -08:00
Geoff Mendal
2119b65f83 Import translations. DO NOT MERGE
Change-Id: Iafa118acf3037310f0b60425500b21a714103406
Auto-generated-cl: translation import
2014-12-08 08:07:06 -08:00
John Spurlock
530052a2fe Zen: New behavior for built-in downtime + nextalarm conditions.
- Downtime: Allow user to enter downtime early, offer as an end
   condition four hours before downtime starts.  Available in
   either none or priority, regardless of settings configuration.
 - Downtime: Always exit before next alarm if zen=none.
 - Downtime: Make more like any other condition provider, remove
   special status (mostly).
 - Downtime: New auto-triggering rules, allow triggering after a
   manual condition ends, once.
 - Decouple NextAlarm + Downtime providers, allow them to offer
   their conditions at the same time.
 - Downtime/NextAlarm: Update conditions if they change while being
   requested, even if unsubscribed.
 - Make all three built-in condition providers optional, via config.
 - New internal helper for runtime config.
 - Don't follow changes to next alarm, consider the condition false.
 - Isolate downtime calendar logic into separate class (for testing).
 - Allow a:bb -> a:bb as a valid downtime range (all day).
 - Volume dialog: configuration establishes maximum number of visible
   conditions, including built-ins.
 - Zen mode panel: avoid widget updates during layout transition.
 - Zen mode panel: move controller callers to background thread.
 - Zen mode panel: hide/show/rebind rows instead of adding/removing.
 - ZenLog: Add downtime autotrigger results.
 - Volume panel: Smarter refresh on ringer/zen changes.

Bug: 16373455

Change-Id: I4f801018ddb0beb6eb9fa03a81c79f7949888a3f
2014-12-08 11:00:57 -05:00
Jeremy Joslin
c4b2ec1a3a am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev
* commit '1edc73aa5dc24db39ec685f1950c5110699e301e':
  Don't send the same PendingIntent more than once.
2014-12-06 02:10:33 +00:00