Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,001 Commits 3 Branches 0 Tags
6f52c702fbd998fa1848746211ee53e1cb3766ef
Commit Graph

40118 Commits

Author SHA1 Message Date
Esteban Talavera
6f52c702fb am fd496a2c: am 50a84946: am 58dada0d: Merge "Remove setApplicationsHidden" into lmp-dev 
* commit 'fd496a2c66d6f45e0cb009e8a52360b3560cdcc4':
  Remove setApplicationsHidden
 2014-08-21 14:43:53 +00:00
Esteban Talavera
8cce064f1b am 50a84946: am 58dada0d: Merge "Remove setApplicationsHidden" into lmp-dev 
* commit '50a84946336e747378ea8f09ff1bf3d6fb457ebe':
  Remove setApplicationsHidden
 2014-08-21 14:34:13 +00:00
Esteban Talavera
8c5c373647 Merge "Remove setApplicationsHidden" into lmp-dev 2014-08-21 14:17:25 +00:00
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
Esteban Talavera
115cd65d2a Remove setApplicationsHidden 
As requested in the API review. This version (the one that takes an Intent) was used only in the DeviceAdminSample and some CTS tests.

Bug: 17005622
Change-Id: I9984b22836417ad4d025302f61bd91704e9345a4
 2014-08-21 10:29:38 +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
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
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
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
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
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
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
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
Chris Craik
aa0b5f1031 am d2affeca: am c8028af9: am 1ada8566: Merge "Add outlineProvider attribute" into lmp-dev 
* commit 'd2affecab253cd4e96a7b4c67fa2e38bc89df122':
  Add outlineProvider attribute
 2014-08-20 18:08:20 +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
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
7511526792 resolved conflicts for merge of 83726dfc to master 
Change-Id: Ie5613bf53bd0f097d371fcf21b980a114bbd8c98
 2014-08-20 08:41:02 -07: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
522cb106dc am 65dbc328: am 53006cab: am cc19946d: Added notification color to all system notifications 
* commit '65dbc32814ed265a0c1adcd4100f80029402ef40':
  Added notification color to all system notifications
 2014-08-20 13:59:14 +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