Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
201,343 Commits 3 Branches 0 Tags
ec9da72a7aa8d006962e084dd6ea790fd5fb0ebb
Commit Graph

49643 Commits

Author SHA1 Message Date
Jeff Sharkey
ec9da72a7a am 835a40aa: am 7f39beb2: am a65a1582: Merge "Update file size formatting." into mnc-dev 
* commit '835a40aac0600b0ba0e2615a80ba000fedb585e2':
  Update file size formatting.
 2015-06-16 05:22:00 +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
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
3805777496 am 47585f46: am a01b9e6f: am 0d16281a: Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev 
* commit '47585f462a9cde661169b16cea870c05e91d92f8':
  Add a test that Network#getNetworkHandle() behaves sanely.
 2015-06-16 04:17:27 +00: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
Ruben Brunk
86ff6ea3ff am 629923b5: am e9a1f181: am 9a2da54e: Merge "Add metadata for pre-distortion dimensions." into mnc-dev 
* commit '629923b56ece68048b9c3903d7bbfa90ec1493ec':
  Add metadata for pre-distortion dimensions.
 2015-06-16 01:43:32 +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
Adam Lesinski
fead72a3c8 am 73e99934: am f86b2096: am d5e5151f: Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev 
* commit '73e999341f15f1064563ea0c5a0eb0f99b6da19c':
  Bluetooth energy: fix overflow in calculation
 2015-06-16 01:12:52 +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
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
2b0c208551 am d8fcc2e3: am 5e83c908: am fa4b7fb8: Merge "Camera2: fix Surface cast issue" into mnc-dev 
* commit 'd8fcc2e3599ef85514151dfec4c68c38ac89d671':
  Camera2: fix Surface cast issue
 2015-06-15 23:52:16 +00:00
John Spurlock
b9ca0d0ef8 am aa48a4f2: am 1e17afa7: am 9f206bec: am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit 'aa48a4f2e58d03568a4e70d5d1ff6f4cd6cf8703':
  Fix typo in TtsSpan.
 2015-06-15 23:52:10 +00: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
Ruben Brunk
8f2142f6a4 am cabcf654: am 0e250edb: am 9f6d39f8: Merge "Add addional scale component for radialDistortion." into mnc-dev 
* commit 'cabcf6545b9e4adfb7d238a16a561e10b3c35ebc':
  Add addional scale component for radialDistortion.
 2015-06-15 23:10:47 +00: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
George Mount
077cf8c5ba am ac3c2114: am 1c8ff1dd: am 727a6cf6: Fix blink in Explode transition. 
* commit 'ac3c21140b51dc7132fe470a29b020b2d3e24580':
  Fix blink in Explode transition.
 2015-06-15 22:41:40 +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
1b1a97dceb am 8acb658b: am c28834f7: am 8af78483: Merge "Limit shared element transition to shared elements and children." into mnc-dev 
* commit '8acb658b2aaa89891488c427f529911e8ebf23c8':
  Limit shared element transition to shared elements and children.
 2015-06-15 20:20:22 +00:00
Vladislav Kaznacheev
7afa5bd865 am dfa44e75: am a31cda89: am 0021d3fa: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev 
* commit 'dfa44e75d5196559e447276bbaea201487f4db9f':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."
 2015-06-15 20:20:17 +00: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
256bd8b02c am e032baa9: am b05ef5e4: am 417018f2: Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev 
* commit 'e032baa9fc8a0f85474c854ff6181bd160f8289b':
  Only read foreground attr for FrameLayouts for targetSdkVersion < M
 2015-06-15 20:02:03 +00:00
Dianne Hackborn
1317a6585c am d5111d46: am 4169b628: am 285cb414: Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev 
* commit 'd5111d46d6589921c3ad3d7ee6771ccc0e257f8f':
  Fix issue #21813831: Need API for asking to be added to power whitelist
 2015-06-15 19:49:46 +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
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
68ae7b3d23 am 61c9ca8e: am 36884392: am 2d4dc8db: Merge "Obtain handler from context in CaptioningManager" into mnc-dev 
* commit '61c9ca8e9dc6613a9256cccee947e32a74490cfa':
  Obtain handler from context in CaptioningManager
 2015-06-15 18:42:52 +00:00
Alan Viverette
61c9ca8e9d am 36884392: am 2d4dc8db: Merge "Obtain handler from context in CaptioningManager" into mnc-dev 
* commit '3688439287948303ad0652df69565168f4c7f2bf':
  Obtain handler from context in CaptioningManager
 2015-06-15 18:27:47 +00:00
Alan Viverette
2d4dc8db64 Merge "Obtain handler from context in CaptioningManager" into mnc-dev 2015-06-15 18:05:11 +00:00
John Spurlock
1ad5c81321 Fix typo in TtsSpan. 
Change-Id: Ic32f141f0c51ee3bee8fd71464f104ef725de880
 2015-06-15 17:24:57 +00:00
Zhijun He
42499640cc Camera2: fix Surface cast issue 
Can not cast an object array directly to a Surface array.

Change-Id: Ie2cb711f9e1ff0fc17d6038992dc3c7af9471ccf
 2015-06-15 09:43:55 -07:00
Vladislav Kaznacheev
78f146f420 Revert "Make VPA.setInterpolator(null) unset the interpolator." 
This reverts commit 8cebf3a098.

Bug: 21804709
Change-Id: I4b3c2c4721b8e7dd5cb38c806bdd078344b09799
 2015-06-15 06:58:59 +00:00
Erik Kline
e1a6cf2caa Add a test that Network#getNetworkHandle() behaves sanely. 
Additionally:
    - make zero more obvious for debugging, rather than emitting
      some inscrutable magic value.

Bug: 19537384
Change-Id: Iac9a3297a0dda1ba3d69fd01cf6de81f01fd837e
 2015-06-15 15:18:38 +09:00