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

49039 Commits

Author SHA1 Message Date
Chirag Shah
3db44d08ea am f40f46e9: am 7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev 
* commit 'f40f46e94c773676158b3f7e9cd51157cc9a91d2':
  Allow 3P apps to provide structured data within AssistContent.
 2015-06-16 21:24:48 +00:00
Abodunrinwa Toki
a9eee50455 am 03c70cac: am 98f98dd1: Merge "Fix floating toolbar flickers." into mnc-dev 
* commit '03c70cac9a0d9dc7c9f2c71b28aaf609393fdcf3':
  Fix floating toolbar flickers.
 2015-06-16 21:24:34 +00:00
George Mount
b5f0e3bdba am 2a255904: am 209fb433: Merge "Have the final setVisibility cause a requestLayout." into mnc-dev 
* commit '2a25590428d3fa8e01f74f214b7c4c2d1c712afe':
  Have the final setVisibility cause a requestLayout.
 2015-06-16 21:24:30 +00:00
Benjamin Franz
3be79152cf am 84e38f68: am dbc86ad1: Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev 
* commit '84e38f687819e47ffe3bae1fd2588d0f22fafa90':
  Update documentation for PASSWORD_QUALITY_SOMETHING
 2015-06-16 21:24:20 +00:00
Narayan Kamath
ba6e9b12a2 am 2d13fe56: am 275294db: Merge "Better systrace slices for application startup." into mnc-dev 
* commit '2d13fe56eec54030fe09cae74c7a92be54c8bd19':
  Better systrace slices for application startup.
 2015-06-16 21:24:04 +00:00
Paul Jensen
79cd02c4b0 am 8235c839: am 19769114: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev 
* commit '8235c839aa9caaf6b36820007f928367bd829736':
  Remove dead hidden ConnectivityManager and NetworkInfo APIs.
 2015-06-16 21:24:00 +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
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
10d045cd08 am 716978e3: am 2cc03e56: Yet another user restriction. 
* commit '716978e36b30f339e615eee289a8cbc6f68a4df4':
  Yet another user restriction.
 2015-06-16 05:28:43 +00:00
Jeff Sharkey
835a40aac0 am 7f39beb2: am a65a1582: Merge "Update file size formatting." into mnc-dev 
* commit '7f39beb28e2f20c54529848cbee3429d17ae76ec':
  Update file size formatting.
 2015-06-16 05:10: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
47585f462a am a01b9e6f: am 0d16281a: Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev 
* commit 'a01b9e6f43b2c5d6a083b34ae0c8140abb09806a':
  Add a test that Network#getNetworkHandle() behaves sanely.
 2015-06-16 04:05:03 +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
629923b56e am e9a1f181: am 9a2da54e: Merge "Add metadata for pre-distortion dimensions." into mnc-dev 
* commit 'e9a1f181ee35dd376803ea98214e1bdbdc9250ef':
  Add metadata for pre-distortion dimensions.
 2015-06-16 01:31:49 +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
73e999341f am f86b2096: am d5e5151f: Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev 
* commit 'f86b2096e5b5e2bae440da8b90d27bc17f8d24a5':
  Bluetooth energy: fix overflow in calculation
 2015-06-16 01:01:01 +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
Zhijun He
d8fcc2e359 am 5e83c908: am fa4b7fb8: Merge "Camera2: fix Surface cast issue" into mnc-dev 
* commit '5e83c9080c71111955bf7e2559b453ffeb5b2c0d':
  Camera2: fix Surface cast issue
 2015-06-15 23:39:39 +00:00
John Spurlock
aa48a4f2e5 am 1e17afa7: am 9f206bec: am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit '1e17afa76a76ffd1ac3c8eb9596de5513ca27c28':
  Fix typo in TtsSpan.
 2015-06-15 23:39:34 +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
Zhijun He
fa4b7fb856 Merge "Camera2: fix Surface cast issue" into mnc-dev 2015-06-15 22:58:50 +00:00
Ruben Brunk
cabcf6545b am 0e250edb: am 9f6d39f8: Merge "Add addional scale component for radialDistortion." into mnc-dev 
* commit '0e250edbfd4f6ec1f59d73dfca4f5f806386a5e1':
  Add addional scale component for radialDistortion.
 2015-06-15 22:58:26 +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
ac3c21140b am 1c8ff1dd: am 727a6cf6: Fix blink in Explode transition. 
* commit '1c8ff1dd32f4f6a0d94a58aecf4a44524ff4192b':
  Fix blink in Explode transition.
 2015-06-15 21:31:32 +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
8acb658b2a am c28834f7: am 8af78483: Merge "Limit shared element transition to shared elements and children." into mnc-dev 
* commit 'c28834f7786bbbd1452bf7b33b21b5e7438365e5':
  Limit shared element transition to shared elements and children.
 2015-06-15 20:07:45 +00:00
Vladislav Kaznacheev
dfa44e75d5 am a31cda89: am 0021d3fa: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev 
* commit 'a31cda89957cc1f29ae1b97a7fadf0266b7ae7b1':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."
 2015-06-15 20:07:41 +00:00
Adam Powell
e032baa9fc am b05ef5e4: am 417018f2: Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev 
* commit 'b05ef5e4ef992998894b3b6b644f1ca405889bfc':
  Only read foreground attr for FrameLayouts for targetSdkVersion < M
 2015-06-15 19:49:41 +00: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
Dianne Hackborn
d5111d46d6 am 4169b628: am 285cb414: Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev 
* commit '4169b6282f78a8027cc0e4c2f3ca4f0f05c57d08':
  Fix issue #21813831: Need API for asking to be added to power whitelist
 2015-06-15 19:37:15 +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