Commit Graph

55596 Commits

Author SHA1 Message Date
Kenny Guy
15f6de3dd2 Merge "Support FBE for managed profiles." into nyc-dev am: 716a9e1892
am: 86dd0f2a9b

* commit '86dd0f2a9b907f2f8a9cdce2fc7f052916778cd7':
  Support FBE for managed profiles.
2016-02-12 15:10:00 +00:00
Kenny Guy
86dd0f2a9b Merge "Support FBE for managed profiles." into nyc-dev
am: 716a9e1892

* commit '716a9e189297beba9e2205a335614e1750b9fdd4':
  Support FBE for managed profiles.
2016-02-12 15:07:08 +00:00
Kenny Guy
b1b302660c Support FBE for managed profiles.
Allow launcher to see and attempt to launch non-crypto
aware application when profile is locked.
Hide unlock notification until parent user is unlocked.
Have unlock notitication use confirm credentials to unlock
the profile.
Updated notification strings as per suggestions in mocks
to make it clearer between users and profiles.

Bug: 27038260

Change-Id: If2d2c8148670d814544f4edd44193d15da32a289
2016-02-12 14:29:37 +00:00
Clara Bayarri
c1a258c813 Merge "Add support for current failed lock attempts and max attempts" into nyc-dev am: 29b13190cd
am: ecc95de0f3

* commit 'ecc95de0f33aa3e63d34ed0cd3fc4597b04c93be':
  Add support for current failed lock attempts and max attempts
2016-02-12 14:04:13 +00:00
Clara Bayarri
ecc95de0f3 Merge "Add support for current failed lock attempts and max attempts" into nyc-dev
am: 29b13190cd

* commit '29b13190cd57bd823eb803f6fca03f671a32a5fe':
  Add support for current failed lock attempts and max attempts
2016-02-12 14:00:41 +00:00
Clara Bayarri
29b13190cd Merge "Add support for current failed lock attempts and max attempts" into nyc-dev 2016-02-12 13:54:10 +00:00
Clara Bayarri
51e41ad887 Add support for current failed lock attempts and max attempts
This is needed from Settings to show a message informing the user
of the number of attempts before their work profile gets wiped
when using ConfirmDeviceCredentials.

Bug: 26677759
Change-Id: I4b16f7dc2f415d0ce0215a3b7a646f98fabece33
2016-02-12 13:50:43 +00:00
Daniel U
7dacfc8b18 Merge "Adopt HTML/CSS color values in fromHtml()" into nyc-dev am: 43bb0a0643
am: 02a87c17c2

* commit '02a87c17c2bf5c67088c2960a072db7331c37309':
  Adopt HTML/CSS color values in fromHtml()
2016-02-12 11:32:25 +00:00
Daniel U
02a87c17c2 Merge "Adopt HTML/CSS color values in fromHtml()" into nyc-dev
am: 43bb0a0643

* commit '43bb0a06434425555a869075f8f27dfc64548de0':
  Adopt HTML/CSS color values in fromHtml()
2016-02-12 11:29:12 +00:00
Shweta Chahar
8328d11896 Merge "Remove higher speech rate settings." into nyc-dev am: 239f248280
am: f43bddb87f

* commit 'f43bddb87f26f5079ebed3b4195595c8576ac335':
  Remove higher speech rate settings.
2016-02-12 11:25:00 +00:00
Daniel U
43bb0a0643 Merge "Adopt HTML/CSS color values in fromHtml()" into nyc-dev 2016-02-12 11:24:56 +00:00
Shweta Chahar
f43bddb87f Merge "Remove higher speech rate settings." into nyc-dev
am: 239f248280

* commit '239f248280f0d44e2cfd1279baa0819633a36156':
  Remove higher speech rate settings.
2016-02-12 11:22:24 +00:00
Shweta Chahar
239f248280 Merge "Remove higher speech rate settings." into nyc-dev 2016-02-12 11:18:33 +00:00
Gustav Sennton
5409017a26 Merge "Move current WebView provider from Settings.Secure to Settings.Global" into nyc-dev am: 7a002a215d
am: 2c952b18e4

* commit '2c952b18e47049a0fbc98fc3eb5f2d790dcd075e':
  Move current WebView provider from Settings.Secure to Settings.Global
2016-02-12 10:41:25 +00:00
Gustav Sennton
2c952b18e4 Merge "Move current WebView provider from Settings.Secure to Settings.Global" into nyc-dev
am: 7a002a215d

* commit '7a002a215db498d232100c0b227d145244a03412':
  Move current WebView provider from Settings.Secure to Settings.Global
2016-02-12 10:38:44 +00:00
Gustav Sennton
7a002a215d Merge "Move current WebView provider from Settings.Secure to Settings.Global" into nyc-dev 2016-02-12 10:35:24 +00:00
Jorim Jaggi
736593e765 Merge "Handle light status bar for split-screen" into nyc-dev am: e26334ba1a
am: aa836177c3

* commit 'aa836177c3c9a0eeef5d3419220693af48a1eb5e':
  Handle light status bar for split-screen
2016-02-12 03:21:18 +00:00
Jorim Jaggi
aa836177c3 Merge "Handle light status bar for split-screen" into nyc-dev
am: e26334ba1a

* commit 'e26334ba1a5c7880c67b931a6ca73941167712e9':
  Handle light status bar for split-screen
2016-02-12 03:16:54 +00:00
Jorim Jaggi
e26334ba1a Merge "Handle light status bar for split-screen" into nyc-dev 2016-02-12 03:12:18 +00:00
Dianne Hackborn
f1c710b6ef Merge "Add separate information about user whitelist." 2016-02-12 01:14:28 +00:00
Winson Chung
b8a40f1331 Merge changes If90955f4,I9fa48c06,Ib4681a43 into nyc-dev am: 34f5c494df
am: be0537a4e1

* commit 'be0537a4e133d29848efd2458acf12f995a5823b':
  Adding view debug annotations to simplifying debugging state.
  Disallow launching third party apps in safe mode.
  Drawing thumbnail background color for empty space in view.
2016-02-12 01:08:38 +00:00
Tomasz Mikolajewski
5264dd8940 Merge "Fix arguments order in DocumentsContract.moveDocument()." into nyc-dev am: 1f0c3f04a7
am: 27e5757786

* commit '27e57577860d3dd5fc03206b5b2a8e3b9743576a':
  Fix arguments order in DocumentsContract.moveDocument().
2016-02-12 01:07:29 +00:00
Winson Chung
be0537a4e1 Merge changes If90955f4,I9fa48c06,Ib4681a43 into nyc-dev
am: 34f5c494df

* commit '34f5c494df827c6f757cbfd50cb61b43e222f80e':
  Adding view debug annotations to simplifying debugging state.
  Disallow launching third party apps in safe mode.
  Drawing thumbnail background color for empty space in view.
2016-02-12 00:36:15 +00:00
Tomasz Mikolajewski
27e5757786 Merge "Fix arguments order in DocumentsContract.moveDocument()." into nyc-dev
am: 1f0c3f04a7

* commit '1f0c3f04a79d2f5c38a3c2ca318cab98e656f848':
  Fix arguments order in DocumentsContract.moveDocument().
2016-02-12 00:35:09 +00:00
Winson Chung
34f5c494df Merge changes If90955f4,I9fa48c06,Ib4681a43 into nyc-dev
* changes:
  Adding view debug annotations to simplifying debugging state.
  Disallow launching third party apps in safe mode.
  Drawing thumbnail background color for empty space in view.
2016-02-12 00:29:43 +00:00
Tomasz Mikolajewski
1f0c3f04a7 Merge "Fix arguments order in DocumentsContract.moveDocument()." into nyc-dev 2016-02-12 00:26:45 +00:00
Dianne Hackborn
190f2cb720 Add separate information about user whitelist.
Use this in the alarm manager to allow user whitelisted apps
to have free access to scheduling alarms.

Coming next: lifting sync/job restrictions.

Change-Id: Ib36bd811f866c7af43845edf051e7972397cea22
2016-02-11 16:23:04 -08:00
Phil Weaver
e49126b0ff Merge "Fix ViewPager crash for a11y z order." into nyc-dev am: fd32b894ff
am: eaebd8be72

* commit 'eaebd8be7226301b532f3e1ab49129266332ce50':
  Fix ViewPager crash for a11y z order.
2016-02-11 21:30:38 +00:00
Phil Weaver
eaebd8be72 Merge "Fix ViewPager crash for a11y z order." into nyc-dev
am: fd32b894ff

* commit 'fd32b894ff42fc20b373410b66ae924287537c47':
  Fix ViewPager crash for a11y z order.
2016-02-11 21:23:56 +00:00
Phil Weaver
fd32b894ff Merge "Fix ViewPager crash for a11y z order." into nyc-dev 2016-02-11 20:58:31 +00:00
Dianne Hackborn
b39ee5ed8e Merge "Implement transient extras for jobs." 2016-02-11 20:54:53 +00:00
Jorim Jaggi
8690558241 Handle light status bar for split-screen
In split-screen the light status bar flag for one side of the
status bar can be different from the other side.
SYSTEM_UI_FLAG_LIGHT_STATUS_BAR is now reported for both
the fullscreen stack and docked stack, but not anymore in the
"default" SysUI visibility field when reporting a visibility
change to SystemUI. The change also reports the docked stack
and the fullscreen stack bounds, so SystemUI can guard tinting
the icons on whether the icon is one of the areas.

When calculating the light status bar flag in PWM, we keep track
of the top fullscreen opaque window state for the docked and
fullscreen stack separately.

Bug: 24365214
Change-Id: Id2240a86d75bf96e0138ec7652a4793859f56e3c
2016-02-11 12:18:40 -08:00
Selim Cinek
afaaf427da Merge "Added support for media notifications without expanded state" into nyc-dev
am: 635f71925a

* commit '635f71925a065b155b2c6ca8851f15fa9c185422':
  Added support for media notifications without expanded state
2016-02-11 19:53:45 +00:00
Winson Chung
1af8eda6ea Drawing thumbnail background color for empty space in view.
Change-Id: I2e8dfbe9c11a61876956658eff0674adb26d855d

Signed-off-by: Winson <winsonc@google.com>
2016-02-11 11:48:33 -08:00
Selim Cinek
635f71925a Merge "Added support for media notifications without expanded state" into nyc-dev 2016-02-11 19:37:50 +00:00
Dianne Hackborn
ba60473a65 Implement transient extras for jobs.
You can now associate an arbitrary Bundle of extras with a job,
as long as the job is not persisted.

Also implement deep-copy of Bundle.

Change-Id: I7890d627492b664d9b1f039e8cb82f8868de7be3
2016-02-11 11:28:48 -08:00
Wale Ogunwale
08e5edac00 Merge "Force pre-N apps to be resizeable." into nyc-dev
am: 567704bca2

* commit '567704bca22c08a6fbfdaa15d054e0e3124b38e8':
  Force pre-N apps to be resizeable.
2016-02-11 19:11:37 +00:00
Jeremy Joslin
16060eb6f0 Merge "Send explicit broadcasts when the scorer changes." into nyc-dev
am: 7df8356724

* commit '7df8356724efde8af5e280a0a57f7fbe39169aaa':
  Send explicit broadcasts when the scorer changes.
2016-02-11 19:09:27 +00:00
Wale Ogunwale
567704bca2 Merge "Force pre-N apps to be resizeable." into nyc-dev 2016-02-11 18:55:50 +00:00
Jeremy Joslin
7df8356724 Merge "Send explicit broadcasts when the scorer changes." into nyc-dev 2016-02-11 18:55:38 +00:00
Raph Levien
2ca1d4e4e4 Merge "Allow null string to BidiFormatter#unicodeWrap" into nyc-dev
am: 7004c4407f

* commit '7004c4407f0c76bd41d19cd6a2eb867437228ee9':
  Allow null string to BidiFormatter#unicodeWrap
2016-02-11 18:39:21 +00:00
Raph Levien
7004c4407f Merge "Allow null string to BidiFormatter#unicodeWrap" into nyc-dev 2016-02-11 18:35:36 +00:00
Daniel U
1eab97ac8e Adopt HTML/CSS color values in fromHtml()
- "green", "gray/grey", "lightgray/lightgrey", and
  "darkgray/darkgrey" have different values in HTML/CSS.

- Adopt HTML/CSS color values according to user specified
  option flag.

- Remove support to "@color" notation as it is not standard
  HTML/CSS.

- Replace SPAN_MARK_MARK with SPAN_INCLUSIVE_EXCLUSIVE
  consistency.

BUG:26950749
Change-Id: I5b33282368042f74f1b4768e096aae3e5bf45de6
2016-02-11 18:32:30 +00:00
Gustav Sennton
14c033c76b Move current WebView provider from Settings.Secure to Settings.Global
The current WebView provider is not user-specific and should therefore
be stored as a Global rather than a Secure setting.

Also do some code cleaning including a fix in WebViewProviderInfo to
always fetch up-to-date information about whether a webview
implementation package is enabled.

Bug: 27142972
Change-Id: I4d4b8fca775e97980fb5c34313be6d82472e7d33
2016-02-11 18:19:39 +00:00
Philipp Weiß
38d8cd366e Merge "DPM.createAndManageUser should work even with DISALLOW_ADD_USER set" into nyc-dev
am: 09f8568059

* commit '09f856805902078931aa5de006bc5e2c5403dfa6':
  DPM.createAndManageUser should work even with DISALLOW_ADD_USER set
2016-02-11 17:28:44 +00:00
Philipp Weiß
09f8568059 Merge "DPM.createAndManageUser should work even with DISALLOW_ADD_USER set" into nyc-dev 2016-02-11 17:17:39 +00:00
John Reck
54871d55c2 Merge "Revert "VectorDrawable native rendering - Step 5 of MANY"" into nyc-dev
am: 45242f7125

* commit '45242f7125aef9059e8d258ba91d85fa624d15eb':
  Revert "VectorDrawable native rendering - Step 5 of MANY"
2016-02-11 17:12:52 +00:00
John Reck
45242f7125 Merge "Revert "VectorDrawable native rendering - Step 5 of MANY"" into nyc-dev 2016-02-11 17:02:48 +00:00
John Reck
e03ef25a3e Revert "VectorDrawable native rendering - Step 5 of MANY"
Bug: 27136799

This reverts commit 18bdf443e3.

Change-Id: I825b061eec2a591f2d18119ba64494624b9ad4f2
2016-02-11 17:02:33 +00:00
Jeremy Joslin
da11f5cdf5 Send explicit broadcasts when the scorer changes.
When the scorer is changed send a targeted broadcast to the previous
scorer (if any) and then a targeted broadcast to the new scorer.

BUG:26815773
Change-Id: If28414f4373a531b10f581ecd096cbc27a7318a4
2016-02-11 07:15:44 -08:00