Niels Egberts
8f4c0ef2ce
am 3709bca8: am 14e9dc50: Merge "Fixed spelling of android.nominative and updated some comments." into lmp-dev
...
* commit '3709bca86d7a24173f87e476fd2032ef303a766a':
Fixed spelling of android.nominative and updated some comments.
2014-08-21 11:49:42 +00:00
Niels Egberts
5e5ee9945b
Merge "Fixed spelling of android.nominative and updated some comments." into lmp-dev
2014-08-21 11:33:01 +00:00
Kenny Guy
8bcbf01533
am 48e5eb54: am 977c20b6: Merge "Add apis for whitelisting IMEs and accessibility services." into lmp-dev
...
* commit '48e5eb54e27c363f63c0b41597d2a7f0cb2d0da2':
Add apis for whitelisting IMEs and accessibility services.
2014-08-21 11:11:51 +00:00
Kenny Guy
b9e468cb9d
Merge "Add apis for whitelisting IMEs and accessibility services." into lmp-dev
2014-08-21 10:54:26 +00:00
Niels Egberts
b9f7692ce6
Fixed spelling of android.nominative and updated some comments.
...
Bug: 17000831
Change-Id: I3a87635a6a894ee8ad1386cde8b59dcd9533b23f
2014-08-21 11:28:29 +01:00
Wei Wang
1aa176d282
am ffa37ce4: am 50a32a5e: Merge "Fix threading issue for advertising." into lmp-dev
...
* commit 'ffa37ce48f06e0f94e1e8e801639a5fbc2c563df':
Fix threading issue for advertising.
2014-08-21 04:30:52 +00:00
Wei Wang
7cb10ac392
Merge "Fix threading issue for advertising." into lmp-dev
2014-08-21 04:10:51 +00:00
Svet Ganov
2afdba5c5b
am 51cb9701: am 2b86b50b: Merge "Notify app widget hosts when cross-profile providers change." into lmp-dev
...
* commit '51cb97015fd3316a371b0e16649f5c757ffb8ae1':
Notify app widget hosts when cross-profile providers change.
2014-08-21 03:10:09 +00:00
Wei Wang
b7bfaa0e0c
am 5410bad8: am b6f53353: Merge "Fix race condition for BluetoothLeScanner." into lmp-dev
...
* commit '5410bad866bdb69aaea30f850839aba040cebb50':
Fix race condition for BluetoothLeScanner.
2014-08-21 03:09:54 +00:00
Adam Powell
b9af1b1d47
am 87eb0faa: am 74f2ad5d: Merge "Fix measurement regression in ActionBarContainer" into lmp-dev
...
* commit '87eb0faaf3829f212503e87f88c313e4ce9f1b94':
Fix measurement regression in ActionBarContainer
2014-08-21 03:08:49 +00:00
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
Svet Ganov
635bc8bc84
Merge "Notify app widget hosts when cross-profile providers change." into lmp-dev
2014-08-21 00:22:45 +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
a900677a0b
Merge "Fix measurement regression in ActionBarContainer" into lmp-dev
2014-08-21 00:16:54 +00:00
Adam Powell
635c21b061
Fix measurement regression in ActionBarContainer
...
Make sure that we take into account all child views (including
ActionBarContextViews) when measuring the action bar container to
determine the measurement influence of an additional tab bar.
Bug 16982971
Change-Id: I53ba7e9a4c9e36d97c6385d2007a3ee0a4e2bc77
2014-08-20 18:15:30 -07: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
Kenny Guy
fa80a4faa3
Add apis for whitelisting IMEs and accessibility services.
...
Adds apis for device / profile owners to white list
the accessibility and input methods a user can enable.
Bug: 14469005
Change-Id: I921888660d29a5370395db87adf75d4d106660c9
2014-08-20 22:30:05 +01:00
Svet Ganov
6bd702538d
Notify app widget hosts when cross-profile providers change.
...
1. Notify the hosts in the group if a package gets white-listed or
un-white-listed for providing widgets across profiles.
2. Notify hosts in the group for provider changes when a profile
is deleted.
bug:17126070
Change-Id: Ic719c1c68e45842d50decc95603f1d61583b8f02
2014-08-20 20:25:10 +00: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