Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
151,987 Commits 3 Branches 0 Tags
ff4034063fffd3939d2655891872c29b3d443601
Commit Graph

43536 Commits

Author SHA1 Message Date
Niels Egberts
a1fc998924 am 190d2222: am 3709bca8: am 14e9dc50: Merge "Fixed spelling of android.nominative and updated some comments." into lmp-dev 
* commit '190d22224884cad530b2f8a1a671e91fd3f80244':
  Fixed spelling of android.nominative and updated some comments.
 2014-08-21 13:39:34 +00:00
Kenny Guy
6699748d68 resolved conflicts for merge of 06cc91a6 to master 
Change-Id: I9e66cd0f41a5b26592a802c4cacbac772d663b73
 2014-08-21 14:34:37 +01:00
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
af46d7c9ae am 6aa16cc6: am ffa37ce4: am 50a32a5e: Merge "Fix threading issue for advertising." into lmp-dev 
* commit '6aa16cc6d0f3961cd4b4593df2888c7f46fa3f13':
  Fix threading issue for advertising.
 2014-08-21 05:16:26 +00: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
99fb19fc49 am 413a6046: am 51cb9701: am 2b86b50b: Merge "Notify app widget hosts when cross-profile providers change." into lmp-dev 
* commit '413a60460b9c1a8cb72a7362f96a882ed8f62e18':
  Notify app widget hosts when cross-profile providers change.
 2014-08-21 04:10:26 +00:00
Wei Wang
c346fde2e0 am 30ca48a9: am 5410bad8: am b6f53353: Merge "Fix race condition for BluetoothLeScanner." into lmp-dev 
* commit '30ca48a9d52e79174b8f9965384b0e9f29a5666e':
  Fix race condition for BluetoothLeScanner.
 2014-08-21 04:10:12 +00:00
Adam Powell
fcbc89e549 am 6b635f3e: am 87eb0faa: am 74f2ad5d: Merge "Fix measurement regression in ActionBarContainer" into lmp-dev 
* commit '6b635f3ef749eb72f5765f46275f78b3756b6ba3':
  Fix measurement regression in ActionBarContainer
 2014-08-21 04:10:01 +00:00
Jason Monk
afba50384d am bce2f9ac: am e6ecfca2: am 45959a5e: Merge "Fix SOCKS proxies from being dropped from PAC" into lmp-dev 
* commit 'bce2f9ac39e2fa94530ce262aff97eac6729d937':
  Fix SOCKS proxies from being dropped from PAC
 2014-08-21 04:09:31 +00:00
Adam Powell
9077d2c3b0 am 3a045a2c: am 3f0554bf: am c33bc746: Merge "Unify code paths for collapsing action views in action bars" into lmp-dev 
* commit '3a045a2c3942d0d47f8508c7ebc502de045a78e1':
  Unify code paths for collapsing action views in action bars
 2014-08-21 04:09:22 +00:00
Jeff Davidson
7f133dce33 am 1ff358ad: am d217efb9: am 709941fd: Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev 
* commit '1ff358ad2a0b2c0702fde65ff68f4656e55c545f':
  Less intrusive VPN dialog and other UX tweaks.
 2014-08-21 04:08:55 +00:00
Amith Yamasani
b818431016 am 3c67899a: am 614e4635: am d5d82cf3: Merge "Add a hidden method to query profile owner name for a user" into lmp-dev 
* commit '3c67899a94c890e199d9bda599ac5266c3e11c6c':
  Add a hidden method to query profile owner name for a user
 2014-08-21 04:08:46 +00:00
John Reck
70a0be6b75 am 735164ad: am 17ed6e74: am 876f1a1a: Merge "Implement full View.buildLayer" into lmp-dev 
* commit '735164ad8b9c969227b3abe3aab8545f7172c29a':
  Implement full View.buildLayer
 2014-08-21 04:08:29 +00:00
Adam Powell
43784b78e1 am 788735b9: am cc448e10: am 7ad2d5b4: Merge "Correctly populate title for ResolverActivity" into lmp-dev 
* commit '788735b9a19b1fb3a790be8277baf029c0c7c9ec':
  Correctly populate title for ResolverActivity
 2014-08-21 03:33:31 +00:00
Jeff Sharkey
40aff029fe am 44884372: am 54a521e9: am 08db58c4: Merge "More progress towards split APKs in ASECs." into lmp-dev 
* commit '448843725d388c409a0ac20602fbc5611e7b2134':
  More progress towards split APKs in ASECs.
 2014-08-21 03:33:20 +00:00
Aravind Akella
2f67bf3fef am 43e0c717: am da35d356: am b1762eb6: Merge "Step Counter documentation fix." into lmp-dev 
* commit '43e0c7170454f1206b487071351ed676a926b3cd':
  Step Counter documentation fix.
 2014-08-21 03:33:10 +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
Julia Reynolds
b00889ddc2 resolved conflicts for merge of b259603d to master 
Change-Id: Ia74bb64ce5946a86ecf05b8c4e258dd2ac68ba04
 2014-08-20 22:42:08 -04:00
Alan Viverette
68bf3c657a am c29680bf: am 28646cf6: am 0f9a48b6: Merge "Use correct single-letter date format in SimpleMonthView" into lmp-dev 
* commit 'c29680bf487a1a1460aca922555ecf76e6918193':
  Use correct single-letter date format in SimpleMonthView
 2014-08-21 00:57:29 +00:00
Mathieu Chartier
c2fa0fb19f am a13e69f1: am 554bd893: am 8f9ebc8a: Merge "Remove unnecessary explicit GC in ZygoteInit." 
* commit 'a13e69f1ab0f03bb9afbe0578d1599d25d04aaf2':
  Remove unnecessary explicit GC in ZygoteInit.
 2014-08-21 00:51:05 +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
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
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
88fd431b9b am 5066ef8a: am 7224e1b2: am 7d98d0a0: Merge "Fix crash when launching Activities in \'android\' package" into lmp-dev 
* commit '5066ef8a448a74619fa0083caf89eb3f925021cf':
  Fix crash when launching Activities in 'android' package
 2014-08-20 19:33:23 +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