Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,654 Commits 3 Branches 0 Tags
76d50fc5d6148f31d46d6bd514ee14028faedbb6
Commit Graph

43119 Commits

Author SHA1 Message Date
Jason Monk
76d50fc5d6 am e6ecfca2: am 45959a5e: Merge "Fix SOCKS proxies from being dropped from PAC" into lmp-dev 
* commit 'e6ecfca245c8a5859f4566e42732d41579cff118':
  Fix SOCKS proxies from being dropped from PAC
 2014-08-21 03:07:45 +00:00
Adam Powell
6c6f99dc20 am 3f0554bf: am c33bc746: Merge "Unify code paths for collapsing action views in action bars" into lmp-dev 
* commit '3f0554bfbe12e96545adc227f22739c48eb8b93e':
  Unify code paths for collapsing action views in action bars
 2014-08-21 03:06:34 +00:00
Jeff Davidson
814c033d38 am d217efb9: am 709941fd: Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev 
* commit 'd217efb9da55bbdbb69bd33cb88531cb7c1ce76b':
  Less intrusive VPN dialog and other UX tweaks.
 2014-08-21 03:01:44 +00:00
Amith Yamasani
58201d9a8b am 614e4635: am d5d82cf3: Merge "Add a hidden method to query profile owner name for a user" into lmp-dev 
* commit '614e4635ee6f6316736384cf174dd6ca4f18c6b6':
  Add a hidden method to query profile owner name for a user
 2014-08-21 03:00:21 +00:00
John Reck
e4ed4f74d1 am 17ed6e74: am 876f1a1a: Merge "Implement full View.buildLayer" into lmp-dev 
* commit '17ed6e74ce560916d4a06198d4f6446562d9db34':
  Implement full View.buildLayer
 2014-08-21 03:00:11 +00:00
Adam Powell
06716eda04 am cc448e10: am 7ad2d5b4: Merge "Correctly populate title for ResolverActivity" into lmp-dev 
* commit 'cc448e102bae06bcd2f9d1d1e59013f531f09a3e':
  Correctly populate title for ResolverActivity
 2014-08-21 00:45:09 +00:00
Jeff Sharkey
28d57a5e6c am 54a521e9: am 08db58c4: Merge "More progress towards split APKs in ASECs." into lmp-dev 
* commit '54a521e9ca79002b8191f33f6d8bf0d61e6d10d2':
  More progress towards split APKs in ASECs.
 2014-08-21 00:45:00 +00:00
Aravind Akella
6c5b04a192 am da35d356: am b1762eb6: Merge "Step Counter documentation fix." into lmp-dev 
* commit 'da35d3566292ada09172d8eb7b8e07828b49ee73':
  Step Counter documentation fix.
 2014-08-21 00:44:45 +00:00
Julia Reynolds
9d36917870 am 8da65466: am a6e05830: Merge "Prevent profile owners from setting certain user restrictions." into lmp-dev 
* commit '8da654665ea6c62359e99c9694de81ea1a2fe2ab':
  Prevent profile owners from setting certain user restrictions.
 2014-08-21 00:44:41 +00:00
Alan Viverette
5709934c71 am 28646cf6: am 0f9a48b6: Merge "Use correct single-letter date format in SimpleMonthView" into lmp-dev 
* commit '28646cf6ab8f5837b44bed1393bce06d7ece508a':
  Use correct single-letter date format in SimpleMonthView
 2014-08-21 00:44:26 +00:00
Adam Powell
75f9918760 Merge "Unify code paths for collapsing action views in action bars" into lmp-dev 2014-08-21 00:16:54 +00:00
Adam Powell
5352a89e8a Unify code paths for collapsing action views in action bars 
This reverts a well-intentioned bugfix that made
ActionBarOverlayLayout focusable in touch mode and caused issues with
some activity layouts. Removes the associated key handling code for
the Back key in ActionBarOverlayLayout and handles it at a higher
level in Activity instead. (This same code path was already in use by
ToolbarActionBar.)

Bug 17105724

Change-Id: I57e4cace44a6d11f25a2549644b565446d616a52
 2014-08-20 17:33:24 -07:00
Mathieu Chartier
41b07f1413 am 554bd893: am 8f9ebc8a: Merge "Remove unnecessary explicit GC in ZygoteInit." 
* commit '554bd8937b60e8f015f1f46b939dff92c2259790':
  Remove unnecessary explicit GC in ZygoteInit.
 2014-08-21 00:02:12 +00:00
Mathieu Chartier
554bd8937b am 8f9ebc8a: Merge "Remove unnecessary explicit GC in ZygoteInit." 
* commit '8f9ebc8a7c0238ce85104d2f20d0ddad1e4d8696':
  Remove unnecessary explicit GC in ZygoteInit.
 2014-08-20 23:49:12 +00:00
Jeff Davidson
05542603dd Less intrusive VPN dialog and other UX tweaks. 
-The ability to launch VPNs is now sticky; once approved by the user,
further approvals are not needed UNLESS the connection is revoked in
Quick Settings.

-The old persistent notification has been removed in favor of the new
Quick Settings UI.

-The name of the VPN app is now pulled from the label of the VPN
service rather than the app itself, if one is set.

Bug: 12878887
Bug: 16578022
Change-Id: I102a14c05db26ee3aef030cda971e5165f078a91
 2014-08-20 16:55:28 -07:00
Jason Monk
e1bf163c1e Merge "Fix SOCKS proxies from being dropped from PAC" into lmp-dev 2014-08-20 20:15:45 +00:00
Adam Lesinski
82340c87ea am 7224e1b2: am 7d98d0a0: Merge "Fix crash when launching Activities in \'android\' package" into lmp-dev 
* commit '7224e1b20c3f0be88ea8fc2daa9144cf68f091d9':
  Fix crash when launching Activities in 'android' package
 2014-08-20 19:26:03 +00:00
Chris Craik
b9627eee5c am c8028af9: am 1ada8566: Merge "Add outlineProvider attribute" into lmp-dev 
* commit 'c8028af9f90268db55547b56fd0dc242bb7d9053':
  Add outlineProvider attribute
 2014-08-20 17:59:56 +00:00
Mathieu Chartier
9a88f10b89 Remove unnecessary explicit GC in ZygoteInit. 
Removes > 1s of GC time and hundreds of GC during device boot.

Zygote size before: 8388608
Zygote size after: 8388608

No increase in zygote space size due to zygote compaction.

Bug: 16398684

Change-Id: I3c6f5a0b26a207ab39bb0a952400d7488e42f00c
 2014-08-20 10:57:45 -07:00
Jason Monk
4385af32ef Fix SOCKS proxies from being dropped from PAC 
It seems that SOCKS isn't being handled explicitly by the
PacProxySelector, which results in them just being dropped
from the return list.  This will sometimes end up switching
from SOCKS to DIRECT, which could be bad.

Bug: 17104885
Change-Id: Ic8a28230d3ae18c0abb000811a9100787c10c5e0
 2014-08-20 12:21:56 -04:00
Aravind Akella
be2ecae5fe Merge "Step Counter documentation fix." into lmp-dev 2014-08-20 16:06:26 +00:00
Amith Yamasani
47cf74f8e0 am c233686a: am ed084f44: Merge "Rename restrictions API class and method" into lmp-dev 
* commit 'c233686adbcebbd51d06b5efeeb8192567b48597':
  Rename restrictions API class and method
 2014-08-20 15:22:40 +00:00
Selim Cinek
d3c833fc97 am 53006cab: am cc19946d: Added notification color to all system notifications 
* commit '53006cab63fed5d176c5d97d4fc1807192ae9c4d':
  Added notification color to all system notifications
 2014-08-20 13:52:14 +00:00
Selim Cinek
255dd04271 Added notification color to all system notifications 
Bug: 17128331
Change-Id: I81a94510ef51b99916f314c0dd65852426a1fbeb
 2014-08-20 14:25:18 +02:00
Jinsuk Kim
8b9ac4efb4 am 7747bf8d: am d1cd4053: Merge "CEC: Hook up device select API to MHL device RAP" into lmp-dev 
* commit '7747bf8df1ae82f7e15639870b7f984d2a25b8eb':
  CEC: Hook up device select API to MHL device RAP
 2014-08-20 05:49:23 +00:00
Jeff Brown
961ccb13bc am 012ddc53: am 53509444: Merge "Remove incomplete media router API. (DO NOT MERGE)" into lmp-dev 
* commit '012ddc53f7da5c50606e689cb6a7d87779076739':
  Remove incomplete media router API. (DO NOT MERGE)
 2014-08-20 03:26:50 +00:00
Adam Powell
6240d0bc3f am 04fd54d4: am 330a5bec: Merge "Update text selection handles to have a minimum touch target size." into lmp-dev 
* commit '04fd54d4c543e6516fb2bfd823f53e376e97197d':
  Update text selection handles to have a minimum touch target size.
 2014-08-20 03:10:42 +00:00
Aravind Akella
0c44d69dc5 Step Counter documentation fix. 
Change-Id: I04921ca2bdfd10581f5582a025de617a506035b7
 2014-08-19 18:28:12 -07:00
Alan Viverette
c9b499b4e9 am e330a384: am 44b61fde: Merge "Draw accessibility focus in View rather than ViewRootImpl" into lmp-dev 
* commit 'e330a384a067f95ed1e89d83f82ea848301040f7':
  Draw accessibility focus in View rather than ViewRootImpl
 2014-08-20 00:05:47 +00:00
Igor Murashkin
c88cf74d40 am bdf49aa1: am 1a054ea8: Merge "camera2: legacy: disable shutter sounds unconditionally via camera2 api" into lmp-dev 
* commit 'bdf49aa1211d87c4c25571d70a5669e1622318ba':
  camera2: legacy: disable shutter sounds unconditionally via camera2 api
 2014-08-19 23:44:34 +00:00
Alan Viverette
3ae3e02022 am 0118f49a: am 7617ae5f: Merge "Fix alignParentRight/End in RelativeLayout" into lmp-dev 
* commit '0118f49a9edf5a0f64a3967539f9c3a474cd0db7':
  Fix alignParentRight/End in RelativeLayout
 2014-08-19 23:44:21 +00:00
George Mount
914e2cc89a am 31894079: am 273f568d: Merge "Fixed ChangeBounds matching against the wrong View." into lmp-dev 
* commit '3189407931c46c4440ff040f494e8f027e771812':
  Fixed ChangeBounds matching against the wrong View.
 2014-08-19 23:44:16 +00:00
Adam Powell
ae4a10c17f Merge "Correctly populate title for ResolverActivity" into lmp-dev 2014-08-19 22:53:25 +00:00
Adam Powell
11f59a0899 Correctly populate title for ResolverActivity 
This affects accessibility feedback.

Bug 17147141

Change-Id: I3e90b80c2813e79e0abe1c5ddc6e0c115a6369dd
 2014-08-20 13:22:16 -07:00
Alan Viverette
aff1efa622 Merge "Use correct single-letter date format in SimpleMonthView" into lmp-dev 2014-08-19 22:53:25 +00:00
Alan Viverette
fd2dd208d9 Use correct single-letter date format in SimpleMonthView 
Also fixes layout on sw600dp-land (by removing the sw600dp layout!).

BUG: 17068298
Change-Id: I2545d0e1904a0028156b96b6ad17674c6107ce5d
 2014-08-19 18:11:54 -07:00
Chris Craik
e2527bc206 Merge "Add outlineProvider attribute" into lmp-dev 2014-08-19 22:53:25 +00:00
Chris Craik
f56885d413 Add outlineProvider attribute 
bug:16871683
Change-Id: Iae9326c41872ac03d40ebeec6257522a34cbe1ff
 2014-08-19 18:04:14 -07:00
Amith Yamasani
609aaca4d8 Merge "Rename restrictions API class and method" into lmp-dev 2014-08-19 22:53:25 +00:00
Amith Yamasani
d1d7c022c6 Rename restrictions API class and method 
AbstractRestrictionsProvider -> android.service.restrictions.RestrictionsReceiver
requestPermission->onRequestPermission

Bug: 17006805
Change-Id: I03b1626d6abcd2ad739a55b60b54fdbf9810ceca
 2014-08-19 17:03:41 -07:00
Alan Viverette
7622f46c78 Merge "Draw accessibility focus in View rather than ViewRootImpl" into lmp-dev 2014-08-19 21:23:09 +00:00
Alan Viverette
54509d5a68 Merge "Fix alignParentRight/End in RelativeLayout" into lmp-dev 2014-08-19 21:23:09 +00:00
Alan Viverette
567e44797b Fix alignParentRight/End in RelativeLayout 
BUG: 17136816
Change-Id: If7edb2e0216384429f4caf7e9aae01c09ddd8be4
 2014-08-19 15:41:51 -07:00
George Mount
4d1ecf5daf Fixed ChangeBounds matching against the wrong View. 
ChangeBounds must ensure that its parents match to use reparent,
but it used instance and ID matching. Matching can now be
done in several ways and that is insufficient.

Change-Id: Ic0432cd06549e4dc9ba49f33b0a6a42082e29dc1
 2014-08-19 14:39:47 -07:00
Adam Lesinski
7c97b74a05 am 1f5eb661: am 960ab6de: Merge "Add Shell command to set AppOps permissions" into lmp-dev 
* commit '1f5eb661b38dee97c65ddfb7a7dc720afbcca3bb':
  Add Shell command to set AppOps permissions
 2014-08-19 21:08:01 +00:00
Alan Viverette
997aa40645 Draw accessibility focus in View rather than ViewRootImpl 
This ensures that the focus rect position is correct when running in
render thread accelerated mode. Also adds a missing call to draw the
overlay.

BUG: 16796647
BUG: 17063342
Change-Id: I377e5eaea89d3f20c8c7e82c264a0f106021d58b
 2014-08-19 20:36:07 +00:00
George Mount
ed526817bc am cc3e585f: am 793b08cd: Merge "Set start transform before animator starts." into lmp-dev 
* commit 'cc3e585f57ff509531f19e3dc361e9c89177ff60':
  Set start transform before animator starts.
 2014-08-19 20:05:52 +00:00
Lorenzo Colitti
56d4c18e2f am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev 
* commit '45b565ffdbd2962c336f385d80d6516cd1cc489a':
  Stop using LinkProperties for static configuration.
 2014-08-19 19:37:53 +00:00
Igor Murashkin
9423d558fd am 2cfef50a: am 77af33f8: Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev 
* commit '2cfef50a34cbffa77f15ee1e5fe962b8bc6659ed':
  camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader
 2014-08-19 18:54:48 +00:00
Igor Murashkin
fcfa4c9506 am 5e27ea67: am 3b690f25: Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev 
* commit '5e27ea673ae91907f7b2316a6008db629356178c':
  camera2: (Legacy) Add control.sceneMode = DISABLED to templates
 2014-08-19 18:54:43 +00:00