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

40161 Commits

Author SHA1 Message Date
Chris Craik
5cf96d8b51 am 6b5c0e91: am 6ec6fe3a: am 7d271c37: Merge "Clarify text shadow attribute/method comments" into lmp-dev 
* commit '6b5c0e919a61ef5e2483b7b2e206919b0f503d73':
  Clarify text shadow attribute/method comments
 2014-08-21 17:15:11 +00:00
Chris Craik
b1e59e8563 am 6ec6fe3a: am 7d271c37: Merge "Clarify text shadow attribute/method comments" into lmp-dev 
* commit '6ec6fe3ac2b003208e82848725896866a0945bcf':
  Clarify text shadow attribute/method comments
 2014-08-21 17:04:44 +00:00
Nicolas Prevot
2af85abffd am 2fbb6bb5: am 6815c529: am 85814a34: Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev 
* commit '2fbb6bb5dd7a359efeeb9b3bc7d0e207021fdced':
  Marking the methods to get Profile/Device Owner with @SystemApi.
 2014-08-21 16:58:10 +00:00
Zhijun He
cac49eb610 am acb8f467: am 8fece5d0: am a34cf262: Merge "Camera2: update aberration correction related tag name" into lmp-dev 
* commit 'acb8f467c86452b849dc6410db27668525baa075':
  Camera2: update aberration correction related tag name
 2014-08-21 16:48:02 +00:00
Jaewan Kim
c8600f9f12 am fc2dccca: am 48f09811: am 1ca0c4f0: Merge "TIF: Accept any character for custom label." into lmp-dev 
* commit 'fc2dcccab58adf2fb6a750e499cec42180806cb2':
  TIF: Accept any character for custom label.
 2014-08-21 16:47:57 +00:00
Kenny Guy
c616bcc5cc am c18eec1c: am 676fedb0: am 87c29bd1: Merge "Replicate text and sounds settings for managed profile." into lmp-dev 
* commit 'c18eec1c2848c7fab2693de7138034de316eb0fb':
  Replicate text and sounds settings for managed profile.
 2014-08-21 16:47:29 +00:00
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
Nicolas Prevot
b4c43c029e am 6815c529: am 85814a34: Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev 
* commit '6815c5298b8b8658cec7eecb43117d7abfe4dd71':
  Marking the methods to get Profile/Device Owner with @SystemApi.
 2014-08-21 16:47:13 +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
Chris Craik
c56a1a51a9 Merge "Clarify text shadow attribute/method comments" into lmp-dev 2014-08-21 16:46:53 +00:00
Nicolas Prevot
01e6a6fef1 Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev 2014-08-21 16:33:47 +00:00
Zhijun He
d38b381086 am 8fece5d0: am a34cf262: Merge "Camera2: update aberration correction related tag name" into lmp-dev 
* commit '8fece5d08a5ee0409a28f383a52ebc7dbfe8afda':
  Camera2: update aberration correction related tag name
 2014-08-21 16:33:43 +00:00
Jaewan Kim
5eaae72f72 am 48f09811: am 1ca0c4f0: Merge "TIF: Accept any character for custom label." into lmp-dev 
* commit '48f098115b6654ce8da754ff11b40965308f44d5':
  TIF: Accept any character for custom label.
 2014-08-21 16:33:38 +00:00
Nicolas Prevot
465acf3f3f Marking the methods to get Profile/Device Owner with @SystemApi. 
BUG: 16860239

Change-Id: I60126a8112a57e836cae3bcd9b62ebf50385f5ec
 2014-08-21 17:22:28 +01:00
Kenny Guy
80ab66574a am 676fedb0: am 87c29bd1: Merge "Replicate text and sounds settings for managed profile." into lmp-dev 
* commit '676fedb03498436cf6551ea9e0ae5486e7fe9e0c':
  Replicate text and sounds settings for managed profile.
 2014-08-21 16:20:24 +00:00
Esteban Talavera
29c6dfe446 am 4536f11f: am a47533ff: Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 
* commit '4536f11f64b6fa2d99f65424819f20401d2c0830':
  Set last phrase for constant values of EXTRA_* fields to ALL_CAPS
 2014-08-21 16:20:19 +00:00
Esteban Talavera
de7706999e am ff3bcbf8: am 3e02b271: Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev 
* commit 'ff3bcbf8134faf2dfddf26bf00afd90c462e9699':
  Updated documentation for setScreenCaptureDisabled()
 2014-08-21 16:20:15 +00:00
Jorim Jaggi
7ff086fdff am fa4b90b8: am af1c312d: Merge "Update notification layouts to match redlines" into lmp-dev 
* commit 'fa4b90b870980baa42ff868d2d331effae70956d':
  Update notification layouts to match redlines
 2014-08-21 16:20:09 +00:00
Zhijun He
eee850d355 Merge "Camera2: update aberration correction related tag name" into lmp-dev 2014-08-21 16:17:52 +00:00
Jaewan Kim
edaece1f30 Merge "TIF: Accept any character for custom label." into lmp-dev 2014-08-21 16:13:25 +00:00
Jaewan Kim
f0e530e4eb TIF: Accept any character for custom label. 
Bug: 16874696
Change-Id: Idc42853ea7f4b12a2eda1f45319bc31ee1a8c6b7
 2014-08-22 01:05:40 +09:00
Kenny Guy
7a13ea7e3b Merge "Replicate text and sounds settings for managed profile." into lmp-dev 2014-08-21 15:55:43 +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
e17fce679a am 82e2dd54: am a2cdeadd: Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 
* commit '82e2dd5457724811141d54d124505d3130eba29b':
  Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC
 2014-08-21 15:23:27 +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
Kenny Guy
6460657d0e Replicate text and sounds settings for managed profile. 
Replicate touch sound / vibrate setting and show password
setting between managed and parent user.

Bug: 17064707,17157511
Change-Id: I70ea9f2ac57ba5a8f9619b21eb7adad91011d733
 2014-08-21 16:19:35 +01:00
Esteban Talavera
d449f101d1 am 87d536ab: am 5f9653ce: Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev 
* commit '87d536ab13bda0ebd1a8f7d28f8b11c895debff4':
  Rename get/setBlockUninstall() to get/setUninstallBlocked()
 2014-08-21 15:15:10 +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
John Reck
9420dc8bf4 am 1253d0f1: am 872c7679: am d6a934a9: Merge "Run RevealAnimator on RT" into lmp-dev 
* commit '1253d0f18900abeafede2d00f5807686b31765aa':
  Run RevealAnimator on RT
 2014-08-21 14:43:58 +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
John Reck
e4d7d34761 am 872c7679: am d6a934a9: Merge "Run RevealAnimator on RT" into lmp-dev 
* commit '872c7679bc5461d2fdb26ffeb091b88bc912b77b':
  Run RevealAnimator on RT
 2014-08-21 14:34:18 +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
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
John Reck
94f6878bbd Merge "Run RevealAnimator on RT" into lmp-dev 2014-08-21 14:23:29 +00: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
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
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
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