Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
212,489 Commits 3 Branches 0 Tags
58efce36cd1b26006e08ddd696292bf06fc34c81
Commit Graph

56950 Commits

Author SHA1 Message Date
Nicolas Prévot
be8b98b939 Merge "Allow non-owner users to have managed profiles." 2015-08-20 14:48:18 +00:00
Clara Bayarri
3014e63f08 Merge "Hook up Ctrl + '/' to SysUI for a Keyboard Shortcuts screen" 2015-08-20 14:19:05 +00:00
Clara Bayarri
f2debb1f9a Hook up Ctrl + '/' to SysUI for a Keyboard Shortcuts screen 
This CL adds the necessary hooks between PhoneWindowManager
and SysUI to show a keyboard shortcuts screen given a specific
shortcut combination. SysUI for now just shows a Toast.

Change-Id: Icf43a81776b04a2e96a540f45b7cd3464342d679
 2015-08-20 15:11:10 +01:00
Nicolas Prevot
b818681dca Allow non-owner users to have managed profiles. 
In the split system user model:
The only users that are not allowed to have managed profiles are:
- purely system user (user 0)
- guest users
- restricted profiles
- managed profiles

In the non-split system user model, the behavior does not change:
only the primary user can have managed profiles.

BUG:22956426
Change-Id: If908c30f110fd3e740770174f050c9b6cf87ce1b
 2015-08-20 14:15:19 +01:00
Nicolas Prevot
741abfc120 Fix cross-profile intent filters with system-user split. 
Don't assume that the parent is always the user owner.

BUG:23105562
Change-Id: Ia98ed608e2b6d1d82d95a73110134d85274c6abf
 2015-08-20 12:14:37 +00:00
Florian Salbrechter
30c3c09071 Merge "Fix wrong javadoc in BluetoothAdapter." 2015-08-20 09:29:29 +00:00
Bart Sears
3b1c32eb5d Merge "Revert "Simplify TextureView draw path"" 2015-08-20 02:25:30 +00:00
Bart Sears
d35dcb1311 Revert "Simplify TextureView draw path" 
This reverts commit 20a248934c.

Change-Id: Iaa3ebb1d868acbe184080087aec312b43e87e3c7
 2015-08-20 02:23:39 +00:00
Jeff Sharkey
36d4aaeb6e am 39c49625: am e6983e87: am cd6ba412: am bbb5717d: am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 
* commit '39c4962580a52d5ca07f3576009564dddc8f4624':
  Pass underlying volume UUID to StorageVolume.
 2015-08-20 01:59:19 +00:00
Jeff Sharkey
39c4962580 am e6983e87: am cd6ba412: am bbb5717d: am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 
* commit 'e6983e877888dd51abe090b75fa568a64e9fc16e':
  Pass underlying volume UUID to StorageVolume.
 2015-08-20 01:57:52 +00:00
Jeff Sharkey
cd6ba4120c am bbb5717d: am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 
* commit 'bbb5717dee12ec37e0fcc6c186e1f80b9890e987':
  Pass underlying volume UUID to StorageVolume.
 2015-08-20 01:44:05 +00:00
Jeff Sharkey
bbb5717dee am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 
* commit 'f3ad1eabc1fa5252165bfe1516690d1026507f0a':
  Pass underlying volume UUID to StorageVolume.
 2015-08-20 01:33:59 +00:00
Jeff Sharkey
f3ad1eabc1 Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 2015-08-20 01:28:30 +00:00
Chris Craik
87f9c42f54 Merge "Simplify TextureView draw path" 2015-08-20 00:02:09 +00:00
Chris Craik
20a248934c Simplify TextureView draw path 
bug:20461288

Change-Id: I239fbd26ab2177481c84feb62a1da68faeb634ac
 2015-08-19 16:59:45 -07:00
Stefan Kuhne
952d3c1e1f Merge "Adding move window functionality for free form desktop" 2015-08-19 23:36:23 +00:00
Chris Craik
571663bfd6 Merge "Throw exception when setting a fg/bg on TextureView" 2015-08-19 23:26:54 +00:00
Chris Craik
2e931eae35 Throw exception when setting a fg/bg on TextureView 
Change-Id: Iead53e0947d941ebc1331f77fc478c475e24c812
 2015-08-19 16:13:04 -07:00
Roozbeh Pournader
5afe8f2089 Merge "Add first implementation of LocaleList." 2015-08-19 22:38:24 +00:00
Roozbeh Pournader
0ba0d6bb18 Add first implementation of LocaleList. 
This is a first implementation, just to get the basics in, so we can
experiement with how the system would interact with locale lists.

Change-Id: I75d386f24f693c6c1bdefc9386a7142aec2de37c
 2015-08-19 15:31:08 -07:00
Skuhne
81c524a664 Adding move window functionality for free form desktop 
This patch adds the capability to move / drag a floating window on
the desktop when it has a non client decor capition.

It also adds the framework necessary adjustments to keep the window
in a visible area without relayout'ing the window upon move.

Bug: 21738328
Bug: 23176762
Change-Id: I0927e98902d8172f58d21c19c249936a81181678
 2015-08-19 21:33:01 +00:00
Lorenzo Colitti
e0938bed96 am a5bfd73a: am ab5e962e: am d7121f56: am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit 'a5bfd73ab683d3310ee3ce31d7ad3edb656aa858':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:23:03 +00:00
Filip Gruszczynski
6c8b36f767 Merge "Improve animating from recents to multi window state." 2015-08-19 21:21:03 +00:00
Jeff Sharkey
8e2ea2a9f1 Pass underlying volume UUID to StorageVolume. 
To help MediaProvider uniquely identify storage devices, pass through
the UUID of the underlying private storage volume.

Bug: 23329611
Change-Id: I22ee7ea98fcb208d7797310acb3396a3f074f09b
 2015-08-19 14:16:05 -07:00
Lorenzo Colitti
a5bfd73ab6 am ab5e962e: am d7121f56: am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit 'ab5e962e1dd05799980342757edd8e83f4a76a8e':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:15:22 +00:00
Chien-Yu Chen
b6aa2fdb5d am 84551d61: am 6fdab993: am 86d86c2e: am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev 
* commit '84551d61fd4942aa4afb677ea3ae6ce7674c866c':
  Camera2: Handle surface size change
 2015-08-19 21:07:43 +00:00
Chien-Yu Chen
84551d61fd am 6fdab993: am 86d86c2e: am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev 
* commit '6fdab993919a1784676782ad1c67068a7f8a7fdc':
  Camera2: Handle surface size change
 2015-08-19 21:02:37 +00:00
Lorenzo Colitti
d7121f5651 am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit '0257c82fa122243e97e4a1f4ef4bc4b8c21bd692':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:01:33 +00:00
Lorenzo Colitti
0257c82fa1 am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit '11e84bde9e98cb4b777a67208989d259883e9375':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 20:54:48 +00:00
Lorenzo Colitti
11e84bde9e Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into mnc-dev 2015-08-19 20:48:31 +00:00
Chien-Yu Chen
86d86c2e7c am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev 
* commit 'c3aa7f3a7564f36db58d8a9a5470fd64f6fa282b':
  Camera2: Handle surface size change
 2015-08-19 20:48:27 +00:00
Chien-Yu Chen
c3aa7f3a75 Merge "Camera2: Handle surface size change" into mnc-dr-dev 2015-08-19 20:40:11 +00:00
Filip Gruszczynski
170192ab55 Improve animating from recents to multi window state. 
Previously all windows would start animating from a single thumbnail
that was clicked. Now each animates from its thumbnail, including
properly animating the thumbnail header. This involves System UI
providing information about the thumbnail setup and app transition code
using it to setup each individual animation.

Change-Id: I6f45c94af6bcbf6898b8ed757d83505af99ed6b1
 2015-08-19 12:20:46 -07:00
Dianne Hackborn
e264f9a51e am 5a1234fa: am 81b4616f: am aa8c876e: am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '5a1234fabf73224d107ce0715682728b35357203':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 19:01:16 +00:00
Dianne Hackborn
5a1234fabf am 81b4616f: am aa8c876e: am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '81b4616f9f8ecf1be2db999acbd8504c33201eb9':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:53:24 +00:00
Dianne Hackborn
aa8c876e1d am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '5c577bab3b4cd9bf74a09368be5d73aed627f6a5':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:39:56 +00:00
Xiaohui Chen
98404fdc0b Clean up USER_OWNER reference. 
Bug: 19913735
Change-Id: I441672b360fa0fff5453f72c88f9577b5cc8eecf
 2015-08-19 18:34:46 +00:00
Dianne Hackborn
5c577bab3b am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '29cd880890825ce15a1b2da977bcb1796db6f4e3':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:31:20 +00:00
Alan Viverette
f52b66588f Merge "Ensure layout resolution occurs when relative rules are removed" 2015-08-19 18:30:27 +00:00
Alan Viverette
6bc3cab958 Merge "Allow ExploreByTouchHelper client to populate node/event for host" 2015-08-19 17:39:18 +00:00
Paul Jensen
aae613d961 Don't mark NetworkRequests restricted when they don't have restricted caps 
Requests without NET_CAPABILITIES_INTERNET and just the default network
capabilities should not be marked restricted.  Without this fix apps
can hit permissions exceptions if they inadvertently make requests
without NET_CAPABILITIES_INTERNET.

Bug:23164917
Change-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6
 2015-08-19 11:08:38 -04:00
Alan Viverette
0dcb9e81e2 Merge "Save and restore accessibility focus using decor view" 2015-08-19 14:37:03 +00:00
Alan Viverette
4cbd3ac740 Save and restore accessibility focus using decor view 
Also avoids potential NPE when decor view is null or has no view root.

Bug: 23316836
Change-Id: Iccf75ddc0e4c769a234f5b80bc0707631c2719a2
 2015-08-19 10:07:29 -04:00
Derek Sollenberger
55f4445013 Merge "Add ninePatch support to Canvas.h" 2015-08-19 13:10:40 +00:00
Jim Miller
4ea5152bd8 am 849b9e58: am ce6fb7bb: am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev 
* commit '849b9e58d6775a393f7d86a6305b658c6af9d16f':
  Reset fingerprint lockout timer when strong auth is used.
 2015-08-19 02:21:58 +00:00
Jim Miller
849b9e58d6 am ce6fb7bb: am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev 
* commit 'ce6fb7bba967a9b33e5d3afe60fff66c5b2ca034':
  Reset fingerprint lockout timer when strong auth is used.
 2015-08-19 01:43:12 +00:00
Dianne Hackborn
865b79b43b Fix issue #23326715: Clarify --checkin/-c options in batterystats 
Change-Id: I3f026447ba7c6d2c3f9ef065269c31a78cf73512
 2015-08-18 17:33:00 -07:00
Chong Zhang
aa1fd4e6d3 Merge "Restore recent task to freeform space when resizing" 2015-08-18 23:55:07 +00:00
Jim Miller
7ef772713f am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev 
* commit 'bea9d7b94cfa16da8f257ed705e218b017d459a7':
  Reset fingerprint lockout timer when strong auth is used.
 2015-08-18 23:18:36 +00:00
Chien-Yu Chen
828adbba24 Camera2: Handle surface size change 
When comparing if two OutputConfigurations are equal, also check
the width, height, format, dataspace when the output configurations
were created. With this, CameraDeviceImpl knows that the surface has
changed sizes and will reconfigure the stream.

Bug: 12250682
Change-Id: Ie5965d242b2017b87a76d26cdc2f6b700082e002
 2015-08-18 16:06:54 -07:00