Commit Graph

60928 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
Makoto Onuki
f56aa71b9f Merge "Don\'t allow deactivating DAs when the user is not unlocked" into nyc-dev
am: dafec11e69

* commit 'dafec11e698daf054730cfb04db64f3e31a0c9ff':
  Don't allow deactivating DAs when the user is not unlocked
2016-02-16 20:53:03 +00:00
Makoto Onuki
dafec11e69 Merge "Don't allow deactivating DAs when the user is not unlocked" into nyc-dev 2016-02-16 20:47:10 +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
Alan Viverette
d4e589365d Merge "Force uniform width for MATCH_PARENT in AlertDialogLayout" into nyc-dev
am: f8872b0a37

* commit 'f8872b0a37024c78dbfcf6f19d63c9555eec4709':
  Force uniform width for MATCH_PARENT in AlertDialogLayout
2016-02-16 19:11:53 +00:00
Alan Viverette
60d9695bb8 Force uniform width for MATCH_PARENT in AlertDialogLayout
The initial layout passes run using whatever was specified by the
parent, which ensures that TOO_SMALL will get set correctly when
needed. The final layout pass runs as EXACTLY to ensure that
MATCH_PARENT widths are correctly set.

Bug: 27030200
Change-Id: Ia7af3f75746e725761e78e7c4eefb0b31f499113
2016-02-16 18:07:32 +00: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
Jeff Sharkey
ba05b1ecb0 Merge "Disable StrictMode when starting activity." into nyc-dev
am: a3331309a9

* commit 'a3331309a9f29cf4e3676b1a6a230148eaf04fe1':
  Disable StrictMode when starting activity.
2016-02-16 17:00:06 +00:00
Tao Bao
a3d0d0cf5d Merge "BootReceiver: Stop using SharedPreferences." into nyc-dev
am: 1256ab6734

* commit '1256ab67349e88bb985900b986a3833fae2dab18':
  BootReceiver: Stop using SharedPreferences.
2016-02-16 16:58:31 +00:00
Jeff Sharkey
a3331309a9 Merge "Disable StrictMode when starting activity." into nyc-dev 2016-02-16 16:47:48 +00:00
Tao Bao
1256ab6734 Merge "BootReceiver: Stop using SharedPreferences." into nyc-dev 2016-02-16 16:46:54 +00:00
Yohei Yukawa
78eced727a Merge changes I0f79243e,Ia27e19f9,Iec6b89f0,I276c7eb0 into nyc-dev
am: ce3f338040

* commit 'ce3f338040894f23cdea7ac2f9e9e14a58fd15a3':
  Have unified setter/getter for Secure Settings.
  Remove redundant arguments.
  Use Context#getSystemService(Class<T>) in IMMS.
  Use Java7 diamond operator in InputMethodUtils.
2016-02-16 16:24:04 +00:00
Jeff Sharkey
2b9eb89aed Disable StrictMode when starting activity.
Since intents can come in from older apps, don't let them crash us
by including file:// Uris.  This narrows the relaxation to only apply
when starting the requested intent.

Bug: 27070755
Change-Id: Ifcf9068424e072f52758c8feeab5fbf23d678a2e
2016-02-16 09:21:53 -07:00
Yohei Yukawa
ce3f338040 Merge changes I0f79243e,Ia27e19f9,Iec6b89f0,I276c7eb0 into nyc-dev
* changes:
  Have unified setter/getter for Secure Settings.
  Remove redundant arguments.
  Use Context#getSystemService(Class<T>) in IMMS.
  Use Java7 diamond operator in InputMethodUtils.
2016-02-16 16:11:50 +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
Tao Bao
8b231a96a1 BootReceiver: Stop using SharedPreferences.
BootReceiver was using SharedPreferences to record the timestamp that a
log file was lastly added to the dropbox. It no longer works after the
cleanup of the ContextImpl, because Context storage APIs are designed
for app data storage (as opposed to the system server). This CL switches
to writing its own xml file instead (/data/system/log-files.xml).

Bug: 26966507
Change-Id: Ife6b7544a7636b37dd239f059d1ca8c9c28f81a3
2016-02-15 14:31:56 -08: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
Yohei Yukawa
8752367042 Have unified setter/getter for Secure Settings.
In order to make InputMethodManagerService encryption-aware, we are
going to introduce a new state where any read/write access to Secure
Settings from IMMS is virtualized so that we can temporarily enable
only encryption-aware IMEs until the user unlocks the device then revert
any changes made before the device enters into an unlocked state.

To do that, it would be convenient if InputMethodUtils has unified
getter/setter methods to access (Secure) settings.  In subsequent CLs we
will rely on those getter/setter methods to switch between the on-memory
data store and the actual Secure Settings.  Note that because of
multi-user support such a switch can occur multiple times.

This is still a preparation code.  Behavior change is not intended yet
in this CL.

Bug: 26279466
Change-Id: I0f79243e5cc1556764da37fa38078e075a27d42b
2016-02-12 19:37:08 -08: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
Makoto Onuki
1a5ee776ee Don't allow deactivating DAs when the user is not unlocked
Bug 27149570

Change-Id: I772d9cbd6edc822c8f7b1988905b702e05e674cd
2016-02-12 16:04:42 -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
Adam Powell
94cf50d1f5 Merge "ChooserActivity direct share jank fixes" into nyc-dev
am: 5e6d6f5824

* commit '5e6d6f5824bf194e5466797c7ff741de5b8e49fb':
  ChooserActivity direct share jank fixes
2016-02-12 21:22:18 +00:00
Adam Powell
5e6d6f5824 Merge "ChooserActivity direct share jank fixes" into nyc-dev 2016-02-12 21:14:39 +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
Jorim Jaggi
0c1edad116 Fix layout for full-screen floating windows
am: 9f6798a936

* commit '9f6798a9367cc6134f956c422107361db43c4212':
  Fix layout for full-screen floating windows
2016-02-12 19:33:41 +00:00
Jorim Jaggi
9f6798a936 Fix layout for full-screen floating windows
When the app doesn't set IN_SCREEN and INSET_DECOR but the window is
still full-screen, we force SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN but then
we still need to communicate the content insets to the DecorView.

In DecorView, we consume these insets in this mode and set it as
layout params so this behavior is completely transparent for the
app.

Bug: 26464646
Change-Id: Ib7332b845767a5bbc0266c380bf6240e322db943
2016-02-12 19:31:07 +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