Commit Graph

53216 Commits

Author SHA1 Message Date
Junda Liu
4e85ac8130 am a11ffa64: Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev
* commit 'a11ffa64366e39899bcda7448e5b5ffe727bea48':
  Remove hide_carrier_network_settings from Settings.
2015-06-16 23:23:16 +00:00
Junda Liu
a11ffa6436 Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 2015-06-16 23:11:32 +00:00
Maxim Bogatov
d74a13e3f9 am e6ba94ce: Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev
* commit 'e6ba94ce022a60b5225ee54cf2cc710633441d87':
  fix CTS: AccessibilityEndToEndTest failing
2015-06-16 23:00:46 +00:00
Maxim Bogatov
e6ba94ce02 Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev 2015-06-16 22:48:59 +00:00
Matthew Williams
f28a2f6226 am 15ce3387: Merge "Make sync settings restore more robust" into mnc-dev
* commit '15ce33873e2ca774a1fca666a05cc8ed79f327d7':
  Make sync settings restore more robust
2015-06-16 22:42:50 +00:00
Matthew Williams
15ce33873e Merge "Make sync settings restore more robust" into mnc-dev 2015-06-16 22:36:53 +00:00
dcashman
29cbc202c8 am acc2df21: Merge "Add keyset support for ECDSA public keys." into mnc-dev
* commit 'acc2df21de9da66d8aaf9bf2b733f8b284454403':
  Add keyset support for ECDSA public keys.
2015-06-16 22:22:51 +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
Adam Powell
ef06a629d4 am 8edfe18c: Merge "Fully remove Toolbar children when action views expand" into mnc-dev
* commit '8edfe18c193e2d6d719b2e141628f33b669598d9':
  Fully remove Toolbar children when action views expand
2015-06-16 21:47:26 +00:00
Adam Powell
caa1a03777 am 26b27cab: Merge "Fix crash in ToolbarActionBar when setting null custom view" into mnc-dev
* commit '26b27cab811e2c91b6e229cf5bfcf5846fb6d094':
  Fix crash in ToolbarActionBar when setting null custom view
2015-06-16 21:47:20 +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
a366b4923c am 57af7531: Merge "Camera: Adjust intrinsic transform coordinate system." into mnc-dev
* commit '57af75313c005134b85cf29b7e9972ca1fad53dc':
  Camera: Adjust intrinsic transform coordinate system.
2015-06-16 20:45:25 +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
8b6d9ad3a7 am dd862aeb: Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev
* commit 'dd862aebda15a5b63c90b1b670373028b48172c4':
  Deprecate SHA-1 in ManagedProvisioning (API doc change)
2015-06-16 18:31:04 +00: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
44143f4974 am 7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev
* commit '7f92f06742fe3b66b9e8049db62ea55e1b41adf5':
  Allow 3P apps to provide structured data within AssistContent.
2015-06-16 17:03:44 +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
b9b27fefb1 am 98f98dd1: Merge "Fix floating toolbar flickers." into mnc-dev
* commit '98f98dd19def468afc310bd879cb79cce9917ba2':
  Fix floating toolbar flickers.
2015-06-16 16:06:59 +00:00
Abodunrinwa Toki
98f98dd19d Merge "Fix floating toolbar flickers." into mnc-dev 2015-06-16 15:54:26 +00:00
George Mount
fdf3ccc526 am 209fb433: Merge "Have the final setVisibility cause a requestLayout." into mnc-dev
* commit '209fb43376989c9a68f947d12bae3ea87e4101d2':
  Have the final setVisibility cause a requestLayout.
2015-06-16 15:39:50 +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
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
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