Commit Graph

60862 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Andreas Gampe
33df0daace Merge "Frameworks/base: Fix LineBreakBufferedWriter" into nyc-dev
am: e610e288cd

* commit 'e610e288cd126af44c009f8b5fcd46a348239e73':
  Frameworks/base: Fix LineBreakBufferedWriter
2016-02-11 17:06:32 +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
Andreas Gampe
e610e288cd Merge "Frameworks/base: Fix LineBreakBufferedWriter" into nyc-dev 2016-02-11 16:26:19 +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
shwetachahar
4bad4fa152 Remove higher speech rate settings.
Higher speech rate setting used to increase the max text to speech output
rate to 6x from the default 4x. The default max speech rate is now
set to 6x, thereby, rendering the higher speech rate setting irrelevant.

Bug:24527715
Change-Id: I3777e63e6ddff797c18bf17fcefa3e262ea822d1
2016-02-11 14:59:33 +00:00
phweiss
e9c440638e DPM.createAndManageUser should work even with DISALLOW_ADD_USER set
For this, the DPM calls a new function
UserManagerInternal.createUserEvenWhenDisallowed() instead of
UserManager.createUser(). This calls
UserManagerService.createUserInternalUnchecked().

Also, only the system user is allowed to call this method, otherwise
a security exception is thrown.

Bug: 26952210
Bug: 26786199
Change-Id: I69c16354898d68592d13f5f53b840551f7ad4779
2016-02-11 14:43:18 +01:00
Wale Ogunwale
d829d36f09 Force pre-N apps to be resizeable.
We feel this experience is better than the 2-finger gesture.
Added ActivityInfo.RESIZE_MODE_FORCE_RESIZEABLE resizeMode
to indicate we are force resizing an app.

Bug: 27132829
Bug: 26847884
Change-Id: I65db2de0d9f3f171cc3bb136cc1282b3ef3549b0
2016-02-11 05:02:14 -08:00
Daniel U
8779c792ca Tweak toHtml() paragraph conversion behavior
am: 4a70f09e39

* commit '4a70f09e39ac7c5f57b0f6dd44475641c68afafd':
  Tweak toHtml() paragraph conversion behavior
2016-02-11 12:18:38 +00:00
Daniel U
4a70f09e39 Tweak toHtml() paragraph conversion behavior
For mode TO_HTML_PARAGRAPH_LINES_INDIVIDUAL:
1) Empty line outputs <br> instead of <p><br></p>

2) A <ul> element is closed if it is followed by a <br>

3) Explicit zero vertical margin is applied to <ul> instead of <li>'s

4) More deterministic way to encode AlignmentSpans: only spans with
   SPAN_PARAGRAPH flag is used. If multiple spans exist, the last one
   (which is added most recently) is used.

BUG: 26224878
Change-Id: I86a2aeced9965ae465daac1ace64e5e41cf45caf
2016-02-11 12:11:44 +00:00
Daniel U
62b0f47643 Merge "Handle <span>, <ul>, and <li> tags in fromHtml()" into nyc-dev
am: 1914dc60c9

* commit '1914dc60c92111d04f7ad43bd388b195f4373749':
  Handle <span>, <ul>, and <li> tags in fromHtml()
2016-02-11 11:58:10 +00:00
Daniel U
1914dc60c9 Merge "Handle <span>, <ul>, and <li> tags in fromHtml()" into nyc-dev 2016-02-11 11:54:32 +00:00
Michal Karpinski
17ae75883b Log strength of auth method used into security log
am: ed5c8f0216

* commit 'ed5c8f0216bf97e896936e2a2e24fc3fb18303a1':
  Log strength of auth method used into security log
2016-02-11 11:05:43 +00:00
Michal Karpinski
ed5c8f0216 Log strength of auth method used into security log
As approved by Android Security team, added logging of
strength of auth method as well as logging of fingerprint
keyguard actions.

Bug: 26841997
Change-Id: Ic8e3f125f775a7585fe56003f4c6442390edea61
2016-02-11 10:36:56 +00:00
Selim Cinek
cc10bfbaaa Added support for media notifications without expanded state
Bug: 26837953
Change-Id: I9fcf56013c44a2420367ef0a908dc45992c8a766
2016-02-10 20:27:53 -08:00
Doris Liu
31f048ce61 VectorDrawable native rendering - Step 5 of MANY
am: 18bdf443e3

* commit '18bdf443e371e9f293439b4ff92cc79abaa422e5':
  VectorDrawable native rendering - Step 5 of MANY
2016-02-11 01:32:50 +00:00
Doris Liu
18bdf443e3 VectorDrawable native rendering - Step 5 of MANY
Implemented reset() (public API for AVD)
and reverse() (internal API that needs to be supported)

Change-Id: Ife1650049f271cad1347943151a5800c40c20aa2
2016-02-11 01:08:47 +00:00
Raph Levien
b68d147b86 Allow null string to BidiFormatter#unicodeWrap
The BidiFormatter#unicodeWrap() methods allow null string, but the
toString() call on the result in the refactored code was crashing.
Also adds @Nullable annotations.

Bug: 27124532
Change-Id: I25922d104587af4a850c3640987af9315c3d3bde
2016-02-10 17:00:22 -08:00