Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,610 Commits 3 Branches 0 Tags
359f9b2aedbc1f28cb7fb3f1793fa795b9179131
Commit Graph

43204 Commits

Author SHA1 Message Date
Narayan Kamath
359f9b2aed am 63dba36f: am c7636754: am a6b01d21: Merge "Validate instruction sets passed to installd." into lmp-dev 
* commit '63dba36fe46b4ae6faed9dc6757cba7eda8ade9c':
  Validate instruction sets passed to installd.
 2014-08-15 13:40:12 +00:00
Zoltan Szatmary-Ban
55083f240b am a6e86ddf: am fe2114b4: am 19c8ce29: Revert "Revert "Update Trusted Credentials screen in settings"" 
* commit 'a6e86ddfd0e5eccd8657c18554cfd6ccd86608f3':
  Revert "Revert "Update Trusted Credentials screen in settings""
 2014-08-15 13:39:57 +00:00
Jeff Sharkey
6a41d5a6f2 am 0bd1a64a: am 9c5fc77d: am b76b06d8: Merge "Some networks may have null ifaces, I guess?" into lmp-dev 
* commit '0bd1a64a8cfb8e789d650575b07f24b43f19945b':
  Some networks may have null ifaces, I guess?
 2014-08-15 13:39:12 +00:00
Jim Miller
78cbe091f1 am b15ca196: am 378f4bc4: am b69c0de3: Merge changes I77f49fe8,I305e927a into lmp-dev 
* commit 'b15ca196fb61b2eab7f85105cad1aeb7fd08e5d4':
  API review - move confirm credential constants from Intent
  Revert "Add new intent to prompt user for their device credential."
 2014-08-15 13:38:34 +00:00
Alan Viverette
ef732659fe am 735ad46a: am db31926c: am d264eeda: Merge "Fix TextView clickable state when using onClick attribute" into lmp-dev 
* commit '735ad46adffcbd11f37e87b0fa867f05bc240ae8':
  Fix TextView clickable state when using onClick attribute
 2014-08-15 13:38:14 +00:00
Chet Haase
7c06e5535f am f54e8568: am 3d6c62cb: am 6da8d4a6: Merge "ActionBarOverlay needs to be focusable" into lmp-dev 
* commit 'f54e856877d3c3e7aed723dccd468b0c516ffc4e':
  ActionBarOverlay needs to be focusable
 2014-08-15 13:38:06 +00:00
Narayan Kamath
40af6aa444 am c7636754: am a6b01d21: Merge "Validate instruction sets passed to installd." into lmp-dev 
* commit 'c7636754eb86afaf463b2f7719f204744c0ac7be':
  Validate instruction sets passed to installd.
 2014-08-15 12:08:13 +00:00
Zoltan Szatmary-Ban
45bdce5df5 am fe2114b4: am 19c8ce29: Revert "Revert "Update Trusted Credentials screen in settings"" 
* commit 'fe2114b45fd75ef9dd630a696ebd1a3971d06082':
  Revert "Revert "Update Trusted Credentials screen in settings""
 2014-08-15 12:08:08 +00:00
Zoltan Szatmary-Ban
1e7bc0def8 Revert "Revert "Update Trusted Credentials screen in settings"" 
This reverts commit 0f0de0bdd021bad5f85fdb0399a4ea91a1611e25.

Change-Id: Ia3d0907e3d7c2ec42d64e45f60e3dfaffb932c3d
 2014-08-15 12:55:35 +01:00
Jeff Sharkey
30f5639cb7 am 9c5fc77d: am b76b06d8: Merge "Some networks may have null ifaces, I guess?" into lmp-dev 
* commit '9c5fc77decaaec349a9f64486fb203eceb4549aa':
  Some networks may have null ifaces, I guess?
 2014-08-15 11:50:18 +00:00
Jim Miller
a3864a79f8 am 378f4bc4: am b69c0de3: Merge changes I77f49fe8,I305e927a into lmp-dev 
* commit '378f4bc4dd0945d6876159ad6fa7c9909261200a':
  API review - move confirm credential constants from Intent
  Revert "Add new intent to prompt user for their device credential."
 2014-08-15 11:49:05 +00:00
Alan Viverette
baa61eeef2 am db31926c: am d264eeda: Merge "Fix TextView clickable state when using onClick attribute" into lmp-dev 
* commit 'db31926c2256a25de317c76597493d617797bb55':
  Fix TextView clickable state when using onClick attribute
 2014-08-15 11:48:44 +00:00
Chet Haase
1470d8f0ae am 3d6c62cb: am 6da8d4a6: Merge "ActionBarOverlay needs to be focusable" into lmp-dev 
* commit '3d6c62cb5157a8353b197d8d3d42c50e027b83c6':
  ActionBarOverlay needs to be focusable
 2014-08-15 11:48:08 +00:00
George Mount
f8a9c1fa90 am 0409affc: am dd29ffc5: am fe8529f1: Don\'t blink in views that haven\'t transitioned yet. 
* commit '0409affc27a829f806f4f11be61344aa0c3b3ab1':
  Don't blink in views that haven't transitioned yet.
 2014-08-15 11:44:17 +00:00
Adam Powell
ab4bd28cdb am 3f399956: am f38fb34a: am 7622c178: Merge "Show checkmarks at the start of material AlertDialog list items" into lmp-dev 
* commit '3f399956e803de399ac1eed1f69a9c165725a014':
  Show checkmarks at the start of material AlertDialog list items
 2014-08-15 11:44:07 +00:00
Alan Viverette
bc774cdc15 am 54ab433c: am 54e70a6e: am f150fb34: Deprecate InputMethodService.enableHardwareAcceleration() 
* commit '54ab433c8beb43d87e12766685603e6c795df9f7':
  Deprecate InputMethodService.enableHardwareAcceleration()
 2014-08-15 11:43:48 +00:00
Anish Athalye
c56c9ee718 am c255033f: am 675f13bf: am 2f2e3797: Merge "Make LeadingMarginSpan2 behavior more consistent" into lmp-dev 
* commit 'c255033f0a4b55f8d4279a9a5b283ed742a5e642':
  Make LeadingMarginSpan2 behavior more consistent
 2014-08-15 11:43:37 +00:00
Fabrice Di Meglio
fe3fb2eb9c am 27602abf: am b73577a9: am 25c2863e: Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment@273c8fdb was not registered 
* commit '27602abfaab6fb98ae4965eb6689f7f4a7c5d535':
  Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment$1@273c8fdb was not registered
 2014-08-15 11:43:02 +00:00
George Mount
c3b821494d am dd29ffc5: am fe8529f1: Don\'t blink in views that haven\'t transitioned yet. 
* commit 'dd29ffc5593eea0c829d5ec7d773f140bd0662e8':
  Don't blink in views that haven't transitioned yet.
 2014-08-15 11:35:35 +00:00
Adam Powell
9e6e6e4496 am f38fb34a: am 7622c178: Merge "Show checkmarks at the start of material AlertDialog list items" into lmp-dev 
* commit 'f38fb34adb4b5929e611aadf0c6bb43e5acdb4ac':
  Show checkmarks at the start of material AlertDialog list items
 2014-08-15 11:35:22 +00:00
Alan Viverette
602683909b am 54e70a6e: am f150fb34: Deprecate InputMethodService.enableHardwareAcceleration() 
* commit '54e70a6e81deab85c3f875eee57bc30b35c34dcf':
  Deprecate InputMethodService.enableHardwareAcceleration()
 2014-08-15 11:34:59 +00:00
Anish Athalye
dd4308f5e7 am 675f13bf: am 2f2e3797: Merge "Make LeadingMarginSpan2 behavior more consistent" into lmp-dev 
* commit '675f13bfa8abcc439af1218e9de4d834e9253ede':
  Make LeadingMarginSpan2 behavior more consistent
 2014-08-15 11:34:47 +00:00
Fabrice Di Meglio
6652b30039 am b73577a9: am 25c2863e: Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment@273c8fdb was not registered 
* commit 'b73577a925e4acd930aea25bae17a04352d09bc3':
  Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment$1@273c8fdb was not registered
 2014-08-15 11:33:14 +00:00
Jose Lima
c41e939e94 am 18b3ce23: am 9d52ec9f: am bd2f1793: Make TranslucentConversionListener a SystemApi 
* commit '18b3ce239f7e51dc999bc695a4b4ce0b8c53e48f':
  Make TranslucentConversionListener a SystemApi
 2014-08-15 05:06:37 +00:00
Narayan Kamath
5dc4a440d1 Merge "Validate instruction sets passed to installd." into lmp-dev 2014-08-15 04:32:23 +00:00
Narayan Kamath
6c4b9de8f1 Validate instruction sets passed to installd. 
We don't want folks passing down arbitrary strings.

bug: 16837404
Change-Id: I73ac66b376f1401f9f95f3c6323da6242ac8ed3d
 2014-08-15 12:50:10 +01:00
Jose Lima
7f7b3f37d1 am 9d52ec9f: am bd2f1793: Make TranslucentConversionListener a SystemApi 
* commit '9d52ec9fee722ecb84994faa2c48822b8e3879ba':
  Make TranslucentConversionListener a SystemApi
 2014-08-15 03:55:59 +00:00
Torne (Richard Coles)
33edfdd24c am dcdafdaa: am 6d9b1fc8: am ca6c7cb1: Merge "Store the WebView\'s package info." into lmp-dev 
* commit 'dcdafdaaf989c202161b440ac1ef7d74544322d1':
  Store the WebView's package info.
 2014-08-14 23:43:22 +00:00
Jeff Sharkey
86a65d8240 am 4f63ed6c: am dae9bc1f: am 67ec007c: Fix javadoc on PROTECTION_FLAG_APPOP. 
* commit '4f63ed6c2de379692db22a9312703fecdeae0d77':
  Fix javadoc on PROTECTION_FLAG_APPOP.
 2014-08-14 23:43:17 +00:00
Doug Zongker
af8b11ae2a am 8c26c4c8: am a9c87471: am 2b13359a: Merge "@hide RECOVERY permission" into lmp-dev 
* commit '8c26c4c8f4784e3f8acce3a97f36e8c136d48349':
  @hide RECOVERY permission
 2014-08-14 23:43:12 +00:00
Jorim Jaggi
02fb6dc882 am 0bd7f533: am ddf03adb: am 8cadb460: Use different unlock animation when going to full shade 
* commit '0bd7f533c128f6c0586f56bc8a29cd266b23fa29':
  Use different unlock animation when going to full shade
 2014-08-14 23:42:53 +00:00
Torne (Richard Coles)
128dc15fee am 6d9b1fc8: am ca6c7cb1: Merge "Store the WebView\'s package info." into lmp-dev 
* commit '6d9b1fc81bdf8e4da3c2872ed1523b576ab3d64f':
  Store the WebView's package info.
 2014-08-14 23:35:02 +00:00
Jeff Sharkey
3758534bbf am dae9bc1f: am 67ec007c: Fix javadoc on PROTECTION_FLAG_APPOP. 
* commit 'dae9bc1f3a5833a6bdd4bd6de7142d063aad9d8a':
  Fix javadoc on PROTECTION_FLAG_APPOP.
 2014-08-14 23:34:54 +00:00
Doug Zongker
e2e18a3484 am a9c87471: am 2b13359a: Merge "@hide RECOVERY permission" into lmp-dev 
* commit 'a9c874719b05430458ed523138a4a46aa0901bff':
  @hide RECOVERY permission
 2014-08-14 23:34:38 +00:00
Jorim Jaggi
8f188d32b0 am ddf03adb: am 8cadb460: Use different unlock animation when going to full shade 
* commit 'ddf03adb2e4150168dfe6e27338ca18e264f5f8d':
  Use different unlock animation when going to full shade
 2014-08-14 23:34:08 +00:00
George Mount
a2bbbb3bac Don't blink in views that haven't transitioned yet. 
Bug 16959262

Views that hadn't animated in during the enter transition were
being stripped from the exit transition. This caused them to
blink in as the enter transition was canceled.

This pauses the entering transition so that the view positions
are properly captured for the exit transition and aren't stripped.

Change-Id: I39cc94ed3bf92a51f8c5fe741f0aa5456b704bf0
 2014-08-14 20:19:41 +00:00
Alan Viverette
e07b595519 Deprecate InputMethodService.enableHardwareAcceleration() 
BUG: 16951553
Change-Id: I126ea823eb2eeabb29d30999dec9c9411b33b315
 2014-08-14 20:06:02 +00:00
Anish Athalye
4798c44563 Merge "Make LeadingMarginSpan2 behavior more consistent" into lmp-dev 2014-08-14 19:49:28 +00:00
Anish Athalye
ab08c6d38a Make LeadingMarginSpan2 behavior more consistent 
This addresses b/16486549.

This change updates public documentation to specify the behavior of
LeadingMarginSpan2s. This change specifies what happens when a
LeadingMarginSpan2 is combined with other LeadingMarginSpans. This
behavior was not previously documented.

LeadingMarginSpan2s specify the number of lines used for the leading
margin. When laying out and rendering, for all LeadingMarginSpans, the
first line margin is applied for the number of lines specified by the
LeadingMarginSpan2.

Previously, this behavior was slightly buggy -- the LeadingMarginSpan2
affected all LeadingMarginSpans when laying out text, but not when
rendering.

This change is designed to cause the least amount of breakage in
existing code while achieving consistency with the way
LeadingMarginSpan2 is handled in layout and drawing.

For the most common use of LeadingMarginSpan2 -- getting a multi-line
first margin in the first paragraph of text in a layout -- this should
cause no change in behavior. For any other uses, the old (buggy)
implementation most likely did not exhibit correct behavior to begin
with, so developers were most likely not relying on that functionality.

Change-Id: I6f69df09c0130e703458e65bf3eaac4a905df56e
 2014-08-14 11:58:37 -07:00
Prerepa Viswanadham
979fb6de5a am 54bb367b: am 66e02987: am d58dee86: Protect from malformed advt with invalid manf_id/data combo 
* commit '54bb367b62727c5f9afd94b190d928d3e6a7325d':
  Protect from malformed advt with invalid manf_id/data combo
 2014-08-14 18:10:16 +00:00
Prerepa Viswanadham
4b9b02c431 am c334bbb3: am 5550c2b1: am 011101fe: Prevent crash in Gatt service due to null pointer in BluetoothGattCharacteristic from framework 
* commit 'c334bbb38986787a8aaf51b6208990454aa86a06':
  Prevent crash in Gatt service due to null pointer in BluetoothGattCharacteristic from framework
 2014-08-14 18:10:11 +00:00
Prerepa Viswanadham
b8035fda5d am 66e02987: am d58dee86: Protect from malformed advt with invalid manf_id/data combo 
* commit '66e02987b45cb9d04c6bca790dcb3da612e81529':
  Protect from malformed advt with invalid manf_id/data combo
 2014-08-14 18:02:58 +00:00
Prerepa Viswanadham
2a2da65137 am 5550c2b1: am 011101fe: Prevent crash in Gatt service due to null pointer in BluetoothGattCharacteristic from framework 
* commit '5550c2b101541300c8fa52989e4a98949319bd2a':
  Prevent crash in Gatt service due to null pointer in BluetoothGattCharacteristic from framework
 2014-08-14 18:02:51 +00:00
Fabrice Di Meglio
b1a50f2dff Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. 
SettingsPreferenceFragment$1@273c8fdb was not registered

- add onUnbindPreferences() call to match onBindPreferences()
- this new method is @hide so it does not impact the APIs

Change-Id: Iee0ab8a4ecc2046f89fb96cc52af150e835f658c
 2014-08-14 18:00:11 +00:00
Wei Wang
babb9bc8d0 am c08732d1: am f7dfa984: am b5d9d07e: Merge "Clean up advertise and scan clients upon bluetooth down." into lmp-dev 
* commit 'c08732d131512fbdf96903189d19ff27fac2386e':
  Clean up advertise and scan clients upon bluetooth down.
 2014-08-14 17:57:13 +00:00
Jose Lima
698dcf6b77 am 438d6300: am 06804518: am d361d4f9: Made AlarmClockInfo a nested class in AlarmManager 
* commit '438d630058336fb5afed72db34e75cf4898298a8':
  Made AlarmClockInfo a nested class in AlarmManager
 2014-08-14 17:56:59 +00:00
Jose Lima
9c9e325980 am ed60a1e1: am b991fd6e: am ec8834a3: Renamed "media playing" APIs to "visible behind" 
* commit 'ed60a1e131918adba2777a577ebabd9866728d57':
  Renamed "media playing" APIs to "visible behind"
 2014-08-14 17:56:47 +00:00
Jeff Brown
f431a9fc43 am 31012592: am f281eea3: am 79bdc4d1: Log who is calling goToSleep(). 
* commit '310125927fa5afd965f613d535db52343f0f5427':
  Log who is calling goToSleep().
 2014-08-14 17:56:42 +00:00
Dianne Hackborn
5049a2d5ee am dc7692a4: am 0bfe8aea: am b60a62ca: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into lmp-dev 
* commit 'dc7692a4b36736c79633b4ef48eecbe68a9b9057':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-08-14 17:56:27 +00:00
Wei Wang
b54b014dd3 am f7dfa984: am b5d9d07e: Merge "Clean up advertise and scan clients upon bluetooth down." into lmp-dev 
* commit 'f7dfa984b57be7ed39b07f26cf9c74a2501a62a2':
  Clean up advertise and scan clients upon bluetooth down.
 2014-08-14 17:47:41 +00:00