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

54258 Commits

Author SHA1 Message Date
Svetoslav Ganov
7c3d595a3d am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit '4b655fd193992afff948df513c7b9b9a0389972e':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:19:47 +00:00
Svetoslav Ganov
4b655fd193 am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit 'b045331fcb033507072bfd7899a147bb2be7176e':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:13:38 +00:00
Svetoslav Ganov
b045331fcb Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 2015-08-14 15:06:16 +00:00
Jeff Sharkey
d28991a5e4 am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev 
* commit 'b6f5bcd0c64676ad2dfddc9dcf4c4320fafb9d3a':
  Method to show DialogFragment allowing state loss.
 2015-08-14 01:35:40 +00:00
Jeff Sharkey
b6f5bcd0c6 am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev 
* commit 'cfcf6af915bee878bdaea04f48592bbbe506ad26':
  Method to show DialogFragment allowing state loss.
 2015-08-14 01:24:44 +00:00
Jeff Sharkey
cfcf6af915 Merge "Method to show DialogFragment allowing state loss." into mnc-dev 2015-08-14 01:18:18 +00:00
Jeff Sharkey
063f850060 Method to show DialogFragment allowing state loss. 
Same as show(), but allowing state loss.

Bug: 22867250
Change-Id: Ib779d8a3febc70ad47a9c1a9099d858707bad733
 2015-08-13 16:57:29 -07:00
Wei Liu
d6fb8958d2 Merge "Add a setting to enable cellular on boot." into cw-e-dev 2015-08-13 22:35:43 +00:00
Svet Ganov
52153f4c05 Add GTS test to ensure valid default permission grants - framework 
The platform grants runtime permissions by default to apps on the
system image that provide core device use cases which a user expects
to work out-of-the-box. We are now adding a test to ensure that
OEMs cannot pregrant premissions on non approved components.

bug:23043018

Change-Id: Id76717cce0ee59678956bd0be347d3c045fe4c51
 2015-08-12 21:57:59 -07:00
Dianne Hackborn
a54d4583ec am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit '9512a857454d761b53f46958733ba23216c41e64':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 01:02:26 +00:00
Dianne Hackborn
9512a85745 am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit 'ff9912d594bc5cdc10a4a224b9a2296bac50851b':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 00:54:35 +00:00
Dianne Hackborn
ff9912d594 Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:59 +00:00
Dianne Hackborn
c3f7449517 Fix issue #23116383: Include security patch level in Settings 
Change-Id: I4934c7d26bf69b5c599962cd74ac1e4ea4ad4b51
 2015-08-12 16:10:58 -07:00
Raph Levien
855a862f6d am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 
* commit 'c98a786c693bf0bb617348e858ffe720db4d96d8':
  Fix Insertion ActionMode not showing on RTL languages
 2015-08-12 21:13:32 +00:00
Raph Levien
c98a786c69 am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 
* commit 'beabcb92cbdec6f68bd712c9972e6f8377b78f46':
  Fix Insertion ActionMode not showing on RTL languages
 2015-08-12 21:07:43 +00:00
Raph Levien
beabcb92cb Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 2015-08-12 21:00:07 +00:00
Eino-Ville Talvala
6986410a59 am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 
* commit '5679800f382918bb3ca159997609fc551f2a739a':
  Camera: Fix framework bugs with DEPTH-only camera devices
 2015-08-12 20:32:53 +00:00
Eino-Ville Talvala
5679800f38 am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 
* commit '242ff8a89d851cc5c53b11dadd871fa55e00fbb5':
  Camera: Fix framework bugs with DEPTH-only camera devices
 2015-08-12 20:18:46 +00:00
Clara Bayarri
f95ed10d9d Fix Insertion ActionMode not showing on RTL languages 
When long pressing on an empty Text field with the system language set
to RTL, the "paste" popup was not showing up.

The Floating Toolbar requires a content rect to determine where the
text is and place itself close to it. In the case of an empty field,
we create a "fake" content rect by taking the placement of the cursor
+1 pixel to the right. In RTL languages, this +1 causes the content
rect to be considered off the bounds of the view, as the cursor is
aligned to the right, and hence the Floating Toolbar is hidden.

After making the rect a 0 width rect, we ran into the issue that
it was considered out of bounds due to the calculation ignoring rects
that simply touch the edge of the view's bounds.

BUG: 22540083
Change-Id: I29c79b701f586970b2611178233eff082b802ec1
 2015-08-12 21:03:28 +01:00
Eino-Ville Talvala
242ff8a89d Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 2015-08-12 20:01:44 +00:00
Adrian Roos
afdfc2c04d am 192ca56d: am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev 
* commit '192ca56d7a0c8a1a776bd8f9539c49f4b8ce3372':
  Prevent overlap of color views in landscape
 2015-08-12 18:26:49 +00:00
Adrian Roos
192ca56d7a am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev 
* commit 'c0a4883d58554c84d10911da20f43be149b47c53':
  Prevent overlap of color views in landscape
 2015-08-12 18:16:32 +00:00
Adrian Roos
c0a4883d58 Merge "Prevent overlap of color views in landscape" into mnc-dev 2015-08-12 18:06:42 +00:00
Wei Liu
a181770f35 Add a setting to enable cellular on boot. 
b/22804423

Change-Id: Ifcee3a2a8bfbfab366c3f9dcd8926d500851bd32
 2015-08-12 10:02:06 -07:00
Dianne Hackborn
e92b137407 am ea5ce408: am 15f704e7: Merge "Fix issue #23122445: Add 420 density" into mnc-dev 
* commit 'ea5ce4080be58a8092df38a49d828e4281497dc4':
  Fix issue #23122445: Add 420 density
 2015-08-12 00:44:12 +00:00
Dianne Hackborn
ea5ce4080b am 15f704e7: Merge "Fix issue #23122445: Add 420 density" into mnc-dev 
* commit '15f704e70a0fc02f50f0b618b19147ca09c5e421':
  Fix issue #23122445: Add 420 density
 2015-08-12 00:37:25 +00:00
Adrian Roos
fe836fabd9 Prevent overlap of color views in landscape 
Removes overlap from the color views which resulted in subotimal looks
when both color views were translucent and the nav bar was on the right
edge.

Also fixes a bug introduced in I2df7092a91eceeb815367ef917dd7289f4f2b27e
where the navigation-bar-on-right-side case got forgotten and caused
flickering in landscape when IMMERSIVE_STICKY was set but the navigation bar
was visible.

Bug: 22876533
Change-Id: I449a82eb3dc3f7b5051f26b37b362a196b4ff63a
 2015-08-11 17:36:43 -07:00
Dianne Hackborn
15f704e70a Merge "Fix issue #23122445: Add 420 density" into mnc-dev 2015-08-12 00:34:56 +00:00
Dianne Hackborn
1e9c51a00a Fix issue #23122445: Add 420 density 
Change-Id: I15c113eb7e22f1d882db071c007224746f9d408f
 2015-08-11 17:18:53 -07:00
Zach Johnson
6d7af4b795 Merge "DO NOT MERGE Allow a custom component to handle network policy notifications" into cw-e-dev 2015-08-11 23:14:24 +00:00
Zach Johnson
143ebdb94e DO NOT MERGE Allow a custom component to handle network policy notifications 
Broadcasts information about network policy notifications
to a custom component, if specified, so it can handle them.

Also exposes an API to snooze warning notifications.

Change-Id: Ic89478fa437861e2d4b6a9443858bcaf12122fba
 2015-08-11 15:36:06 -07:00
Eino-Ville Talvala
72064af7e7 Camera: Fix framework bugs with DEPTH-only camera devices 
Mostly due to no standard stream configurations being defined,
and for the correct overrides for DEPTH_POINT_CLOUD format.

Bug: 20537722
Change-Id: I8a18f5f68697a09dcc4d7555e51728193fe7f333
 2015-08-11 15:04:56 -07:00
Alan Viverette
f3d04cbfe6 am bb03bf05: am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev 
* commit 'bb03bf055437c21180026b8c8227c52ca2809286':
  Don't re-wrap alert dialog context
 2015-08-11 19:48:00 +00:00
Alan Viverette
bb03bf0554 am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev 
* commit '105febd2cfb4760926ed0aef3c24be3727dd36e4':
  Don't re-wrap alert dialog context
 2015-08-11 19:41:40 +00:00
Alan Viverette
105febd2cf Merge "Don't re-wrap alert dialog context" into mnc-dev 2015-08-11 19:34:27 +00:00
Alan Viverette
93d9e26ffb Don't re-wrap alert dialog context 
Bug: 23038618
Change-Id: Iafe3a45096153d9fe656ad930cc3978d8fab1968
 2015-08-11 15:02:42 -04:00
Alan Viverette
6c3a468cf3 am e720297f: am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 
* commit 'e720297fd89d39325a34f0d8f54e55971aec7269':
  Avoid use-after-free race condition when rebasing theme
 2015-08-11 18:38:21 +00:00
Alan Viverette
e720297fd8 am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 
* commit 'b4eb06402fba62f94bb16cbe433fe99a8df7cb18':
  Avoid use-after-free race condition when rebasing theme
 2015-08-11 18:31:48 +00:00
Alan Viverette
b4eb06402f Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 2015-08-11 18:24:04 +00:00
Alan Viverette
c12ec70def Avoid use-after-free race condition when rebasing theme 
... by never rebasing the theme. We don't need to do this unless the
system theme is configuration-dependent, which it is not currently.

Bug: 22943781
Change-Id: I96e695441543379e4d5fdf3cc6f18d9e6cf953b4
 2015-08-11 10:26:08 -04:00
Jason Monk
c7789c3ecb am 36052477: Merge "Add setting to disable camera gesture" into mnc-dr-dev 
* commit '36052477465f51a4c690e4e8dfb290fb15ce88b0':
  Add setting to disable camera gesture
 2015-08-11 14:02:42 +00:00
Jason Monk
3605247746 Merge "Add setting to disable camera gesture" into mnc-dr-dev 2015-08-11 13:55:53 +00:00
Esteban Talavera
8e85fdfe46 am 467951ee: am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev 
* commit '467951eebbc6525b40a6b569c401849fe2394c1d':
  Update setApplicationRestrictions documentation
 2015-08-11 10:16:36 +00:00
Esteban Talavera
467951eebb am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev 
* commit '4dbb37ae95bdf60d230777c6a5e8d53b932e9d40':
  Update setApplicationRestrictions documentation
 2015-08-11 10:08:51 +00:00
Esteban Talavera
4dbb37ae95 Merge "Update setApplicationRestrictions documentation" into mnc-dev 2015-08-11 09:40:57 +00:00
Dianne Hackborn
09e77852d8 am 5cf89a01: am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev 
* commit '5cf89a011932f1af9361e7b713e33ff5c5af3e61':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
 2015-08-11 00:28:20 +00:00
Dianne Hackborn
5cf89a0119 am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev 
* commit 'b2b020922fb51b88d34a6478209fc232702de318':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
 2015-08-11 00:19:44 +00:00
Dianne Hackborn
c7b57b1e65 Fix issue #23037899: Support for Battery Optimization permission + Dialog 
New permission, new Intent action.

Change-Id: I1d9ba55be8f72074e29d33ad7a0a12a820bbac39
 2015-08-10 14:52:52 -07:00
Esteban Talavera
6b8e06495b Update setApplicationRestrictions documentation 
From M we support nested Bundles in the input parameter

Bug: 23076454
Change-Id: I9c27d19ccfbc713ca757cbdde7ea9fbbc3839302
 2015-08-10 18:04:10 +01:00
Torne (Richard Coles)
20272bec66 am c207c943: am c5283927: Close ZipFiles correctly in WebViewFactory. 
* commit 'c207c9437d5e15baaa7add776cff2cfb2e3d22c8':
  Close ZipFiles correctly in WebViewFactory.
 2015-08-10 16:08:32 +00:00