212327 Commits

Author SHA1 Message Date
Alan Viverette
ffa8fd0ed4 am 6a032a3a: Don\'t project ripple for adequately tall spinners
* commit '6a032a3aba3741ce55679b97c2f048b523d465de':
  Don't project ripple for adequately tall spinners
2015-10-15 23:12:34 +00:00
Dianne Hackborn
56f4197148 Merge "Fix issue #24571425: Device does not come out of idle mode for maintenance" into mnc-dr-dev 2015-10-15 23:11:12 +00:00
Alan Viverette
6a032a3aba Don't project ripple for adequately tall spinners
Bug: 24674907
Change-Id: I1674c14f321600a40ca20adab1d40459963d2d1b
2015-10-15 22:53:04 +00:00
Sanket Padawe
fb34a123ed Mask IccId which gets printed in bug reports & radio logs.
Bug: 24941148
Change-Id: Ibe397f5d9b0da245e3e64f626937db4792c7f3c2
2015-10-15 15:46:39 -07:00
Adrian Roos
fc7476da7a Fix wrongly laid out navigation color view
The SystemUI visibility listener in DecorView
gets called between the measure and layout passes
and is therefore not allowed to change layout parameters.

This change makes sure that changes to the color view
layout parameters are applied eagerly when the insets
change instead of waiting for the views to become visible.

Bug: 24614374

Change-Id: If9df18f582163d0869c28a852c36697b1ce50621
2015-10-15 15:39:46 -07:00
Dianne Hackborn
f383129b09 Fix issue #24571425: Device does not come out of idle mode for maintenance
Don't allow alarms to push the idle maintenance alarm later
than it was set for.

Change-Id: I947718ffc9d2b984a793d7e4f2d027d8ddeee41b
2015-10-15 14:51:06 -07:00
Julia Reynolds
8e2d2bbeec Add 'until next alarm' option to QS zen panel.
Unlike the implementation in LMR1, this is a countdown condition
(a countdown until the time of what was the next alarm when the
rule was created). The rule will not change if alarms change.
Also, alarms up to 7 days in the future will be considered.

Bug: 21648799
Change-Id: Id7fa9dbdbad1539e4da19b1d0e0c4395bb13e6cb
(cherry picked from commit 0842fe87b27b9e4a7aecfec25b93dba2d39f398a)
2015-10-15 17:02:00 -04:00
Rob Carr
2f8c74ab53 am 0a543fac: am 111b378a: am 575b629e: Merge "WindowStateAnimation: Clear transformation clip rect." into mnc-dr-dev
* commit '0a543fac0f30c38d791cb108e521998333363104':
  WindowStateAnimation: Clear transformation clip rect.
2015-10-15 18:53:59 +00:00
Rob Carr
0a543fac0f am 111b378a: am 575b629e: Merge "WindowStateAnimation: Clear transformation clip rect." into mnc-dr-dev
* commit '111b378a4e20b9eb2deada94458bae16b91601ff':
  WindowStateAnimation: Clear transformation clip rect.
2015-10-15 18:46:57 +00:00
Rob Carr
111b378a4e am 575b629e: Merge "WindowStateAnimation: Clear transformation clip rect." into mnc-dr-dev
* commit '575b629ef8e21cca5a40acaafeee7653d90956fe':
  WindowStateAnimation: Clear transformation clip rect.
2015-10-15 18:42:07 +00:00
Rob Carr
575b629ef8 Merge "WindowStateAnimation: Clear transformation clip rect." into mnc-dr-dev 2015-10-15 18:38:28 +00:00
Brian Carlstrom
bd5b6252a5 am b9a28ae1: am f916524f: Merge "Add support for --user to "pm path" for work profile use"
* commit 'b9a28ae199ad44b07682f7417bc146acdc411c2a':
  Add support for --user to "pm path" for work profile use
2015-10-15 16:12:20 +00:00
Brian Carlstrom
b9a28ae199 am f916524f: Merge "Add support for --user to "pm path" for work profile use"
* commit 'f916524f44c9955e7c747e5319d17c46a61a3c4c':
  Add support for --user to "pm path" for work profile use
2015-10-15 16:02:57 +00:00
Brian Carlstrom
f916524f44 Merge "Add support for --user to "pm path" for work profile use" 2015-10-15 15:55:45 +00:00
Julia Reynolds
3afdd41772 am cad75a26: am 627bc805: am ae5a53d7: Merge "Update volume slider on device changed." into mnc-dr-dev
* commit 'cad75a2636ea53017686d6d565c60e92cdfac161':
  Update volume slider on device changed.
2015-10-15 13:59:47 +00:00
Julia Reynolds
cad75a2636 am 627bc805: am ae5a53d7: Merge "Update volume slider on device changed." into mnc-dr-dev
* commit '627bc805b839b953fedd5a72d107fafed47aff6f':
  Update volume slider on device changed.
2015-10-15 13:53:30 +00:00
Julia Reynolds
627bc805b8 am ae5a53d7: Merge "Update volume slider on device changed." into mnc-dr-dev
* commit 'ae5a53d78cac72b73574b874a4d12ae9de708101':
  Update volume slider on device changed.
2015-10-15 13:48:21 +00:00
Julia Reynolds
ae5a53d78c Merge "Update volume slider on device changed." into mnc-dr-dev 2015-10-15 13:44:04 +00:00
Julia Reynolds
607479d109 am 86fdb662: am 4f836839: am 67ea77ec: Merge "Selectively show zen footer." into mnc-dr-dev
* commit '86fdb662a3d9c34099248910756ca18cd0b3b2f1':
  Selectively show zen footer.
2015-10-15 13:43:17 +00:00
Julia Reynolds
86fdb662a3 am 4f836839: am 67ea77ec: Merge "Selectively show zen footer." into mnc-dr-dev
* commit '4f836839c19aed433e7b1913ce05ccb129743fd7':
  Selectively show zen footer.
2015-10-15 13:39:28 +00:00
Julia Reynolds
4f836839c1 am 67ea77ec: Merge "Selectively show zen footer." into mnc-dr-dev
* commit '67ea77ec3fd838e1a367ad6f367970599e599a99':
  Selectively show zen footer.
2015-10-15 13:33:35 +00:00
Julia Reynolds
67ea77ec3f Merge "Selectively show zen footer." into mnc-dr-dev 2015-10-15 13:29:51 +00:00
Chris Thornton
09822ec619 am 11543a1b: am ea5ad487: am d8ef44bc: Merge "Don\'t call StopRecognition when recognition was aborted." into mnc-dr-dev
* commit '11543a1b852e5e87d37f5fbe95131d0f1d9afbee':
  Don't call StopRecognition when recognition was aborted.
2015-10-15 01:43:57 +00:00
Chris Thornton
11543a1b85 am ea5ad487: am d8ef44bc: Merge "Don\'t call StopRecognition when recognition was aborted." into mnc-dr-dev
* commit 'ea5ad4872ec9efb27c33796e60458b4a1e3905f4':
  Don't call StopRecognition when recognition was aborted.
2015-10-15 01:33:36 +00:00
Chris Thornton
ea5ad4872e am d8ef44bc: Merge "Don\'t call StopRecognition when recognition was aborted." into mnc-dr-dev
* commit 'd8ef44bc51a4a27cd9a57c880a367636a1377082':
  Don't call StopRecognition when recognition was aborted.
2015-10-15 01:28:39 +00:00
Chris Thornton
d8ef44bc51 Merge "Don't call StopRecognition when recognition was aborted." into mnc-dr-dev 2015-10-15 01:24:45 +00:00
Dianne Hackborn
1e46ee937c am 522222bc: am f96ca344: am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev
* commit '522222bc9bbfb6d62e101eaa6af2668277143e19':
  Docs only change: update build version docs.
2015-10-15 01:16:00 +00:00
Dianne Hackborn
522222bc9b am f96ca344: am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev
* commit 'f96ca3441ea1a22e4d9e4402942ddce4a3234860':
  Docs only change: update build version docs.
2015-10-15 01:12:35 +00:00
Dianne Hackborn
f96ca3441e am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev
* commit '75765dbe48ed38d7044f458062510a9082750049':
  Docs only change: update build version docs.
2015-10-15 01:05:54 +00:00
Dianne Hackborn
75765dbe48 am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev
* commit 'e34445f11a6a14dd30ba0e018b82e852ef82ecbc':
  Docs only change: update build version docs.
2015-10-15 01:01:12 +00:00
Dianne Hackborn
e34445f11a Merge "Docs only change: update build version docs." into mnc-dev 2015-10-15 00:56:05 +00:00
Adrian Roos
d06f20f9e1 am 67255b44: am c007c150: am 8630e18a: am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev
* commit '67255b4403df91d8405506ecac6965367093cd6b':
  Send next alarm's show intent via PendingIntent
2015-10-15 00:54:34 +00:00
Robert Carr
38451b8247 WindowStateAnimation: Clear transformation clip rect.
Ensure the clip rect taken from transformations is cleared
when there is no transformation. Normally the failure to
clear the clip would not cause a problem, as the final clip
would be equal to the window size. However, in the event that
the window scale goes on to change (WindowState::m(H/V)Scale that is)
the clip will now be specified at the inappropriate scale (notice the
way the clip must be divided by H/VScale as SurfaceFlinger will apply
the surface transform to the clip).

Bug:24298694
Change-Id: I4548e8ecea8d66d4942e99823653a7b05f87cea0
(cherry picked from commit 2f0fe62c5426533ccdf9ec7ef28027c367286979)
2015-10-15 00:53:35 +00:00
Adrian Roos
67255b4403 am c007c150: am 8630e18a: am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev
* commit 'c007c150d5f56305e84af44d7993d8f2e6a4fc78':
  Send next alarm's show intent via PendingIntent
2015-10-15 00:45:23 +00:00
Adrian Roos
c007c150d5 am 8630e18a: am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev
* commit '8630e18a297801238efcba8760e8d850d8920a80':
  Send next alarm's show intent via PendingIntent
2015-10-15 00:40:45 +00:00
Adrian Roos
8630e18a29 am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev
* commit '31f19c444f5f9d22c81fcb339e51bee465ba10f9':
  Send next alarm's show intent via PendingIntent
2015-10-15 00:35:33 +00:00
Roozbeh Pournader
97c9c48495 am f12a7499: am 9407aa7c: am 63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev
* commit 'f12a7499dee29904ef15d4f7f9ef60e0ebc4c341':
  Load binary hyphen data files
2015-10-15 00:31:44 +00:00
Adrian Roos
31f19c444f Merge "Send next alarm's show intent via PendingIntent" into mnc-dev 2015-10-15 00:29:56 +00:00
Roozbeh Pournader
f12a7499de am 9407aa7c: am 63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev
* commit '9407aa7cf0b369d31bd6c69f9c26bdf6a1f44fe9':
  Load binary hyphen data files
2015-10-15 00:27:29 +00:00
Roozbeh Pournader
9407aa7cf0 am 63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev
* commit '63aa02e47fa0fdd877b9fde7f1f6eda75b645f92':
  Load binary hyphen data files
2015-10-15 00:22:43 +00:00
Roozbeh Pournader
63aa02e47f Merge "Load binary hyphen data files" into mnc-dr-dev 2015-10-15 00:18:36 +00:00
Adam Powell
2271385ad8 am bd4d81b0: am b248077a: am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev
* commit 'bd4d81b08cc5d961da294c683a73c6c13e3eb931':
  Fix bugs introduced in ChooserActivity
2015-10-15 00:08:14 +00:00
Adam Powell
bd4d81b08c am b248077a: am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev
* commit 'b248077a8a239fe6fe28775a7472a89ff42fdec3':
  Fix bugs introduced in ChooserActivity
2015-10-15 00:01:29 +00:00
Amit Mahajan
21fd47548b am a41ea5e9: am 8fb8c37c: am 7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev
* commit 'a41ea5e95092674983ab4ae97788184c27ed64b6':
  Adding config to allow/disallow user to add APNs.
2015-10-14 23:54:08 +00:00
Adam Powell
b248077a8a am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev
* commit '2eac005bbfc94a774c0a3f870fd393a3e7389f8c':
  Fix bugs introduced in ChooserActivity
2015-10-14 23:52:14 +00:00
Amit Mahajan
a41ea5e950 am 8fb8c37c: am 7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev
* commit '8fb8c37ca7c2c57466b07548effa24044e5b3ef6':
  Adding config to allow/disallow user to add APNs.
2015-10-14 23:50:11 +00:00
Bryce Lee
b96d89cd34 Add capability to identify phone accounts that are emergency only.
Bug: 24756957
Change-Id: Id26eaa7f6632674f7122b4cd658cbe2bf9b04594
2015-10-14 16:48:40 -07:00
Adam Powell
2eac005bbf Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev 2015-10-14 23:46:32 +00:00
Amit Mahajan
8fb8c37ca7 am 7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev
* commit '7b28e6ec96dfcb20cef1f321ac7539bac439d726':
  Adding config to allow/disallow user to add APNs.
2015-10-14 23:42:13 +00:00
Amit Mahajan
7b28e6ec96 Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev 2015-10-14 23:33:02 +00:00