Commit Graph

54760 Commits

Author SHA1 Message Date
George Mount
1de0e6406a Merge "Fix crash in forceViewsToAppear" 2016-01-14 21:43:13 +00:00
George Mount
5fddd4ca58 Fix crash in forceViewsToAppear
Bug 26549234

Change-Id: I57cfc8ea8831d46a2846b36b2ac4acff2112b414
2016-01-14 13:40:18 -08:00
Yohei Yukawa
e36c8078c4 Merge "Introduce SuggestionSpan#getLocaleObject()." 2016-01-14 20:36:53 +00:00
Yohei Yukawa
60fbc8e3bb Introduce SuggestionSpan#getLocaleObject().
This is a series of CLs to promote Java Locale object as a primary data
object to represent locale information in Android APIs.

With this CL, developers can get Locale information from SuggestionSpan
without semantically losing the original data.  Possible use cases would
be:
 - Emoji subtag (CLDR Ticket #9063)
 - Stable and reliable 3-letter country codes handling
 - Custom attributes based on private extensions.

Note that this CL does not change the current behavior of
SuggestionSpan#getLocale() as is, even if it is created with a malformed
Locale object:

  new SuggestionSpan(new Locale(" a ", " b c ", " e"), new String[0], 0)
          .getLocale() -> " a  b c  e".

Bug: 22858221
Change-Id: I96dfd4f819a236ee2e6dbd3e12903d1214223cb0
2016-01-14 12:16:06 -08:00
Chris Tate
16548a3ef8 Merge "Don't full-data back up apps in foreground-equivalent state" 2016-01-14 19:15:42 +00:00
Christopher Tate
63fec3ef1a Don't full-data back up apps in foreground-equivalent state
We have to kill the app and bring it up in a controlled lifecycle mode
in order to do full-data backup, and if it's e.g. playing media, this
is hugely disruptive.  Instead, we now check whether an app being
considered for full-data backup is in a user-observable state, and
defer its backup if so.  We don't kick it all the way down the
daily-backup cycle in this situation -- we set it up to retry the
backup in just a few hours.

Bug 25960428

Change-Id: I576f25c6fb07545565f59bd685624c612b9c5ffd
2016-01-14 11:03:36 -08:00
Fyodor Kupolov
4ae95e5ab9 Merge "Explicitly pass userId to getWindowToken" 2016-01-14 18:37:18 +00:00
George Mount
0f5fd2d870 Merge "Add IntDefs for Animator and Transition classes." 2016-01-14 16:21:27 +00:00
Alan Viverette
388eb91c12 Merge "Clean up CalendarView docs and annotations" 2016-01-14 16:17:26 +00:00
Alan Viverette
dbea715a1f Merge "Clean up night mode documentation" 2016-01-14 16:16:30 +00:00
Alan Viverette
4bf96caa84 Merge "Apply menu callbacks to existing Toolbar menu view" 2016-01-14 16:16:00 +00:00
Robin Lee
b68d2d5b68 Merge "Always-on app VPNs" 2016-01-14 11:37:18 +00:00
Chenjie Luo
5ffb219d80 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96 am: d5cea64d8d am: 7034a6e2d0
am: af8c1b8f94

* commit 'af8c1b8f943f2c616c75da83b44063ae3a5f556f':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
2016-01-14 06:13:43 +00:00
Chenjie Luo
af8c1b8f94 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96 am: d5cea64d8d
am: 7034a6e2d0

* commit '7034a6e2d05c45c437bef6150bcc70b58b3ccb3b':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
2016-01-14 02:34:53 +00:00
Chenjie Luo
7034a6e2d0 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96
am: d5cea64d8d

* commit 'd5cea64d8d63e9ffb61af1e669962de08ea513cc':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
2016-01-14 02:29:13 +00:00
Chenjie Luo
d5cea64d8d Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev
am: 4a577bff96

* commit '4a577bff9674f4bc748ab76bf48ac6e7d3e567cc':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
2016-01-14 02:24:48 +00:00
Dongwon Kang
1ef6a06e11 Merge "Fix javadoc related to ACTION_MEDIA_RESOURCE_GRANTED" 2016-01-14 02:16:23 +00:00
Dongwon Kang
32cb9ab5cc Fix javadoc related to ACTION_MEDIA_RESOURCE_GRANTED
This addresses comments left in If506a533c5c7b567e770217a9430bf68b539677a

Change-Id: I6f952db6a8fa246d974bab556be3e21fe1b7f3da
2016-01-13 18:11:10 -08:00
Chenjie Luo
bad498f7fd Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Bug: 25860409
Change-Id: I3f525c9c8df81807d98391c70cd2d1f8c139c8f5
2016-01-14 01:26:05 +00:00
Adam Lesinski
89a697a7e7 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev am: d2e215978b am: a5c7106017
am: 6a8c328d73

* commit '6a8c328d7386d19f4590dfbfc71338b1ec208fb7':
  UsageStats: Use new settings key idle_duration2 for app idle
2016-01-14 01:05:24 +00:00
Adam Lesinski
6a8c328d73 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev am: d2e215978b
am: a5c7106017

* commit 'a5c71060174c5357c75592998fb095e768eca8bd':
  UsageStats: Use new settings key idle_duration2 for app idle
2016-01-14 00:59:58 +00:00
Adam Lesinski
a5c7106017 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev
am: d2e215978b

* commit 'd2e215978be9df2f3d2bf56eb1c857c6a1bc420a':
  UsageStats: Use new settings key idle_duration2 for app idle
2016-01-14 00:54:10 +00:00
Adam Lesinski
d2e215978b Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev 2016-01-14 00:45:31 +00:00
Makoto Onuki
9bd64e2b88 Merge "API for blocked number provider" 2016-01-13 23:51:35 +00:00
George Mount
7764b920f2 Add IntDefs for Animator and Transition classes.
Bug 23593341

Change-Id: Ifcb30322cb90efb32262c80f5d11c2d39efc5080
2016-01-13 15:21:51 -08:00
Ian Pedowitz
46f890188c Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am: 624d43b66f am: 0cd5e9f475
am: 105108209f

* commit '105108209fc35b5029e5a728c09f6eaf91b8a940':
  Revert "Avoid drawable invalidation during draw()"
2016-01-13 23:21:05 +00:00
Ian Pedowitz
105108209f Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am: 624d43b66f
am: 0cd5e9f475

* commit '0cd5e9f475cd31535ad33a6d2151f2270bd3f29c':
  Revert "Avoid drawable invalidation during draw()"
2016-01-13 23:10:29 +00:00
Ian Pedowitz
0cd5e9f475 Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev
am: 624d43b66f

* commit '624d43b66f039e3b0f33274486512621919d96a3':
  Revert "Avoid drawable invalidation during draw()"
2016-01-13 23:01:29 +00:00
Ian Pedowitz
624d43b66f Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev 2016-01-13 22:47:45 +00:00
Yin-Chia Yeh
b99ed40fb0 Merge "Camera: cleanup dead code" 2016-01-13 21:50:02 +00:00
Alan Viverette
156bd49bdc Revert "Avoid drawable invalidation during draw()"
This reverts commit e5e59c6da4.

Drawables expect to be able to call invalidateSelf() during
draw() to pump animation frames. We shouldn't break this.

Bug: 26533725
Change-Id: Ibe2871f2622faf836637225fc1e3e6f0ca6def47
2016-01-13 21:49:10 +00:00
Samuel Tan
01208118b3 resolve merge conflicts of 3caecaec60 to master.
Change-Id: Ic3e9909c69f03a6ef1911a6b7589afbc02d7494f
2016-01-13 13:42:00 -08:00
Adam Lesinski
f0ef3c1126 UsageStats: Use new settings key idle_duration2 for app idle
Ignores the old, re-appropriated key "idle_duration" which is now
set to a high value in order to force disable app idle on devices
with bug b/26355386

Bug:26355386
Change-Id: Iff9de843ad6e547d29c1583687fc7f7ce7e15090
2016-01-13 12:48:50 -08:00
Makoto Onuki
cbd0ed2944 API for blocked number provider
Bug 26232372

Change-Id: I4d243c00ab9f02af527a96d7b549abfe7876f565
2016-01-13 12:41:54 -08:00
Sandra Kwan
f56a60fab2 Merge "AccountManager: make account session APIs SystemApi." 2016-01-13 19:46:21 +00:00
Chet Haase
f73363cf51 Merge "Make Animation.cancel() actually work" 2016-01-13 19:30:29 +00:00
Jason Monk
561e219033 Merge "Round out the QS API" 2016-01-13 19:07:33 +00:00
Alan Viverette
7a66ba9ddb Merge "Clean up lint warnings in popup menu presenter classes" 2016-01-13 18:56:24 +00:00
Alan Viverette
02cd0f9105 Clean up lint warnings in popup menu presenter classes
Change-Id: I6b4cce1c4788b408615af0c93575e02e75b4c3ca
2016-01-13 13:33:17 -05:00
Dongwon Kang
ab064b3b36 Merge "Add a way for SystemUI to receive media resource (e.g. A/V codec) usage" 2016-01-13 18:21:00 +00:00
Clara Bayarri
4fce66668e Merge "Request Keyboard Shortcuts for SysUI Dialog via Window" 2016-01-13 18:06:38 +00:00
Robert Sesek
81d867f5db Merge "Add external services, a way to run isolated processes as a different package." 2016-01-13 17:23:36 +00:00
Clara Bayarri
75e097965c Request Keyboard Shortcuts for SysUI Dialog via Window
Keyboard shortcuts are requested via WindowManager, and
the request pipes through to the view root and the window
callback.

Bug: 22405482
Change-Id: Ic0071e91c7b554be3ac9df71e9539ee8a60e822e
2016-01-13 16:56:56 +00:00
Alan Viverette
5190f1737f Apply menu callbacks to existing Toolbar menu view
Bug: 25872174
Change-Id: I44f4fad27e5e48a8ecdf0c63e135fbf566517cea
2016-01-13 11:20:26 -05:00
Chet Haase
f83464ed0a Make Animation.cancel() actually work
Cancel() has apparently never worked. Calling cancel() results
in the startTime being set to Long.MIN_VALUE. In theory, this means that
on the next animation frame (getTransformation()), the elapsed time
(currentTime - startTime) should result in a large positive number, which
is way more than needed to prove that the elapsed fraction is >1 and
therefore that the animation has ended. But in practice, anything subtracting
MIN_VALUE will result in a large negative number due to Long wraparound, so the
end check fails and the animation continues. Forever.

Moreover, event fixing the cancel issue results in a repeating animation
continuing to repeat, because the logic was never there to determine whether
a repeating animation was canceled.

This fix addresses both issues, but in a minimal way. The risk in fixing this
for real is changing the behavior of cancel in a way that existing apps would not
expect. For example, it's weird that cancel causes one more frame to run. And even weirder
that it does so with a negative elapsed duration (resulting in an animation fraction of 0).
But I wouldn't want to change that behavior for fear that I'd break apps who rely on
that weird behavior.

Instead, there's a simple check for for the "expired" check and the "repeat?" check that
sees whether the startTime has the magic value of MIN_VALUE, which should only happen
when an animation has been canceled. If this is the case, it ensures that the animation ends.
For real.

Issue #24984018 canceled animation runs forever

Change-Id: Ia137eb04bd7df3976a4d9cef86fd39a78dc56f39
2016-01-13 07:37:29 -08:00
Alan Viverette
8a77da8626 Merge "Apply tick mark tint during view construction" 2016-01-13 15:16:11 +00:00
Alan Viverette
d154a5bb8d Apply tick mark tint during view construction
...otherwise it never gets applied.

Change-Id: I06991b3cedcf3dcfb8e98ae61e3d679c35b68839
2016-01-13 10:10:22 -05:00
Alan Treadway
fd53d56e38 Merge "Add extra to control USER_SETUP_COMPLETE behavior." 2016-01-13 14:07:38 +00:00
Alan Treadway
94de8c890c Add extra to control USER_SETUP_COMPLETE behavior.
For split-user cases it has been identified that provisioning
a profile-owner during user setup-wizard shouldn't cause
the setup-wizard to exit early generally. Adding this extra
allows a DPC to control whether the user can take further steps
in the setup-wizard after management provisioning completes.

Adding as a hidden extra since we don't expect this to be useful
until after N release.

Bug: 25858670
Change-Id: I599a5df4aef659769a6323402efe078d0d12d2ed
2016-01-13 12:49:23 +00:00
Clara Bayarri
a1771110d6 Create Work Challenge per-user condition
Change the current static condition to a per-user condition so we
can check and enable/disable the work challenge properly. Also add
an isAllowed API, as the Work Challenge can only be used when the
user's DPC targets N or above to maintain backwards compatibility.

Change-Id: I0cb8b475838816801868ffb24726407aa257b4de
2016-01-13 10:27:12 +00:00