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

4419 Commits

Author SHA1 Message Date
Esteban Talavera
8a4f5c7b0e am 065746f2: am 4536f11f: am a47533ff: Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 
* commit '065746f261d1d650d0ac492ad39abdf982a170ed':
  Set last phrase for constant values of EXTRA_* fields to ALL_CAPS
 2014-08-21 16:47:22 +00:00
Esteban Talavera
80f64df7a4 am f88a7165: am ff3bcbf8: am 3e02b271: Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev 
* commit 'f88a7165a7ccf18e113cce68504919ac603feb85':
  Updated documentation for setScreenCaptureDisabled()
 2014-08-21 16:47:17 +00:00
Jorim Jaggi
6dd325fd79 am bf20472c: am fa4b90b8: am af1c312d: Merge "Update notification layouts to match redlines" into lmp-dev 
* commit 'bf20472c351b3cb8a1cc32bba35b3fa7f3c65048':
  Update notification layouts to match redlines
 2014-08-21 16:47:13 +00:00
Esteban Talavera
e4be1bf2be Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 2014-08-21 15:33:20 +00:00
Esteban Talavera
fc3487fe49 am 25900c0a: am 82e2dd54: am a2cdeadd: Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 
* commit '25900c0a347ae6d79efc0a96b06cf6933bd7c741':
  Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC
 2014-08-21 15:31:58 +00:00
Esteban Talavera
5cef4fa9c1 Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev 2014-08-21 15:21:59 +00:00
Esteban Talavera
4d3fc0b828 am 3c736f5a: am 87d536ab: am 5f9653ce: Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev 
* commit '3c736f5a538c44e6a438157a18378abad036c75b':
  Rename get/setBlockUninstall() to get/setUninstallBlocked()
 2014-08-21 15:21:58 +00:00
Jorim Jaggi
922fb7a7db Merge "Update notification layouts to match redlines" into lmp-dev 2014-08-21 15:21:22 +00:00
Jorim Jaggi
445d3c0a6f Update notification layouts to match redlines 
Also fixes a lot of paddings and other small issues with
the notification layouts.

Bug: 15437369
Change-Id: I40b6c69afc160c498b7e2e709814b5b847f615de
 2014-08-21 17:13:55 +02:00
Esteban Talavera
2df7d1ef51 Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 2014-08-21 14:58:18 +00:00
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
d5c5c13c85 Rename get/setBlockUninstall() to get/setUninstallBlocked() 
As requested in the API review

Bug: 17005622
Change-Id: I1332ad11e588ab3fa409f2a28222608936cb383e
 2014-08-21 15:30:13 +01:00
Esteban Talavera
8c5c373647 Merge "Remove setApplicationsHidden" into lmp-dev 2014-08-21 14:17:25 +00:00
Esteban Talavera
d469a0b9ce Set last phrase for constant values of EXTRA_* fields to ALL_CAPS 
As requested in the API review.

Bug: 17005622,16486199
Change-Id: I6f60a43fe23526cfe855d81015feb759cf643926
 2014-08-21 14:58:14 +01:00
Kenny Guy
6699748d68 resolved conflicts for merge of 06cc91a6 to master 
Change-Id: I9e66cd0f41a5b26592a802c4cacbac772d663b73
 2014-08-21 14:34:37 +01:00
Esteban Talavera
1aee98fbf3 Updated documentation for setScreenCaptureDisabled() 
As requested in the API review. Also, removed unused import.

Bug: 17005622
Change-Id: I0bc57411ec34119f64e28eaf27c32a67b45fd66f
 2014-08-21 14:03:55 +01:00
Kenny Guy
b9e468cb9d Merge "Add apis for whitelisting IMEs and accessibility services." into lmp-dev 2014-08-21 10:54:26 +00: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
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
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
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
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
Amith Yamasani
7511526792 resolved conflicts for merge of 83726dfc to master 
Change-Id: Ie5613bf53bd0f097d371fcf21b980a114bbd8c98
 2014-08-20 08:41:02 -07: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
Esteban Talavera
f057f06631 Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC 
As requested in the API review. References to that field fixed on changes I123a5193d03b313160f934644b02be62b8394649 and Ibf1bb38f481e9e0dd898d662b18a1c54f201f830

Bug: 17005622
Change-Id: I08c53465d98678c06f65eeed5e7e9dcdce7bbcf0
 2014-08-20 13:36:05 +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
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
Adam Lesinski
cad5c64fff am 1ed46f56: am 1f5eb661: am 960ab6de: Merge "Add Shell command to set AppOps permissions" into lmp-dev 
* commit '1ed46f56df69f8e4749efbb407b2d81c2972ca9f':
  Add Shell command to set AppOps permissions
 2014-08-19 21:19:35 +00:00
Jon Miranda
b98d40939d am 998d6e02: am 4a5ac7db: am b315ca55: Merge "Exposes style and theme data, adds developer option." into lmp-dev 
* commit '998d6e0267a2e2a242e0fff1049f5366f0f5e5c4':
  Exposes style and theme data, adds developer option.
 2014-08-19 03:20:40 +00:00
Amith Yamasani
23ad2790ed Merge "Add a hidden method to query profile owner name for a user" into lmp-dev 2014-08-19 02:43:23 +00:00
Amith Yamasani
38f836b972 Add a hidden method to query profile owner name for a user 
Bug: 17066115
Change-Id: I812a37ea2e7bb6da5aa4c31cb7e37934e5d698fa
 2014-08-20 14:51:15 -07:00
Adam Lesinski
b5cf61be7c Add Shell command to set AppOps permissions 
Change-Id: I6446543b27f0d2d2e69590a2807e713c6d5ccbbc
 2014-08-19 11:27:19 -07:00
arete
86ba1a8f68 am d522aabb: am d4f0067e: am 4aec0ea8: Merge "Expose system apis for backup transport migration" into lmp-dev 
* commit 'd522aabbe6e781e4c52535c0d037c7c52516c4a1':
  Expose system apis for backup transport migration
 2014-08-19 00:01:49 +00:00
Adam Powell
63e8664e6a am 0eca798b: am 9c7cf696: am d3b22a5c: Merge "Fix a bug propagating navigation button events from ToolbarActionBar" into lmp-dev 
* commit '0eca798bc6f6a5a3bc81485ae57b50e5976a95a9':
  Fix a bug propagating navigation button events from ToolbarActionBar
 2014-08-18 23:45:30 +00:00
arete
4220a9a9f6 Merge "Expose system apis for backup transport migration" into lmp-dev 2014-08-18 23:27:42 +00:00
Jon Miranda
611f8f17f3 Merge "Exposes style and theme data, adds developer option." into lmp-dev 2014-08-18 21:31:41 +00:00
Jon Miranda
836c0a8b94 Exposes style and theme data, adds developer option. 
Adds support for a String[] return type in ViewDebug; and in addition to that,
the hasAdjacentMapping method can use the String array as means to map a key to
its value.

Adds DEBUG_VIEW_ATTRIBUTES to Settings so that the heavy per-view
computations only affect those who opt in. This setting is used in
CoreSettingsObserver to avoid impacting start time.

Change-Id: I8f507e4e5361414c30d247e8d9815205feb5e91f
 2014-08-18 18:32:53 -07:00
Adam Powell
8f4a21e466 Merge "Fix a bug propagating navigation button events from ToolbarActionBar" into lmp-dev 2014-08-18 21:00:53 +00:00
Adam Powell
14e1afe0d8 Fix a bug propagating navigation button events from ToolbarActionBar 
Add a simple internal wrapper for dealing with window callback events.
This should also make working with things like action modes from
ToolbarActionBar significantly easier in later changes.

Bug 16980711

Change-Id: I2c3d7525489a21847f4af9b80f6ebf9b34b4dd58
 2014-08-18 15:58:23 -07:00
arete
ff31addb9b Expose system apis for backup transport migration 
Bug: 16542048
Change-Id: I45e710028316e7b2dc4195700a1e7344afb54691
 2014-08-18 20:34:43 +00:00
Adam Lesinski
54130de7d2 Fix crash when launching Activities in 'android' package 
The LoadedApk for the 'android' package doesn't have a resource
directory set. This is fine since the AssetManager loads the
'android' package's resources by default.

This is a regression caused by https://googleplex-android-review.googlesource.com/#/c/525840/

Bug:17104110
Change-Id: I8a2158a75b4ff0e941837c11a2cb77a7aad09270
 2014-08-20 17:58:10 +00:00
Jason Monk
95d9ad0f79 Merge "Fixes to lock task API from API review" into lmp-dev 2014-08-16 04:32:18 +00:00
Dianne Hackborn
6b8dba383a am 93109322: am 4a0bc3cc: am 2dff9254: Merge "Fix issue #14617210: Apps can gain access to any ContentProvider..." into lmp-dev 
* commit '93109322f71099a78a9c597a8d74f27110e669af':
  Fix issue #14617210: Apps can gain access to any ContentProvider...
 2014-08-18 19:42:02 +00:00
Craig Stout
e7daa311df am 37e35094: am b23f941f: am a245102a: Merge "Fix alert, date picker, time picker dialogs for TV." into lmp-dev 
* commit '37e3509452ed789d57165f7929c3f9d648c49eb0':
  Fix alert, date picker, time picker dialogs for TV.
 2014-08-18 19:41:16 +00:00
Jason Monk
45c3597975 resolved conflicts for merge of 8e6b5343 to master 
Change-Id: Iece54064b2667b45febd0bffbf602be0fe58ae6d
 2014-08-18 11:05:17 -04:00