Commit Graph

52840 Commits

Author SHA1 Message Date
Junda Liu
a11ffa6436 Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 2015-06-16 23:11:32 +00:00
Maxim Bogatov
e6ba94ce02 Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev 2015-06-16 22:48:59 +00:00
Matthew Williams
15ce33873e Merge "Make sync settings restore more robust" into mnc-dev 2015-06-16 22:36:53 +00:00
Maxim Bogatov
f399af3e5f fix CTS: AccessibilityEndToEndTest failing
ViewGroup overrides class name population to
AccessibilityEvent. So className is always ViewGroup
for any ViewGroup inherited classes

b/21369265

Change-Id: I46095c21e523e05066c7f6ee395171d4725983ac
2015-06-16 15:19:42 -07:00
dcashman
acc2df21de Merge "Add keyset support for ECDSA public keys." into mnc-dev 2015-06-16 22:14:35 +00:00
Matthew Williams
53abfdb86c Make sync settings restore more robust
Bug: 18506992
Parent Bug: 17967106
Introduce a new state for ContentResolver#getIsSyncable.
This state specifies that an adapter should be disabled until
explicitly turned on by ContentResolver#setSyncAutomatically(true).
In this way we can restore disabled sync adapters and still allow
them to run their initialization logic later on when they are
re-enabled.

Change-Id: I03fd1f994c4bc982bbc723154ba20bb252efdf80
2015-06-16 14:46:59 -07:00
Adam Powell
8edfe18c19 Merge "Fully remove Toolbar children when action views expand" into mnc-dev 2015-06-16 21:30:13 +00:00
Adam Powell
26b27cab81 Merge "Fix crash in ToolbarActionBar when setting null custom view" into mnc-dev 2015-06-16 21:29:48 +00:00
Eino-Ville Talvala
b8bd8ab184 Camera: Adjust intrinsic transform coordinate system.
Needs to be in the pre-correction active array coordinates
for consistency.

Bug: 20491394
Change-Id: I7a28499fec59219a0f8d85c1fc37867aed90f4c0
2015-06-16 11:45:33 -07:00
Rubin Xu
dd862aebda Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev 2015-06-16 18:15:33 +00:00
Chirag Shah
7f92f06742 Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev 2015-06-16 16:54:03 +00:00
Abodunrinwa Toki
98f98dd19d Merge "Fix floating toolbar flickers." into mnc-dev 2015-06-16 15:54:26 +00:00
George Mount
209fb43376 Merge "Have the final setVisibility cause a requestLayout." into mnc-dev 2015-06-16 15:27:27 +00:00
Abodunrinwa Toki
f444b5c3ae Fix floating toolbar flickers.
-Flicker was a side effect the delay in hiding the toolbar when
there is a down press on a TextView handle. The timing clashed
with the time it takes for the FloatingActionMode to release a
hide lock on a changing content rect. Extra flickers also happened
if the ActionMode happened to be invalidated at about the same time.
Since there was no longer a hide lock, the toolbar refreshed, getting
rid of the "Select all" menu item.
FIX. I believe we don't need the delayed hide on down press on a
TextView handle. I've removed this.

-I've also updated FloatingActionMode to ensure that hide locks
overlap one another if necessary. The toolbar can only be visible if
all locks are off.

Bug: 21793687
Change-Id: I290ea45ab17d5862b453cb319afb4c8ffe084cd0
2015-06-16 15:47:04 +01:00
Benjamin Franz
dbc86ad170 Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev 2015-06-16 13:22:22 +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
275294dbce Merge "Better systrace slices for application startup." into mnc-dev 2015-06-16 11:50:57 +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
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
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
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
Chirag Shah
61f794a70f Allow 3P apps to provide structured data within AssistContent.
For providing structured metadata to the assistant, we've decided to
standardize on JSON-LD (met with Paige/Ulas/Fabian), and decided the
data to be specified via:

AssistContent.setStructuredData(String structuredDataJson)

This method can be documented for 3P developers as allowing developers
to provide metadata to the assistant with the JSON-LD standard.

This would be centered more about content displayed on the screen,
rather than actions based, so we added it to the AssistContent class

Updated doc: go/setStructuredData

Change-Id: I816f69fd6896df822e30d6c71d840bd01f47e544
2015-06-15 17:48:41 -07: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
6ecdcf2aa0 Merge "Add AssistUtils" into mnc-dev 2015-06-15 23:49:22 +00:00
George Mount
533d7a67d9 Have the final setVisibility cause a requestLayout.
Bug 21770464

Change-Id: I8c501e8a681634cb87857cf9286b888e61101f13
2015-06-15 16:17:04 -07: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
fa4b7fb856 Merge "Camera2: fix Surface cast issue" into mnc-dev 2015-06-15 22:58:50 +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
Junda Liu
297da6ffb9 Remove hide_carrier_network_settings from Settings.
No longer needs this as carrier config manager handles it now.

Bug: b/21347654
Change-Id: I26d34cde0d31ae53a6e5a25cd555ed2ff7600f38
2015-06-15 15:29:08 -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
Adam Powell
5f6228454d Fully remove Toolbar children when action views expand
The previous implementation of toggling visibility resulted
developer-set child visibility getting stomped. Fully detach child
views that shouldn't be shown instead. This is more consistent with
the coming and going of other system child views.

Bug 18156260

Change-Id: I8469d45eeb950dc0232f703efe8401233241c657
2015-06-15 14:33:45 -07:00
George Mount
727a6cf6ad Fix blink in Explode transition.
Bug 21785708

Change-Id: I1250d8e084601a6267906fdb2f3df46cbb8161fc
2015-06-15 14:12:26 -07:00
Adam Powell
c5ed395e4b Fix crash in ToolbarActionBar when setting null custom view
Bug 21291849

Change-Id: I54a4084b2b146ce7fb9dfe92023e9a1ad23f7902
2015-06-15 14:11:42 -07: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
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
2d4dc8db64 Merge "Obtain handler from context in CaptioningManager" into mnc-dev 2015-06-15 18:05:11 +00:00