Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
233,264 Commits 3 Branches 0 Tags
daa08de37fb25cf929f1c4e2fbc1198a4d5ca2b7
Commit Graph

55592 Commits

Author SHA1 Message Date
Selim Gurun
daa08de37f Merge "Better document the ignore behavior for client cert api" into nyc-dev 
am: e542c490e1

* commit 'e542c490e1072cf02f9ae890faea079dea4e030e':
  Better document the ignore behavior for client cert api
 2016-02-16 22:29:58 +00:00
Selim Gurun
e542c490e1 Merge "Better document the ignore behavior for client cert api" into nyc-dev 2016-02-16 22:17:42 +00:00
George Mount
eab074ac05 Merge "Fix TransitionSet javadoc to use transitionOrdering attribute." into nyc-dev 
am: c47738d8c2

* commit 'c47738d8c22ae09cd93096888def0cf33f39d285':
  Fix TransitionSet javadoc to use transitionOrdering attribute.
 2016-02-16 21:53:49 +00:00
George Mount
eb0dee95d9 Merge "Don\'t use forceVisibility for Activity Transitions." into nyc-dev 
am: d6505566a9

* commit 'd6505566a9bc606e84619a7b7a801557e795f1df':
  Don't use forceVisibility for Activity Transitions.
 2016-02-16 21:52:38 +00:00
George Mount
c47738d8c2 Merge "Fix TransitionSet javadoc to use transitionOrdering attribute." into nyc-dev 2016-02-16 21:38:02 +00:00
George Mount
d6505566a9 Merge "Don't use forceVisibility for Activity Transitions." into nyc-dev 2016-02-16 21:37:39 +00:00
Selim Gurun
977d943494 Better document the ignore behavior for client cert api 
Bug: 26361557

When the embedded app requests a ignore of a client cert request,
webview does not cache the response of the app. However, underlying
layers could. Clarify the document.

Change-Id: I43e6a4c91727f71c88ca69e1334f64de9f66905a
 2016-02-16 12:30:08 -08:00
Wale Ogunwale
933b668859 Merge "Force resize pre-N apps that don\'t have fixed orientation." into nyc-dev 
am: b305e16051

* commit 'b305e16051192540e2e19863d4c3c0fb3e980db2':
  Force resize pre-N apps that don't have fixed orientation.
 2016-02-16 18:00:24 +00:00
Wale Ogunwale
b305e16051 Merge "Force resize pre-N apps that don't have fixed orientation." into nyc-dev 2016-02-16 17:54:33 +00:00
George Mount
a096e57ef5 Merge "Null check for fade start alpha value." into nyc-dev 
am: 21eb4e2684

* commit '21eb4e2684e8490deedab002dd2b867b6d35147a':
  Null check for fade start alpha value.
 2016-02-16 15:26:51 +00:00
George Mount
21eb4e2684 Merge "Null check for fade start alpha value." into nyc-dev 2016-02-16 15:20:43 +00:00
Wale Ogunwale
508ff55e8c Force resize pre-N apps that don't have fixed orientation. 
We were previously only doing it for SCREEN_ORIENTATION_UNSPECIFIED,
but there are other orientation settings that aren't fixed that we
need to handle.

Change-Id: If21fcd8312b6267407d94b6646158ac6eae44b44
 2016-02-15 19:31:50 -08:00
Jeff Sharkey
1cac868cb2 Merge "Add path cache to avoid SharedPreferences jank." into nyc-dev 
am: 3104a9ffd6

* commit '3104a9ffd61ed04946a405e0fc78e3904366e35e':
  Add path cache to avoid SharedPreferences jank.
 2016-02-16 01:49:28 +00:00
Jeff Sharkey
3104a9ffd6 Merge "Add path cache to avoid SharedPreferences jank." into nyc-dev 2016-02-16 01:38:05 +00:00
Jeff Sharkey
be78258e55 Add path cache to avoid SharedPreferences jank. 
The old getSharedPreferences() API had a side-effect behavior that
subsequent calls wouldn't touch disk if there was a cache hit.  Now
that we're using File as the cache key, we were generating the path
every time, which resulted in touching disk.

To bring back the old behavior, let's add yet another cache!

Bug: 26979210
Change-Id: Ib8346c6f69ae25f8f164e3b7e05bc6358de38906
 2016-02-15 18:36:01 -07:00
Jeff Sharkey
c0681ba3c7 Merge "Add feature versions for devices and apps." into nyc-dev 
am: 9c6d9753a0

* commit '9c6d9753a0f1651c639fe8158b86a1f7ffc3f60a':
  Add feature versions for devices and apps.
 2016-02-16 00:53:15 +00:00
Jeff Sharkey
9c6d9753a0 Merge "Add feature versions for devices and apps." into nyc-dev 2016-02-16 00:47:49 +00:00
Jeff Sharkey
115d2c189a Add feature versions for devices and apps. 
We're starting to see more instances of device features that will
increment separately from the SDK API level, such as camera HAL,
GPU capabilities, Bluetooth, and other hardware standards.

This change adds the ability for device features to specify a
version, which is defined to be backwards compatible.  That is, apps
requesting an older version of a feature must continue working on
devices with a newer version of that same feature.

When a version is undefined, we assume the default version "0".

Bug: 27162500
Change-Id: If890bf3f3dbb715e8feb80e7059a0d65618482ea
 2016-02-15 17:45:42 -07:00
Jeff Sharkey
1dd0b14f1d Explicitly chmod() for compatibility. 
am: 46ed6f4bd6

* commit '46ed6f4bd6d28a1319a90eb7c58dca5c20b36670':
  Explicitly chmod() for compatibility.
 2016-02-15 21:27:06 +00:00
Jeff Sharkey
46ed6f4bd6 Explicitly chmod() for compatibility. 
Apps typically have a umask() that prevents the mkdir() from setting
the requested permissions.

Bug: 27116987
Change-Id: Ia14e7e31531328ab36e902a864b3d2891feec544
 2016-02-15 14:16:10 -07:00
Nicolas Prévot
2da7b6ebdb Merge "Allow privileged apps to set the organization color." into nyc-dev 
am: eff90bd5ff

* commit 'eff90bd5ff6bd50325149a5010183277bd76f4c6':
  Allow privileged apps to set the organization color.
 2016-02-15 10:51:42 +00:00
Nicolas Prévot
eff90bd5ff Merge "Allow privileged apps to set the organization color." into nyc-dev 2016-02-15 10:47:41 +00:00
Vladislav Kaznacheev
b40130134c Merge "Update pointer icon when View.setPointerIcon is called" into nyc-dev 
am: 477243b058

* commit '477243b058bbc303bea6ba3aab445fd82a9f9155':
  Update pointer icon when View.setPointerIcon is called
 2016-02-13 02:11:50 +00:00
Vladislav Kaznacheev
989b58a633 Update pointer icon when View.setPointerIcon is called 
Currently the updated pointer icon is only displayed after
the next mouse move.

Bug:27107871
Change-Id: Ieed57b07fe44699735179cf57968a9bb08981396
 2016-02-12 16:55:53 -08:00
John Reck
b707ce7837 Merge "Include containing window title in SurfaceView\'s title" into nyc-dev 
am: 182bd38430

* commit '182bd384304c7b96b197298e5bc866858da01bf4':
  Include containing window title in SurfaceView's title
 2016-02-12 22:30:54 +00:00
John Reck
182bd38430 Merge "Include containing window title in SurfaceView's title" into nyc-dev 2016-02-12 22:24:01 +00:00
Aurimas Liutikas
f878fdd68a Merge "Start saving iconified state of SearchView." into nyc-dev 
am: 3043c7b19d

* commit '3043c7b19d873fdeb578fe84b003162fc85f923e':
  Start saving iconified state of SearchView.
 2016-02-12 21:06:12 +00:00
Aurimas Liutikas
3043c7b19d Merge "Start saving iconified state of SearchView." into nyc-dev 2016-02-12 20:58:05 +00:00
Julia Reynolds
acfdf4b6ee Merge "Show topic settings inline if user has configured topics." into nyc-dev 
am: 597c6d8c5d

* commit '597c6d8c5de14340550313607d0925b8ee40fea9':
  Show topic settings inline if user has configured topics.
 2016-02-12 20:40:37 +00:00
Julia Reynolds
597c6d8c5d Merge "Show topic settings inline if user has configured topics." into nyc-dev 2016-02-12 20:31:55 +00:00
Adrian Roos
f86c39d1d7 Add setting for allowing remote input from keyguard 
am: 3aec638a7b

* commit '3aec638a7b7f7200f7c82bca527e6aec75440d82':
  Add setting for allowing remote input from keyguard
 2016-02-12 19:02:16 +00:00
Adrian Roos
3aec638a7b Add setting for allowing remote input from keyguard 
Bug: 26440855
Change-Id: I539b1c7ee6a874283df1104fe0743ef0495f9510
 2016-02-12 18:54:58 +00:00
Amith Yamasani
f2c5157919 Merge "onAccountsUpdated shouldn\'t be called back after listener unregistered" 
am: b96673847a

* commit 'b96673847a4680c384b7335df37affc0bba36f3f':
  onAccountsUpdated shouldn't be called back after listener unregistered
 2016-02-12 17:58:47 +00:00
Amith Yamasani
b96673847a Merge "onAccountsUpdated shouldn't be called back after listener unregistered" 2016-02-12 17:50:17 +00:00
Julia Reynolds
fec58c263c Show topic settings inline if user has configured topics. 
Change-Id: Icf51faad61b3ae4261991691a1d679b190ea712a
 2016-02-12 11:42:02 -05: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
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
Nicolas Prevot
8f7698aaf6 Allow privileged apps to set the organization color. 
BUG:26923835
Change-Id: I97b0cbbc0d4fb9e9ca0e3d335a9d15eb5a1f9602
 2016-02-12 10:23:32 +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