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

39798 Commits

Author SHA1 Message Date
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
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
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
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
Jose Lima
95f3c34848 am 06804518: am d361d4f9: Made AlarmClockInfo a nested class in AlarmManager 
* commit '068045187ef2b6011633b3a0bf273030ecb6d664':
  Made AlarmClockInfo a nested class in AlarmManager
 2014-08-14 17:47:08 +00:00
Jose Lima
f082842f2b am b991fd6e: am ec8834a3: Renamed "media playing" APIs to "visible behind" 
* commit 'b991fd6ec57b0f59e20f85a9cb9c63ac9d0ab98a':
  Renamed "media playing" APIs to "visible behind"
 2014-08-14 17:47:02 +00:00
Jeff Brown
d1ee11da70 am f281eea3: am 79bdc4d1: Log who is calling goToSleep(). 
* commit 'f281eea327ed9020333746cc77e48636662231b6':
  Log who is calling goToSleep().
 2014-08-14 17:46:57 +00:00
Dianne Hackborn
ab843022e2 am 0bfe8aea: am b60a62ca: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into lmp-dev 
* commit '0bfe8aea12144bfdcc34673c5b14309f141d4de7':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-08-14 17:46:42 +00:00
Jose Lima
14914858a0 Make TranslucentConversionListener a SystemApi 
Change-Id: I59a93e1e040fdbaa9ef108b31e08e4553ba82ae1
 2014-08-14 09:15:17 -07:00
Jeff Sharkey
e9b78fdbbe Fix javadoc on PROTECTION_FLAG_APPOP. 
Change-Id: I36e339ac2c6e6842441fd2572b0b8cda24bd34ca
 2014-08-14 16:01:37 +00:00
Jorim Jaggi
84a3e7aacf Use different unlock animation when going to full shade 
Also fixes a bug that the notify flag was not reset, and fix the
transition for the phone/camera affordance (in these cases, no
animation is needed).

Bug: 15991916
Change-Id: Idbb4fa40f86bda597cd66cc38da838ef4f75514d
 2014-08-14 12:29:25 +00:00
Prerepa Viswanadham
621085e50f Protect from malformed advt with invalid manf_id/data combo 
Bug: 16979645
Change-Id: Ie7ea00ed20cbad1120c7582bb2bafd44b4295052
 2014-08-14 05:33:11 +00:00
Prerepa Viswanadham
ee3cc8bf17 Prevent crash in Gatt service due to null pointer in 
BluetoothGattCharacteristic from framework

Bug 16899517

Change-Id: Ib30ddefee07c2953f9a7faeb4eaa823feeebdc8f
 2014-08-14 05:32:06 +00:00
Glenn Kasten
45b851559c am a180cd0c: am 95ff26f9: am 1666a7c5: Merge "Move setting to disable automatic USB routing" into lmp-dev 
* commit 'a180cd0c87916551d01ae60d88bad68f68c19002':
  Move setting to disable automatic USB routing
 2014-08-14 05:20:09 +00:00
Glenn Kasten
032ec5a0f0 am 95ff26f9: am 1666a7c5: Merge "Move setting to disable automatic USB routing" into lmp-dev 
* commit '95ff26f927a8fc0179a5f3a5012090b1568b58c6':
  Move setting to disable automatic USB routing
 2014-08-14 04:20:14 +00:00
Jose Lima
235510e672 Made AlarmClockInfo a nested class in AlarmManager 
Bug: 16959028
Change-Id: I150eaaff765d1e214c3621c1bf50162ec0dac8ec
 2014-08-14 02:10:41 +00:00
Jose Lima
4b6c6697da Renamed "media playing" APIs to "visible behind" 
- Request from API Review: rename the media playing APIs to a more
     generic name, reflecting the background visibility feature these
     methods actually control.
   - Made the new isActivityVisibleBehind().
   - Changed convertFromTranslucent() and convertToTranslucent() to be
     SystemApi.

Bug: 16959028
Change-Id: I526eac22f44273b3254dd6201f89194d13e597e2
 2014-08-14 02:00:04 +00:00
Jeff Brown
c12035cd40 Log who is calling goToSleep(). 
Change-Id: Ibae61c90ee115735835e878bb3bf79eedaa0ae44
 2014-08-14 01:56:48 +00:00
Yorke Lee
5963c95a0e am 548c4642: am 31183c57: am 571d2642: Disable call log for users with DISALLOW_OUTGOING_CALLS restriction 
* commit '548c4642fbb55dcbbfb5f08da388b4e978307c36':
  Disable call log for users with DISALLOW_OUTGOING_CALLS restriction
 2014-08-13 21:39:57 +00:00
Yorke Lee
2a96238c72 am 31183c57: am 571d2642: Disable call log for users with DISALLOW_OUTGOING_CALLS restriction 
* commit '31183c57c7f0f568d7902479fe862370b57af3fa':
  Disable call log for users with DISALLOW_OUTGOING_CALLS restriction
 2014-08-13 21:35:35 +00:00
Yorke Lee
15f83c6f64 Disable call log for users with DISALLOW_OUTGOING_CALLS restriction 
Bug: 16217514
Change-Id: Iacd5699d0a540ca0e5a678662379bf8c611f7462
 2014-08-13 21:17:53 +00:00
Amith Yamasani
e8d12b6440 am b2c95e74: am 6648994f: am 5884bca0: Decouple user limit from guest creation 
* commit 'b2c95e74187539d78a9df70ae3361a67b5e72de9':
  Decouple user limit from guest creation
 2014-08-13 20:25:40 +00:00
Jeff Sharkey
99974c3921 am 21500a27: am c9c98188: am 9096e1b2: Merge "Fix javadoc attr reference." into lmp-dev 
* commit '21500a277e7b14531a63394f482c9054ec8aa610':
  Fix javadoc attr reference.
 2014-08-13 20:25:36 +00:00
Amith Yamasani
b0dd621ef3 am 6648994f: am 5884bca0: Decouple user limit from guest creation 
* commit '6648994f02769f957a197deef011291d11a390b8':
  Decouple user limit from guest creation
 2014-08-13 20:18:50 +00:00