Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,089 Commits 3 Branches 0 Tags
37950b034ae085fd4cc623a02b6d33bd562ff815
Commit Graph

53184 Commits

Author SHA1 Message Date
Benjamin Franz
37950b034a am dbc86ad1: Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev 
* commit 'dbc86ad170e2c288f0154a264d12bd6dadf78c45':
  Update documentation for PASSWORD_QUALITY_SOMETHING
 2015-06-16 13:32:46 +00:00
Benjamin Franz
dbc86ad170 Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev 2015-06-16 13:22:22 +00:00
Abodunrinwa Toki
722890a9c9 am 6161c5b4: Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev 
* commit '6161c5b4cd54036bc4f38455a0c7c11b8201e4a0':
  Floating toolbar no longer obstructs the soft keyboard.
 2015-06-16 12:37:29 +00:00
Abodunrinwa Toki
6161c5b4cd Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev 2015-06-16 12:29:55 +00:00
Narayan Kamath
c355d30ee1 am 275294db: Merge "Better systrace slices for application startup." into mnc-dev 
* commit '275294dbce30eb1f9ef4847d0f9c3d6b602de06c':
  Better systrace slices for application startup.
 2015-06-16 12:02:35 +00:00
Narayan Kamath
275294dbce Merge "Better systrace slices for application startup." into mnc-dev 2015-06-16 11:50:57 +00:00
Paul Jensen
5d3d3553c5 am 19769114: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev 
* commit '19769114b48152efa57527574ee533c8e33db703':
  Remove dead hidden ConnectivityManager and NetworkInfo APIs.
 2015-06-16 11:38:18 +00:00
Paul Jensen
19769114b4 Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev 2015-06-16 11:30:51 +00:00
Narayan Kamath
fbb32f6440 Better systrace slices for application startup. 
This change adds three new timeslices :

- PostFork : As soon as possible after the app forks from the
  zygote. Can be used in conjunction with the system_server
  "Start proc:" event to derive an upper bound on fork() and
  zygote overhead.

- RuntimeInit & ActivityThreadMain for ZygoteInit#runtimeInit
  and ActivityThread#main.

ActivityThread#handleBindApplication and higher level functions
are already well instrumented in systrace. handleBindApplication
should occur immediately after ActivityThread#main.

Note that we use the Activity manager tag to make it easier to
correlate these new events with surrounding events (Start proc
and handleBindApplication) that are already using the AM tag.

bug: 21632700
Change-Id: Ibc01f1721f962c913f3c02a51763b6feb1eb6a4d
 2015-06-16 12:06:31 +01:00
Benjamin Franz
c6a9653e0a Update documentation for PASSWORD_QUALITY_SOMETHING 
Add a mention that PASSWORD_QUALITY_SOMETHING includes patterns.

Bug: 20441473
Change-Id: I2608f36e338fb2bfbace80d49ee805841d59fa17
 2015-06-16 11:23:38 +01:00
Jeff Sharkey
475e199f4f am 2cc03e56: Yet another user restriction. 
* commit '2cc03e5606ad7cd473283898400506d5ac2237ba':
  Yet another user restriction.
 2015-06-16 05:17:01 +00:00
Jeff Sharkey
176d0b0ec1 am a65a1582: Merge "Update file size formatting." into mnc-dev 
* commit 'a65a1582f5a04b15b53ebdec337ac611ccb78a07':
  Update file size formatting.
 2015-06-16 05:01:51 +00:00
Jeff Sharkey
2cc03e5606 Yet another user restriction. 
Change-Id: Ia2952da19cb974a6a9ba0271a298a10df58b8d18
 2015-06-15 21:50:47 -07:00
Jeff Sharkey
a65a1582f5 Merge "Update file size formatting." into mnc-dev 2015-06-16 04:47:21 +00:00
Jeff Sharkey
b521feaed4 Update file size formatting. 
Per UX, default strings should have space between value and units
resulting in "12.3 GB".  Add a formatting variant that returns the
various components for callers who want to build their own strings.

For now there is only one mounted emulated volume at a time, and
it's always the primary storage, so give it the default rootId to
keep old Uris working.

Change-Id: Ifcc72a91a6b397ee65dc92642153286186eb64ac
 2015-06-15 21:39:28 -07:00
Erik Kline
ae62b2c937 am 0d16281a: Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev 
* commit '0d16281a03722f3f66a076718251c2166518d122':
  Add a test that Network#getNetworkHandle() behaves sanely.
 2015-06-16 03:52:43 +00:00
Erik Kline
0d16281a03 Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev 2015-06-16 03:43:56 +00:00
Paul Jensen
434dde84ee Remove dead hidden ConnectivityManager and NetworkInfo APIs. 
- There are no callers of
  NetworkInfo.setIsConnectedToProvisioningNetwork(), so remove all the
  code that deals with mIsConnectedToProvisioningNetwork being true,
  including the two ConnectiviyManager APIs.
- There are no callers of
  ConnectivityManager.getMobileRedirectedProvisioningUrl(), so remove
  the code that reads this URL.
- There are no callers of
  ConnectivityManager.captivePortalCheckCompleted(), so remove this
  API which is currently a no-op.

Change-Id: Ifa44c7553c7c45ebe261a2a124d9bf8d6f96c690
 2015-06-16 02:07:36 +00:00
Ruben Brunk
47b9e85b53 am 9a2da54e: Merge "Add metadata for pre-distortion dimensions." into mnc-dev 
* commit '9a2da54e3c7b5f382d2654eeb5228b945edd8e39':
  Add metadata for pre-distortion dimensions.
 2015-06-16 01:23:01 +00:00
Ruben Brunk
9a2da54e3c Merge "Add metadata for pre-distortion dimensions." into mnc-dev 2015-06-16 01:12:58 +00:00
Ruben Brunk
224eb3a4f1 Add metadata for pre-distortion dimensions. 
Bug: 20491394
Change-Id: I6b95a7fe2fd765571bcd2774aee486d18169a727
 2015-06-15 18:09:33 -07:00
Adam Lesinski
507b4095cc am d5e5151f: Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev 
* commit 'd5e5151f6ceab498e3a35928c1f6f7a177c1544e':
  Bluetooth energy: fix overflow in calculation
 2015-06-16 00:48:57 +00:00
Adam Lesinski
d5e5151f6c Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev 2015-06-16 00:46:09 +00:00
Adam Lesinski
8a35137388 Bluetooth energy: fix overflow in calculation 
Use longs instead of ints, because the energy values can get pretty
high.

Change-Id: I43e696ad9e5965c2e616b11920db5bfae5db1671
 2015-06-15 17:19:07 -07:00
Adrian Roos
a5e08baa6b am 6ecdcf2a: Merge "Add AssistUtils" into mnc-dev 
* commit '6ecdcf2aa01b2510bf6d506b92172dbc32beeec9':
  Add AssistUtils
 2015-06-16 00:01:07 +00:00
Adrian Roos
6ecdcf2aa0 Merge "Add AssistUtils" into mnc-dev 2015-06-15 23:49:22 +00:00
Adrian Roos
e91750804a Add AssistUtils 
Enables code sharing with Settings for consistent
default value handling.

Bug: 21780590
Change-Id: I669b673f90fab503ae0c2179f09ebac9592bd33a
 2015-06-15 16:07:48 -07:00
Zhijun He
e15799c8e9 am fa4b7fb8: Merge "Camera2: fix Surface cast issue" into mnc-dev 
* commit 'fa4b7fb856a0f978529626fabcddf45fd57ecc3e':
  Camera2: fix Surface cast issue
 2015-06-15 23:04:26 +00:00
John Spurlock
77ba0a6147 am 9f206bec: am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit '9f206bec2d58e5edcebb134013e2d9a23659a4d4':
  Fix typo in TtsSpan.
 2015-06-15 23:04:14 +00:00
Zhijun He
fa4b7fb856 Merge "Camera2: fix Surface cast issue" into mnc-dev 2015-06-15 22:58:50 +00:00
Ruben Brunk
91c3bc8f3a am 9f6d39f8: Merge "Add addional scale component for radialDistortion." into mnc-dev 
* commit '9f6d39f84423d59705c0c7a8746d40cc610caee7':
  Add addional scale component for radialDistortion.
 2015-06-15 22:58:48 +00:00
John Spurlock
9f206bec2d am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit '4393a7d2645cfb9097e616016c58887b9929be55':
  Fix typo in TtsSpan.
 2015-06-15 22:50:51 +00:00
John Spurlock
4393a7d264 am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit 'c0d849348ae9fb36e725d0644a4927e2e5146295':
  Fix typo in TtsSpan.
 2015-06-15 22:39:12 +00:00
Ruben Brunk
9f6d39f844 Merge "Add addional scale component for radialDistortion." into mnc-dev 2015-06-15 22:34:20 +00:00
Ruben Brunk
02cd8cbc9d Add addional scale component for radialDistortion. 
Bug: 20491394
Change-Id: Ibbaf8bbfe60e1e0c17ac5ba8c641b8616b1148b7
 2015-06-15 15:33:09 -07:00
John Spurlock
076c599feb am 1ad5c813: Fix typo in TtsSpan. 
* commit '1ad5c813211d4d855a0d5396855c80653480aaa4':
  Fix typo in TtsSpan.
 2015-06-15 22:11:30 +00:00
George Mount
cf66572471 am 727a6cf6: Fix blink in Explode transition. 
* commit '727a6cf6ad06bbb43c0c309c33776394a0012895':
  Fix blink in Explode transition.
 2015-06-15 21:22:58 +00:00
George Mount
727a6cf6ad Fix blink in Explode transition. 
Bug 21785708

Change-Id: I1250d8e084601a6267906fdb2f3df46cbb8161fc
 2015-06-15 14:12:26 -07:00
George Mount
ce5b433cf4 am 8af78483: Merge "Limit shared element transition to shared elements and children." into mnc-dev 
* commit '8af7848355ef3d8f6042bde1454a478456f6b7fe':
  Limit shared element transition to shared elements and children.
 2015-06-15 19:55:38 +00:00
Vladislav Kaznacheev
6f20f8bd0a am 0021d3fa: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev 
* commit '0021d3fa13f6e3b4574f857623136a474ee033ec':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."
 2015-06-15 19:55:34 +00:00
Abodunrinwa Toki
6d2b75c86d Floating toolbar no longer obstructs the soft keyboard. 
-The toolbar popupwindow is set to "need" the keyboard
-Updated toolbar positioning bounds
-Updated toolbar positioning depending on available space

Bug: 21304845
Change-Id: I8d8a59ef6ea639b11bb32cfeb6ead52087fb91e4
 2015-06-15 20:45:30 +01:00
George Mount
8af7848355 Merge "Limit shared element transition to shared elements and children." into mnc-dev 2015-06-15 19:43:57 +00:00
Vladislav Kaznacheev
0021d3fa13 Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev 2015-06-15 19:43:13 +00:00
Adam Powell
52a20b7d70 am 417018f2: Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev 
* commit '417018f21b85426eb787a462377d83feadc816e9':
  Only read foreground attr for FrameLayouts for targetSdkVersion < M
 2015-06-15 19:37:12 +00:00
Dianne Hackborn
f3a80c769a am 285cb414: Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev 
* commit '285cb414eaab8543f6c857357849bfcf24b5974f':
  Fix issue #21813831: Need API for asking to be added to power whitelist
 2015-06-15 19:28:53 +00:00
Adam Powell
417018f21b Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev 2015-06-15 19:25:21 +00:00
Dianne Hackborn
285cb414ea Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev 2015-06-15 19:12:17 +00:00
Dianne Hackborn
1958e5e787 Fix issue #21813831: Need API for asking to be added to power whitelist 
Add the API.  Clean up a few related things.

Change-Id: I190adad1812f36f6095b98a1001fedb94874e8b5
 2015-06-15 11:53:59 -07:00
Alan Viverette
e53739a311 am 2d4dc8db: Merge "Obtain handler from context in CaptioningManager" into mnc-dev 
* commit '2d4dc8db64d0f75e530451acb2c0bea97b9264ff':
  Obtain handler from context in CaptioningManager
 2015-06-15 18:16:28 +00:00
Alan Viverette
2d4dc8db64 Merge "Obtain handler from context in CaptioningManager" into mnc-dev 2015-06-15 18:05:11 +00:00