OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 6598e805: am 51c54489: am cd7ceb07: Merge "SystemUI: show owner VPN for restricted...
Robin Lee [Fri, 26 Jun 2015 21:27:31 +0000 (21:27 +0000)]
am 6598e805: am 51c54489: am cd7ceb07: Merge "SystemUI: show owner VPN for restricted profile" into mnc-dev

* commit '6598e805c55debe824fd7e20df47a189844dc156':
  SystemUI: show owner VPN for restricted profile

9 years agoam 51c54489: am cd7ceb07: Merge "SystemUI: show owner VPN for restricted profile...
Robin Lee [Fri, 26 Jun 2015 21:11:47 +0000 (21:11 +0000)]
am 51c54489: am cd7ceb07: Merge "SystemUI: show owner VPN for restricted profile" into mnc-dev

* commit '51c5448949111132b565276b27a2ecd91b0aaf64':
  SystemUI: show owner VPN for restricted profile

9 years agoam 6b37bc50: am 45cb8b12: am 6356d3b2: Merge "Improve docs for View#addChildrenForAcc...
Adam Powell [Fri, 26 Jun 2015 21:05:17 +0000 (21:05 +0000)]
am 6b37bc50: am 45cb8b12: am 6356d3b2: Merge "Improve docs for View#addChildrenForAccessibility" into mnc-dev

* commit '6b37bc507d45dd2052cbfe77ce3d4b1af637be99':
  Improve docs for View#addChildrenForAccessibility

9 years agoam 14d46cc6: am f8e1bb0e: am 24336555: Merge "Clarify the intention of setNotificatio...
Amith Yamasani [Fri, 26 Jun 2015 21:05:10 +0000 (21:05 +0000)]
am 14d46cc6: am f8e1bb0e: am 24336555: Merge "Clarify the intention of setNotificationsShown" into mnc-dev

* commit '14d46cc6867d40c8ea22261952e04afe4d20e6f1':
  Clarify the intention of setNotificationsShown

9 years agoam 0678733a: am a9f79160: am 6cbf7928: Merge "Revert get accounts permission to norma...
Svet Ganov [Fri, 26 Jun 2015 21:05:04 +0000 (21:05 +0000)]
am 0678733a: am a9f79160: am 6cbf7928: Merge "Revert get accounts permission to normal for now" into mnc-dev

* commit '0678733a525c6a785feb68a9a2004ff8c494c911':
  Revert get accounts permission to normal for now

9 years agoam fb46261c: am a5de0eb5: am 7c5b5f71: Merge "Fix issue #22023824: Download folder...
Dianne Hackborn [Fri, 26 Jun 2015 21:04:55 +0000 (21:04 +0000)]
am fb46261c: am a5de0eb5: am 7c5b5f71: Merge "Fix issue #22023824: Download folder is not created in internal storage" into mnc-dev

* commit 'fb46261c1eb015896d201a0275b41c3ebae11d02':
  Fix issue #22023824: Download folder is not created in internal storage

9 years agoam 00562d69: am 5805765d: am f8d25ea8: Merge "Don\'t promote functors onto layers...
Chris Craik [Fri, 26 Jun 2015 21:04:48 +0000 (21:04 +0000)]
am 00562d69: am 5805765d: am f8d25ea8: Merge "Don\'t promote functors onto layers due to outline rect clipping" into mnc-dev

* commit '00562d693bfcfa4409977becbbd0db2c8408e291':
  Don't promote functors onto layers due to outline rect clipping

9 years agoam cd7ceb07: Merge "SystemUI: show owner VPN for restricted profile" into mnc-dev
Robin Lee [Fri, 26 Jun 2015 20:58:21 +0000 (20:58 +0000)]
am cd7ceb07: Merge "SystemUI: show owner VPN for restricted profile" into mnc-dev

* commit 'cd7ceb0711672eabd1de578f2452ddcb8a322f68':
  SystemUI: show owner VPN for restricted profile

9 years agoam 45cb8b12: am 6356d3b2: Merge "Improve docs for View#addChildrenForAccessibility...
Adam Powell [Fri, 26 Jun 2015 20:50:52 +0000 (20:50 +0000)]
am 45cb8b12: am 6356d3b2: Merge "Improve docs for View#addChildrenForAccessibility" into mnc-dev

* commit '45cb8b12add577d7d8518f7382c370be9bc67d4f':
  Improve docs for View#addChildrenForAccessibility

9 years agoam f8e1bb0e: am 24336555: Merge "Clarify the intention of setNotificationsShown"...
Amith Yamasani [Fri, 26 Jun 2015 20:50:47 +0000 (20:50 +0000)]
am f8e1bb0e: am 24336555: Merge "Clarify the intention of setNotificationsShown" into mnc-dev

* commit 'f8e1bb0e2900ad8cd1c54d25b9a13e1d9b071a8a':
  Clarify the intention of setNotificationsShown

9 years agoam a9f79160: am 6cbf7928: Merge "Revert get accounts permission to normal for now...
Svet Ganov [Fri, 26 Jun 2015 20:50:41 +0000 (20:50 +0000)]
am a9f79160: am 6cbf7928: Merge "Revert get accounts permission to normal for now" into mnc-dev

* commit 'a9f79160b8d13bd10c9c7f53211f069709427317':
  Revert get accounts permission to normal for now

9 years agoam a5de0eb5: am 7c5b5f71: Merge "Fix issue #22023824: Download folder is not created...
Dianne Hackborn [Fri, 26 Jun 2015 20:50:34 +0000 (20:50 +0000)]
am a5de0eb5: am 7c5b5f71: Merge "Fix issue #22023824: Download folder is not created in internal storage" into mnc-dev

* commit 'a5de0eb5e5d1ab9f6d2fe9661e5d6dcf60718e73':
  Fix issue #22023824: Download folder is not created in internal storage

9 years agoam 5805765d: am f8d25ea8: Merge "Don\'t promote functors onto layers due to outline...
Chris Craik [Fri, 26 Jun 2015 20:50:29 +0000 (20:50 +0000)]
am 5805765d: am f8d25ea8: Merge "Don\'t promote functors onto layers due to outline rect clipping" into mnc-dev

* commit '5805765d6e3e00e367ef4e2b0a096c72d511ed45':
  Don't promote functors onto layers due to outline rect clipping

9 years agoMerge "SystemUI: show owner VPN for restricted profile" into mnc-dev
Robin Lee [Fri, 26 Jun 2015 20:44:55 +0000 (20:44 +0000)]
Merge "SystemUI: show owner VPN for restricted profile" into mnc-dev

9 years agoam 6356d3b2: Merge "Improve docs for View#addChildrenForAccessibility" into mnc-dev
Adam Powell [Fri, 26 Jun 2015 20:43:37 +0000 (20:43 +0000)]
am 6356d3b2: Merge "Improve docs for View#addChildrenForAccessibility" into mnc-dev

* commit '6356d3b2504cefce59761d67b642ae37f8ba2d8b':
  Improve docs for View#addChildrenForAccessibility

9 years agoam 24336555: Merge "Clarify the intention of setNotificationsShown" into mnc-dev
Amith Yamasani [Fri, 26 Jun 2015 20:39:02 +0000 (20:39 +0000)]
am 24336555: Merge "Clarify the intention of setNotificationsShown" into mnc-dev

* commit '24336555658377383a1b4a1a22b1f24346b5ff68':
  Clarify the intention of setNotificationsShown

9 years agoam 6cbf7928: Merge "Revert get accounts permission to normal for now" into mnc-dev
Svet Ganov [Fri, 26 Jun 2015 20:38:57 +0000 (20:38 +0000)]
am 6cbf7928: Merge "Revert get accounts permission to normal for now" into mnc-dev

* commit '6cbf792833f1bd73c56945c23e6ec8fd9fa29575':
  Revert get accounts permission to normal for now

9 years agoam 7c5b5f71: Merge "Fix issue #22023824: Download folder is not created in internal...
Dianne Hackborn [Fri, 26 Jun 2015 20:38:52 +0000 (20:38 +0000)]
am 7c5b5f71: Merge "Fix issue #22023824: Download folder is not created in internal storage" into mnc-dev

* commit '7c5b5f713af307fdc8cadfc39ae60b696a37e33a':
  Fix issue #22023824: Download folder is not created in internal storage

9 years agoam f8d25ea8: Merge "Don\'t promote functors onto layers due to outline rect clipping...
Chris Craik [Fri, 26 Jun 2015 20:38:47 +0000 (20:38 +0000)]
am f8d25ea8: Merge "Don\'t promote functors onto layers due to outline rect clipping" into mnc-dev

* commit 'f8d25ea8ebece1d13f71f3e92dac814d02a32b91':
  Don't promote functors onto layers due to outline rect clipping

9 years agoam d65f3c7d: am 0068f4c4: am daee1e5b: Merge "Camera2: Add clarification about simult...
Eino-Ville Talvala [Fri, 26 Jun 2015 20:38:19 +0000 (20:38 +0000)]
am d65f3c7d: am 0068f4c4: am daee1e5b: Merge "Camera2: Add clarification about simultaneous trigger use" into mnc-dev

* commit 'd65f3c7d5d6b21097b82f33638c4e26414e19d7b':
  Camera2: Add clarification about simultaneous trigger use

9 years agoMerge "Improve docs for View#addChildrenForAccessibility" into mnc-dev
Adam Powell [Fri, 26 Jun 2015 20:35:30 +0000 (20:35 +0000)]
Merge "Improve docs for View#addChildrenForAccessibility" into mnc-dev

9 years agoMerge "Clarify the intention of setNotificationsShown" into mnc-dev
Amith Yamasani [Fri, 26 Jun 2015 20:34:30 +0000 (20:34 +0000)]
Merge "Clarify the intention of setNotificationsShown" into mnc-dev

9 years agoMerge "Revert get accounts permission to normal for now" into mnc-dev
Svet Ganov [Fri, 26 Jun 2015 20:30:34 +0000 (20:30 +0000)]
Merge "Revert get accounts permission to normal for now" into mnc-dev

9 years agoMerge "Fix issue #22023824: Download folder is not created in internal storage" into...
Dianne Hackborn [Fri, 26 Jun 2015 20:30:19 +0000 (20:30 +0000)]
Merge "Fix issue #22023824: Download folder is not created in internal storage" into mnc-dev

9 years agoMerge "Don't promote functors onto layers due to outline rect clipping" into mnc-dev
Chris Craik [Fri, 26 Jun 2015 20:28:34 +0000 (20:28 +0000)]
Merge "Don't promote functors onto layers due to outline rect clipping" into mnc-dev

9 years agoFix issue #22023824: Download folder is not created in internal storage
Dianne Hackborn [Wed, 24 Jun 2015 22:19:17 +0000 (15:19 -0700)]
Fix issue #22023824: Download folder is not created in internal storage

The media provider and some other things need to be given storage access.

Also, seems like we should give storage access to the camera app as well.

And add a dump dump command that will dump data about a particular
permission name.

Change-Id: Idaaa9bba2ff4dc95290cf6d17e5df933df91e909

9 years agoam 0068f4c4: am daee1e5b: Merge "Camera2: Add clarification about simultaneous trigge...
Eino-Ville Talvala [Fri, 26 Jun 2015 20:27:54 +0000 (20:27 +0000)]
am 0068f4c4: am daee1e5b: Merge "Camera2: Add clarification about simultaneous trigger use" into mnc-dev

* commit '0068f4c4335312da5abfd215032d2ba8bd3e3bf5':
  Camera2: Add clarification about simultaneous trigger use

9 years agoam daee1e5b: Merge "Camera2: Add clarification about simultaneous trigger use" into...
Eino-Ville Talvala [Fri, 26 Jun 2015 20:07:03 +0000 (20:07 +0000)]
am daee1e5b: Merge "Camera2: Add clarification about simultaneous trigger use" into mnc-dev

* commit 'daee1e5bdeb6a173c042438f79663c9a84a469b8':
  Camera2: Add clarification about simultaneous trigger use

9 years agoMerge "Camera2: Add clarification about simultaneous trigger use" into mnc-dev
Eino-Ville Talvala [Fri, 26 Jun 2015 19:53:24 +0000 (19:53 +0000)]
Merge "Camera2: Add clarification about simultaneous trigger use" into mnc-dev

9 years agoam 10486c41: am 2d4f24b1: am 5da8ed16: Merge "AudioManager: optimize audio port liste...
Eric Laurent [Fri, 26 Jun 2015 18:14:40 +0000 (18:14 +0000)]
am 10486c41: am 2d4f24b1: am 5da8ed16: Merge "AudioManager: optimize audio port listener registration" into mnc-dev

* commit '10486c4118f1e5b92f596e2898386b5413246b8b':
  AudioManager: optimize audio port listener registration

9 years agoam c0c307d8: am 2a8f0ca4: am 29f37e15: Merge "Text selection: When user reaches midpo...
Mady Mellor [Fri, 26 Jun 2015 18:14:33 +0000 (18:14 +0000)]
am c0c307d8: am 2a8f0ca4: am 29f37e15: Merge "Text selection: When user reaches midpoint jump to end of word" into mnc-dev

* commit 'c0c307d83a6ebcefc66e8e958b51e1e65fd6f7b2':
  Text selection: When user reaches midpoint jump to end of word

9 years agoam 130d8638: am 3dc688c8: am 10f92517: Merge "Text selection: Fix word boundaries...
Mady Mellor [Fri, 26 Jun 2015 18:14:27 +0000 (18:14 +0000)]
am 130d8638: am 3dc688c8: am 10f92517: Merge "Text selection: Fix word boundaries for languages without spaces" into mnc-dev

* commit '130d8638d5c7e52dff21f158ee0ebcecb56db876':
  Text selection: Fix word boundaries for languages without spaces

9 years agoam 3850b7c2: am 8785d214: am ff81025a: Merge "Fix issue #22013372: Assist should...
Dianne Hackborn [Fri, 26 Jun 2015 18:01:40 +0000 (18:01 +0000)]
am 3850b7c2: am 8785d214: am ff81025a: Merge "Fix issue #22013372: Assist should take translationX and friends..." into mnc-dev

* commit '3850b7c2e4ef841b154a3f1fe88493a663b550a5':
  Fix issue #22013372: Assist should take translationX and friends...

9 years agoam 2d4f24b1: am 5da8ed16: Merge "AudioManager: optimize audio port listener registrat...
Eric Laurent [Fri, 26 Jun 2015 18:01:36 +0000 (18:01 +0000)]
am 2d4f24b1: am 5da8ed16: Merge "AudioManager: optimize audio port listener registration" into mnc-dev

* commit '2d4f24b14ae8cbc33fd1f0ff70d398fd7727c675':
  AudioManager: optimize audio port listener registration

9 years agoam 2a8f0ca4: am 29f37e15: Merge "Text selection: When user reaches midpoint jump...
Mady Mellor [Fri, 26 Jun 2015 18:01:31 +0000 (18:01 +0000)]
am 2a8f0ca4: am 29f37e15: Merge "Text selection: When user reaches midpoint jump to end of word" into mnc-dev

* commit '2a8f0ca4579aa3ee610d63ce5b0c6e4fb12f851a':
  Text selection: When user reaches midpoint jump to end of word

9 years agoam 3dc688c8: am 10f92517: Merge "Text selection: Fix word boundaries for languages...
Mady Mellor [Fri, 26 Jun 2015 18:01:25 +0000 (18:01 +0000)]
am 3dc688c8: am 10f92517: Merge "Text selection: Fix word boundaries for languages without spaces" into mnc-dev

* commit '3dc688c85f223cb0ef184d451255120e82f52ea2':
  Text selection: Fix word boundaries for languages without spaces

9 years agoam 5da8ed16: Merge "AudioManager: optimize audio port listener registration" into...
Eric Laurent [Fri, 26 Jun 2015 17:47:49 +0000 (17:47 +0000)]
am 5da8ed16: Merge "AudioManager: optimize audio port listener registration" into mnc-dev

* commit '5da8ed16239c81c535afd01d91d68b6c2d96eff6':
  AudioManager: optimize audio port listener registration

9 years agoam 29f37e15: Merge "Text selection: When user reaches midpoint jump to end of word...
Mady Mellor [Fri, 26 Jun 2015 17:47:43 +0000 (17:47 +0000)]
am 29f37e15: Merge "Text selection: When user reaches midpoint jump to end of word" into mnc-dev

* commit '29f37e15975dec1fbb519398e5e80b16d61a5d0c':
  Text selection: When user reaches midpoint jump to end of word

9 years agoam 10f92517: Merge "Text selection: Fix word boundaries for languages without spaces...
Mady Mellor [Fri, 26 Jun 2015 17:47:39 +0000 (17:47 +0000)]
am 10f92517: Merge "Text selection: Fix word boundaries for languages without spaces" into mnc-dev

* commit '10f925173630c89239e2f42deb6cb042e9300d39':
  Text selection: Fix word boundaries for languages without spaces

9 years agoam 8785d214: am ff81025a: Merge "Fix issue #22013372: Assist should take translationX...
Dianne Hackborn [Fri, 26 Jun 2015 17:46:56 +0000 (17:46 +0000)]
am 8785d214: am ff81025a: Merge "Fix issue #22013372: Assist should take translationX and friends..." into mnc-dev

* commit '8785d21453b1928c0bc4e5b5ef1eba93378ea849':
  Fix issue #22013372: Assist should take translationX and friends...

9 years agoMerge "AudioManager: optimize audio port listener registration" into mnc-dev
Eric Laurent [Fri, 26 Jun 2015 17:43:00 +0000 (17:43 +0000)]
Merge "AudioManager: optimize audio port listener registration" into mnc-dev

9 years agoMerge "Text selection: When user reaches midpoint jump to end of word" into mnc-dev
Mady Mellor [Fri, 26 Jun 2015 17:37:51 +0000 (17:37 +0000)]
Merge "Text selection: When user reaches midpoint jump to end of word" into mnc-dev

9 years agoSystemUI: show owner VPN for restricted profile
Robin Lee [Thu, 4 Jun 2015 00:53:01 +0000 (01:53 +0100)]
SystemUI: show owner VPN for restricted profile

Restricted profiles don't have their own VPN configuration - whatever
is in charge of VPN for our USER_OWNER user will have network traffic
routed to it instead.

Bug: 18419023
Bug: 21188177
Change-Id: I7205d90032461c240048a036606c3a7938d0eda2

9 years agoam ff81025a: Merge "Fix issue #22013372: Assist should take translationX and friends...
Dianne Hackborn [Fri, 26 Jun 2015 17:34:07 +0000 (17:34 +0000)]
am ff81025a: Merge "Fix issue #22013372: Assist should take translationX and friends..." into mnc-dev

* commit 'ff81025a9def3e56908339ad846bff515d5ecbfb':
  Fix issue #22013372: Assist should take translationX and friends...

9 years agoMerge "Text selection: Fix word boundaries for languages without spaces" into mnc-dev
Mady Mellor [Fri, 26 Jun 2015 17:32:56 +0000 (17:32 +0000)]
Merge "Text selection: Fix word boundaries for languages without spaces" into mnc-dev

9 years agoRevert get accounts permission to normal for now
Svet Ganov [Fri, 26 Jun 2015 15:49:50 +0000 (08:49 -0700)]
Revert get accounts permission to normal for now

Change-Id: I51efe557b69a50d85dc53ba7a1622b7bafc301e6

9 years agoMerge "Fix issue #22013372: Assist should take translationX and friends..." into...
Dianne Hackborn [Fri, 26 Jun 2015 17:20:10 +0000 (17:20 +0000)]
Merge "Fix issue #22013372: Assist should take translationX and friends..." into mnc-dev

9 years agoAudioManager: optimize audio port listener registration
Eric Laurent [Fri, 26 Jun 2015 17:01:12 +0000 (10:01 -0700)]
AudioManager: optimize audio port listener registration

In order to reduce the number of binder calls, only install an
audio port callback in a client process if either:
- an audio port related API has been called once
- an audio port listenr has been registered.

Bug: 22045560.
Change-Id: I0e5cf31bec0c986d6f7761891b860ba6fadd2f4c

9 years agoMerge commit 'b02c73d5' into manualmerge
Jeff Sharkey [Fri, 26 Jun 2015 16:32:09 +0000 (09:32 -0700)]
Merge commit 'b02c73d5' into manualmerge

Change-Id: I3ec37c9d45d685c2393087bdefa6ab512cc70062

9 years agoam df6fd4c2: am d2c41457: Merge "Let\'s reinvent storage, yet again!" into mnc-dev
Jeff Sharkey [Fri, 26 Jun 2015 16:05:25 +0000 (16:05 +0000)]
am df6fd4c2: am d2c41457: Merge "Let\'s reinvent storage, yet again!" into mnc-dev

* commit 'df6fd4c2631e06f3469eb77b2ffdff0d3cc04a68':
  Let's reinvent storage, yet again!

9 years agoam 2a2c81a7: am 018c33ce: am b84ace51: Merge "Fixed a crash where onTouch might have...
Selim Cinek [Fri, 26 Jun 2015 15:59:48 +0000 (15:59 +0000)]
am 2a2c81a7: am 018c33ce: am b84ace51: Merge "Fixed a crash where onTouch might have been called too early" into mnc-dev

* commit '2a2c81a75a081ee7c52d79bf730483e6b59593c8':
  Fixed a crash where onTouch might have been called too early

9 years agoam e4c4d0f9: am db82c17f: am eb4ce1d6: Merge "Now showing unlocked icon if both trust...
Selim Cinek [Fri, 26 Jun 2015 15:59:41 +0000 (15:59 +0000)]
am e4c4d0f9: am db82c17f: am eb4ce1d6: Merge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev

* commit 'e4c4d0f91977f57cfa87ae7ebab2fa9c2ff49a93':
  Now showing unlocked icon if both trusted and fingerprint running

9 years agoam d2c41457: Merge "Let\'s reinvent storage, yet again!" into mnc-dev
Jeff Sharkey [Fri, 26 Jun 2015 15:52:51 +0000 (15:52 +0000)]
am d2c41457: Merge "Let\'s reinvent storage, yet again!" into mnc-dev

* commit 'd2c414573242fc59a2d34f66f1dfb610ec7d59a3':
  Let's reinvent storage, yet again!

9 years agoam 018c33ce: am b84ace51: Merge "Fixed a crash where onTouch might have been called...
Selim Cinek [Fri, 26 Jun 2015 15:46:25 +0000 (15:46 +0000)]
am 018c33ce: am b84ace51: Merge "Fixed a crash where onTouch might have been called too early" into mnc-dev

* commit '018c33ce72feeba5e3ab28aa2c2eee5be5c0e3fb':
  Fixed a crash where onTouch might have been called too early

9 years agoam db82c17f: am eb4ce1d6: Merge "Now showing unlocked icon if both trusted and finger...
Selim Cinek [Fri, 26 Jun 2015 15:46:18 +0000 (15:46 +0000)]
am db82c17f: am eb4ce1d6: Merge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev

* commit 'db82c17fc958ee5fe0683e64a46d5ee4559fd0dc':
  Now showing unlocked icon if both trusted and fingerprint running

9 years agoMerge "Let's reinvent storage, yet again!" into mnc-dev
Jeff Sharkey [Fri, 26 Jun 2015 15:43:23 +0000 (15:43 +0000)]
Merge "Let's reinvent storage, yet again!" into mnc-dev

9 years agoam b84ace51: Merge "Fixed a crash where onTouch might have been called too early...
Selim Cinek [Fri, 26 Jun 2015 15:33:24 +0000 (15:33 +0000)]
am b84ace51: Merge "Fixed a crash where onTouch might have been called too early" into mnc-dev

* commit 'b84ace51b21b9b1d422e96ed023ef3860ca0710d':
  Fixed a crash where onTouch might have been called too early

9 years agoam eb4ce1d6: Merge "Now showing unlocked icon if both trusted and fingerprint running...
Selim Cinek [Fri, 26 Jun 2015 15:33:17 +0000 (15:33 +0000)]
am eb4ce1d6: Merge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev

* commit 'eb4ce1d6a3bfa99ec57604aa842835a381616346':
  Now showing unlocked icon if both trusted and fingerprint running

9 years agoMerge "make sysui comments gender neutral"
Chris Wren [Fri, 26 Jun 2015 15:27:49 +0000 (15:27 +0000)]
Merge "make sysui comments gender neutral"

9 years agoMerge "Fixed a crash where onTouch might have been called too early" into mnc-dev
Selim Cinek [Fri, 26 Jun 2015 15:26:22 +0000 (15:26 +0000)]
Merge "Fixed a crash where onTouch might have been called too early" into mnc-dev

9 years agoMerge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev
Selim Cinek [Fri, 26 Jun 2015 15:26:06 +0000 (15:26 +0000)]
Merge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev

9 years agomake sysui comments gender neutral
Chris Wren [Fri, 26 Jun 2015 15:26:03 +0000 (11:26 -0400)]
make sysui comments gender neutral

Change-Id: Ie494815e0b651ff120eda439a8fc1ad3461ce66c

9 years agoam 9539f76c: am b5d06f7a: am a2e0dc4d: Merge "Enforce FloatingToolbar themes." into...
Abodunrinwa Toki [Fri, 26 Jun 2015 15:20:58 +0000 (15:20 +0000)]
am 9539f76c: am b5d06f7a: am a2e0dc4d: Merge "Enforce FloatingToolbar themes." into mnc-dev

* commit '9539f76cba4359f4597e193d5eddf49614c5f629':
  Enforce FloatingToolbar themes.

9 years agoam e7fe26c9: am f513006c: am e171899a: Merge "Add JavaDoc for permission protection...
Svetoslav [Fri, 26 Jun 2015 15:20:50 +0000 (15:20 +0000)]
am e7fe26c9: am f513006c: am e171899a: Merge "Add JavaDoc for permission protection level" into mnc-dev

* commit 'e7fe26c94b46b6e8b4860ceaba46b95584e38914':
  Add JavaDoc for permission protection level

9 years agoam b805067f: am b886aa76: am c1bd7da9: Merge "Fix: Ellipsis is wrongly applied or...
Keisuke Kuroyanagi [Fri, 26 Jun 2015 15:20:43 +0000 (15:20 +0000)]
am b805067f: am b886aa76: am c1bd7da9: Merge "Fix: Ellipsis is wrongly applied or not applied in TextView." into mnc-dev

* commit 'b805067f057084b9241f20aef0526f8edfedc173':
  Fix: Ellipsis is wrongly applied or not applied in TextView.

9 years agoam 4ce47333: am 3178da6b: am 084b7a15: Merge "Do not show selection action mode when...
Seigo Nonaka [Fri, 26 Jun 2015 15:20:36 +0000 (15:20 +0000)]
am 4ce47333: am 3178da6b: am 084b7a15: Merge "Do not show selection action mode when the TextView is not shown." into mnc-dev

* commit '4ce47333d035728f7ab416e79dcfe3f7f3f6b1dd':
  Do not show selection action mode when the TextView is not shown.

9 years agoam c84e903b: am 467b7dfc: am f207285d: am ba12e226: am 0b5d0509: Merge "docs: Removed...
Robert Schaub [Fri, 26 Jun 2015 15:20:25 +0000 (15:20 +0000)]
am c84e903b: am 467b7dfc: am f207285d: am ba12e226: am 0b5d0509: Merge "docs: Removed sentence from permissions doc" into mnc-preview-docs

* commit 'c84e903b7f205166f63adaf0c9a308c0e78dec7d':
  docs: Removed sentence from permissions doc

9 years agoam b5d06f7a: am a2e0dc4d: Merge "Enforce FloatingToolbar themes." into mnc-dev
Abodunrinwa Toki [Fri, 26 Jun 2015 15:09:53 +0000 (15:09 +0000)]
am b5d06f7a: am a2e0dc4d: Merge "Enforce FloatingToolbar themes." into mnc-dev

* commit 'b5d06f7ab7bb19f39f74d8551c021a70568aaca5':
  Enforce FloatingToolbar themes.

9 years agoam f513006c: am e171899a: Merge "Add JavaDoc for permission protection level" into...
Svetoslav [Fri, 26 Jun 2015 15:09:47 +0000 (15:09 +0000)]
am f513006c: am e171899a: Merge "Add JavaDoc for permission protection level" into mnc-dev

* commit 'f513006c4b1905de59dc71b629d27b4adcf63cf1':
  Add JavaDoc for permission protection level

9 years agoam b886aa76: am c1bd7da9: Merge "Fix: Ellipsis is wrongly applied or not applied...
Keisuke Kuroyanagi [Fri, 26 Jun 2015 15:09:39 +0000 (15:09 +0000)]
am b886aa76: am c1bd7da9: Merge "Fix: Ellipsis is wrongly applied or not applied in TextView." into mnc-dev

* commit 'b886aa767ed67a7ce0ab2b82372a7b806c1ad02c':
  Fix: Ellipsis is wrongly applied or not applied in TextView.

9 years agoam 3178da6b: am 084b7a15: Merge "Do not show selection action mode when the TextView...
Seigo Nonaka [Fri, 26 Jun 2015 15:09:33 +0000 (15:09 +0000)]
am 3178da6b: am 084b7a15: Merge "Do not show selection action mode when the TextView is not shown." into mnc-dev

* commit '3178da6b57a44e137e5f2b904709d35467a64f82':
  Do not show selection action mode when the TextView is not shown.

9 years agoam 467b7dfc: am f207285d: am ba12e226: am 0b5d0509: Merge "docs: Removed sentence...
Robert Schaub [Fri, 26 Jun 2015 15:09:04 +0000 (15:09 +0000)]
am 467b7dfc: am f207285d: am ba12e226: am 0b5d0509: Merge "docs: Removed sentence from permissions doc" into mnc-preview-docs

* commit '467b7dfcbfb1bf9d4f6dee51e2f8feb87598e3fc':
  docs: Removed sentence from permissions doc

9 years agoam a2e0dc4d: Merge "Enforce FloatingToolbar themes." into mnc-dev
Abodunrinwa Toki [Fri, 26 Jun 2015 05:32:50 +0000 (05:32 +0000)]
am a2e0dc4d: Merge "Enforce FloatingToolbar themes." into mnc-dev

* commit 'a2e0dc4d20be14ea106b44067cc782774d90df3b':
  Enforce FloatingToolbar themes.

9 years agoam e171899a: Merge "Add JavaDoc for permission protection level" into mnc-dev
Svetoslav [Fri, 26 Jun 2015 05:32:45 +0000 (05:32 +0000)]
am e171899a: Merge "Add JavaDoc for permission protection level" into mnc-dev

* commit 'e171899ac8007160eee199eaa6c840fae40dfba7':
  Add JavaDoc for permission protection level

9 years agoMerge "Enforce FloatingToolbar themes." into mnc-dev
Abodunrinwa Toki [Fri, 26 Jun 2015 05:26:38 +0000 (05:26 +0000)]
Merge "Enforce FloatingToolbar themes." into mnc-dev

9 years agoLet's reinvent storage, yet again!
Jeff Sharkey [Wed, 24 Jun 2015 22:24:48 +0000 (15:24 -0700)]
Let's reinvent storage, yet again!

Now that we're treating storage as a runtime permission, we need to
grant read/write access without killing the app.  This is really
tricky, since we had been using GIDs for access control, and they're
set in stone once Zygote drops privileges.

The only thing left that can change dynamically is the filesystem
itself, so let's do that.  This means changing the FUSE daemon to
present itself as three different views:

/mnt/runtime_default/foo - view for apps with no access
/mnt/runtime_read/foo - view for apps with read access
/mnt/runtime_write/foo - view for apps with write access

There is still a single location for all the backing files, and
filesystem permissions are derived the same way for each view, but
the file modes are masked off differently for each mountpoint.

During Zygote fork, it wires up the appropriate storage access into
an isolated mount namespace based on the current app permissions.  When
the app is granted permissions dynamically at runtime, the system
asks vold to jump into the existing mount namespace and bind mount
the newly granted access model into place.

Bug: 21858077
Change-Id: I62fb25d126dd815aea699b33d580e3afb90f8fd2

9 years agoMerge "Add JavaDoc for permission protection level" into mnc-dev
Svetoslav [Fri, 26 Jun 2015 05:24:41 +0000 (05:24 +0000)]
Merge "Add JavaDoc for permission protection level" into mnc-dev

9 years agoam c1bd7da9: Merge "Fix: Ellipsis is wrongly applied or not applied in TextView....
Keisuke Kuroyanagi [Fri, 26 Jun 2015 05:20:38 +0000 (05:20 +0000)]
am c1bd7da9: Merge "Fix: Ellipsis is wrongly applied or not applied in TextView." into mnc-dev

* commit 'c1bd7da9906bc95c791dec6d52508fc9ee916a99':
  Fix: Ellipsis is wrongly applied or not applied in TextView.

9 years agoam 084b7a15: Merge "Do not show selection action mode when the TextView is not shown...
Seigo Nonaka [Fri, 26 Jun 2015 05:20:33 +0000 (05:20 +0000)]
am 084b7a15: Merge "Do not show selection action mode when the TextView is not shown." into mnc-dev

* commit '084b7a15c9a1bdbbb64d9921eaeb12235bc5fc17':
  Do not show selection action mode when the TextView is not shown.

9 years agoMerge "Fix: Ellipsis is wrongly applied or not applied in TextView." into mnc-dev
Keisuke Kuroyanagi [Fri, 26 Jun 2015 05:11:22 +0000 (05:11 +0000)]
Merge "Fix: Ellipsis is wrongly applied or not applied in TextView." into mnc-dev

9 years agoMerge "Do not show selection action mode when the TextView is not shown." into mnc-dev
Seigo Nonaka [Fri, 26 Jun 2015 05:10:33 +0000 (05:10 +0000)]
Merge "Do not show selection action mode when the TextView is not shown." into mnc-dev

9 years agoFix issue #22013372: Assist should take translationX and friends...
Dianne Hackborn [Tue, 23 Jun 2015 19:33:02 +0000 (19:33 +0000)]
Fix issue #22013372: Assist should take translationX and friends...

...into account when calculating the position information

Actually what we need here is the full transformation matrix, if it
is available.  And that means actually computing the location of
views on the screen requires doing this all through transformations,
so the AssistVisualizer has been changed to do this (while still
also keeping the old mechanism for comparison to verify that things
are working correctly).

Also added new properties for elevation and alpha.

And optimized the parcelling of AssistStructure to not write things
that aren't needed; this reduces the parcelled size by about half.

Change-Id: I50b0dd2e6599c74701a5d188617a3eff64b07d03

9 years agoam f207285d: am ba12e226: am 0b5d0509: Merge "docs: Removed sentence from permissions...
Robert Schaub [Fri, 26 Jun 2015 02:34:26 +0000 (02:34 +0000)]
am f207285d: am ba12e226: am 0b5d0509: Merge "docs: Removed sentence from permissions doc" into mnc-preview-docs

* commit 'f207285d8d813730683b0c099edff84ac0b13244':
  docs: Removed sentence from permissions doc

9 years agoam ba12e226: am 0b5d0509: Merge "docs: Removed sentence from permissions doc" into...
Robert Schaub [Fri, 26 Jun 2015 02:23:09 +0000 (02:23 +0000)]
am ba12e226: am 0b5d0509: Merge "docs: Removed sentence from permissions doc" into mnc-preview-docs

* commit 'ba12e226981216116de772739165ace65fe59d5b':
  docs: Removed sentence from permissions doc

9 years agoAdd JavaDoc for permission protection level
Svetoslav [Fri, 26 Jun 2015 01:19:14 +0000 (18:19 -0700)]
Add JavaDoc for permission protection level

1. Add the permission protection level in the java doc

2. Make some system permissions that are not mean to be
   used by third-parties system API.

bug:21402257

Change-Id: Ic0ae8d6ca44dbbbf12848a9164acc0e908c90402

9 years agoFixed a crash where onTouch might have been called too early
Selim Cinek [Fri, 26 Jun 2015 00:15:33 +0000 (20:15 -0400)]
Fixed a crash where onTouch might have been called too early

Bug: 21906153
Change-Id: I1fbc8b29f9cb0d7d71d6cb81e95a35da2fe9959e

9 years agoDon't promote functors onto layers due to outline rect clipping
Chris Craik [Fri, 26 Jun 2015 00:15:16 +0000 (17:15 -0700)]
Don't promote functors onto layers due to outline rect clipping

bug:21320333

Change-Id: Ie70982c88498395148dab6eaca861de66e6207ed

9 years agoNow showing unlocked icon if both trusted and fingerprint running
Selim Cinek [Thu, 25 Jun 2015 23:44:05 +0000 (19:44 -0400)]
Now showing unlocked icon if both trusted and fingerprint running

Bug: 21781452
Change-Id: I7b04975b36f7a135358cdd68c1bdae1e73f22cc0

9 years agoam c9ea3834: am 8fc84d73: am 9206d6a0: Merge "Fix logic for whether beginning/end...
Doris Liu [Thu, 25 Jun 2015 23:08:32 +0000 (23:08 +0000)]
am c9ea3834: am 8fc84d73: am 9206d6a0: Merge "Fix logic for whether beginning/end divider should be drawn" into mnc-dev

* commit 'c9ea3834982d6a5ae6d6e0589d0cccc97337df88':
  Fix logic for whether beginning/end divider should be drawn

9 years agoam 8043ea5f: am ba654e6c: am 91617a79: Hide assist when launching an activity over...
Jorim Jaggi [Thu, 25 Jun 2015 23:08:26 +0000 (23:08 +0000)]
am 8043ea5f: am ba654e6c: am 91617a79: Hide assist when launching an activity over an action

* commit '8043ea5f8c76e1f0ab34d25f3482d122a1cf833a':
  Hide assist when launching an activity over an action

9 years agoam 6457e8a2: am 37a2b992: am 7e6571f1: Use long press of KeyButtonView to invoke...
Jorim Jaggi [Thu, 25 Jun 2015 23:08:20 +0000 (23:08 +0000)]
am 6457e8a2: am 37a2b992: am 7e6571f1: Use long press of KeyButtonView to invoke assist

* commit '6457e8a223e50eadca9e999503c3358c9eddf911':
  Use long press of KeyButtonView to invoke assist

9 years agoam 7435a1a3: am 0884cd11: am 9a600725: Merge "Don\'t throw TransactionTooLargeExcepti...
Christopher Tate [Thu, 25 Jun 2015 23:08:13 +0000 (23:08 +0000)]
am 7435a1a3: am 0884cd11: am 9a600725: Merge "Don\'t throw TransactionTooLargeException for small payloads" into mnc-dev

* commit '7435a1a384790ef687678881a048e733785869c8':
  Don't throw TransactionTooLargeException for small payloads

9 years agoam 8fc84d73: am 9206d6a0: Merge "Fix logic for whether beginning/end divider should...
Doris Liu [Thu, 25 Jun 2015 22:55:28 +0000 (22:55 +0000)]
am 8fc84d73: am 9206d6a0: Merge "Fix logic for whether beginning/end divider should be drawn" into mnc-dev

* commit '8fc84d733c992e361f542eddf3f0770be2ba27a1':
  Fix logic for whether beginning/end divider should be drawn

9 years agoam ba654e6c: am 91617a79: Hide assist when launching an activity over an action
Jorim Jaggi [Thu, 25 Jun 2015 22:55:22 +0000 (22:55 +0000)]
am ba654e6c: am 91617a79: Hide assist when launching an activity over an action

* commit 'ba654e6c0408951d24d65019626fd6da0e696bac':
  Hide assist when launching an activity over an action

9 years agoam 37a2b992: am 7e6571f1: Use long press of KeyButtonView to invoke assist
Jorim Jaggi [Thu, 25 Jun 2015 22:55:16 +0000 (22:55 +0000)]
am 37a2b992: am 7e6571f1: Use long press of KeyButtonView to invoke assist

* commit '37a2b9929a1fd9298b64e740a832c29c63b1a414':
  Use long press of KeyButtonView to invoke assist

9 years agoam 0884cd11: am 9a600725: Merge "Don\'t throw TransactionTooLargeException for small...
Christopher Tate [Thu, 25 Jun 2015 22:55:11 +0000 (22:55 +0000)]
am 0884cd11: am 9a600725: Merge "Don\'t throw TransactionTooLargeException for small payloads" into mnc-dev

* commit '0884cd113d07f87d4223c1ab3bbe79481cf86492':
  Don't throw TransactionTooLargeException for small payloads

9 years agoam 1ffeb7bf: am 77f9e5dc: am d5b18387: Merge "Ensure partially-detached AbsListView...
Alan Viverette [Thu, 25 Jun 2015 22:54:51 +0000 (22:54 +0000)]
am 1ffeb7bf: am 77f9e5dc: am d5b18387: Merge "Ensure partially-detached AbsListView children are removed" into mnc-dev

* commit '1ffeb7bf9e4f9ba61fd603851a867a13c6a519d5':
  Ensure partially-detached AbsListView children are removed

9 years agoam 2f73c3c2: am af13d3b0: am 826bf9b6: Merge "media: parse max-concurrent-instances...
Ronghua Wu [Thu, 25 Jun 2015 22:54:44 +0000 (22:54 +0000)]
am 2f73c3c2: am af13d3b0: am 826bf9b6: Merge "media: parse max-concurrent-instances." into mnc-dev

* commit '2f73c3c2d9da5f229a987e46399846d4e7d488be':
  media: parse max-concurrent-instances.

9 years agoam 9206d6a0: Merge "Fix logic for whether beginning/end divider should be drawn"...
Doris Liu [Thu, 25 Jun 2015 22:50:19 +0000 (22:50 +0000)]
am 9206d6a0: Merge "Fix logic for whether beginning/end divider should be drawn" into mnc-dev

* commit '9206d6a0e69ef0f60e20464796d4a2da6f7c42f4':
  Fix logic for whether beginning/end divider should be drawn

9 years agoam 91617a79: Hide assist when launching an activity over an action
Jorim Jaggi [Thu, 25 Jun 2015 22:50:14 +0000 (22:50 +0000)]
am 91617a79: Hide assist when launching an activity over an action

* commit '91617a793ed6a80f3abfd3653b0f74b9321fe0f6':
  Hide assist when launching an activity over an action