drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,683 Commits 1 Branch 0 Tags
Commit Graph

56629 Commits

Author SHA1 Message Date
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
ac32f51b73 am a63f02f7: am 096f28d0: am 8b778c13: Make clock larger on tablets 
* commit 'a63f02f7e7d50fa31a16351ddce5849f9784a003':
  Make clock larger on tablets
 2014-08-14 23:42:57 +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
4d3c5752aa am 096f28d0: am 8b778c13: Make clock larger on tablets 
* commit '096f28d0900798910a7c57378ce0aec8fc0e3f39':
  Make clock larger on tablets
 2014-08-14 23:34:14 +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
Chet Haase
7b23cc5312 am 6da8d4a6: Merge "ActionBarOverlay needs to be focusable" into lmp-dev 
* commit '6da8d4a69b7d2405935c0974a19c40481e08cf00':
  ActionBarOverlay needs to be focusable
 2014-08-14 22:38:54 +00:00
Amit Mahajan
e627721648 am 94819cff: Merge "Contribute roaming configuration for domestic roaming and non-roaming cases" into lmp-dev 
* commit '94819cff180512dbe5734cd5f33a7ee1cf39f2e7':
  Contribute roaming configuration for domestic roaming and non-roaming cases
 2014-08-14 22:16:52 +00:00
Chulwoo Lee
12033b974c am 5c101aef: Merge "TIF: Set translatable false for rating descriptions" into lmp-dev 
* commit '5c101aefa18d24c5b390bd145a6e2e2af5485ff1':
  TIF: Set translatable false for rating descriptions
 2014-08-14 21:36:58 +00:00
George Mount
607cd9ef81 am fe8529f1: Don\'t blink in views that haven\'t transitioned yet. 
* commit 'fe8529f1525171af06ee738c570154c9d0ee4c39':
  Don't blink in views that haven't transitioned yet.
 2014-08-14 20:24:43 +00:00
Adam Powell
f22d007895 am 7622c178: Merge "Show checkmarks at the start of material AlertDialog list items" into lmp-dev 
* commit '7622c178b3c218bedd930f0103673794b6fe8386':
  Show checkmarks at the start of material AlertDialog list items
 2014-08-14 20:20:18 +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
Jason Monk
f2625671a1 am eb9daa91: Merge "Switch exiting screen pinning to recents+back" into lmp-dev 
* commit 'eb9daa91fe4b6c4142d65b2becc6247345c17c74':
  Switch exiting screen pinning to recents+back
 2014-08-14 20:12:17 +00:00
Alan Viverette
bf64d2cfee am e4ac85c2: Merge "Prevent SwitchPreference widget from receiving a11y focus" into lmp-dev 
* commit 'e4ac85c2b79a15adee1523569f03b2b1f2e55b79':
  Prevent SwitchPreference widget from receiving a11y focus
 2014-08-14 20:12:11 +00:00
Alan Viverette
c0e64ce22a am f150fb34: Deprecate InputMethodService.enableHardwareAcceleration() 
* commit 'f150fb344282a6e38284153298ea737c64626f19':
  Deprecate InputMethodService.enableHardwareAcceleration()
 2014-08-14 20:12:04 +00:00
Alan Viverette
a02e76df19 am 056941f1: Merge "Don\'t set textColor in button style" into lmp-dev 
* commit '056941f1347d3e993d95770eff8277d57dd8e538':
  Don't set textColor in button style
 2014-08-14 20:11:59 +00:00
Anish Athalye
878f087360 am 2f2e3797: Merge "Make LeadingMarginSpan2 behavior more consistent" into lmp-dev 
* commit '2f2e37979903a6ed0d55dee78864c2cbb9fb9d7e':
  Make LeadingMarginSpan2 behavior more consistent
 2014-08-14 20:07:39 +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
Jason Monk
92117e9b0c Merge "Switch exiting screen pinning to recents+back" into lmp-dev 2014-08-14 19:41:44 +00:00
Jason Monk
815e057b9b Switch exiting screen pinning to recents+back 
When accessibility is on, still use just recents.

While here fix strings to be less wrong.  Still need finalization.

Bug: 16649417
Change-Id: I94debe9471d5132f1f662543cc98cbde638c758d
 2014-08-14 20:06:41 +00:00
Alan Viverette
b7bd357cb8 Merge "Prevent SwitchPreference widget from receiving a11y focus" into lmp-dev 2014-08-14 19:41:44 +00:00
Alan Viverette
0464ca04e8 Prevent SwitchPreference widget from receiving a11y focus 
Has no effect on behavior when explore by touch is turned off.

BUG: 16961152
Change-Id: I1e494d6a86f261d22d551afc43fe9e499907df6f
 2014-08-14 20:00:04 +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
Fabrice Di Meglio
1d615fbf2c am 25c2863e: Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment@273c8fdb was not registered 
* commit '25c2863ef72dc3044d68c6b58a54f6b67b9d918b':
  Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment$1@273c8fdb was not registered
 2014-08-14 18:04:32 +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
Sungsoo Lim
e11c22b65d am 9297918a: am 052d64a2: am 19e3564c: Merge "Update Java doc for TV Rating system" into lmp-dev 
* commit '9297918ade48c5523804bffad1cf389cf5cabbfb':
  Update Java doc for TV Rating system
 2014-08-14 17:57:04 +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
Sungsoo Lim
b270f5fcee am 052d64a2: am 19e3564c: Merge "Update Java doc for TV Rating system" into lmp-dev 
* commit '052d64a25ea5feafb69ff6857bcf2e2451e81f5f':
  Update Java doc for TV Rating system
 2014-08-14 17:47:29 +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
Jae Seo
7b7ce1586e am 5152ff49: Merge "TIF: Rename R.attr.contentRatingSystemXml and fix documentation" into lmp-dev 
* commit '5152ff49dad6517759902ecdc00479af36ea3808':
  TIF: Rename R.attr.contentRatingSystemXml and fix documentation
 2014-08-14 17:39:25 +00:00
Jose Lima
406e4333f2 am bd2f1793: Make TranslucentConversionListener a SystemApi 
* commit 'bd2f17932b96cad3f070a5078290f70cb1f387f4':
  Make TranslucentConversionListener a SystemApi
 2014-08-14 17:04:43 +00:00
Chet Haase
9fde9a250f Merge "ActionBarOverlay needs to be focusable" into lmp-dev 2014-08-14 16:46:52 +00:00
Jeff Sharkey
82d6d337b3 Merge "Some networks may have null ifaces, I guess?" into lmp-dev 2014-08-14 16:46:52 +00:00
Jeff Sharkey
9da2f1e007 Some networks may have null ifaces, I guess? 
Seems like a bug further upstream, but guard ourselves against it
for now.

Bug: 17033841
Change-Id: Id0e5895c3389b63d4e34b1fb064efef8b72cd609
 2014-08-14 22:42:27 +00:00
Adam Powell
21dbab14f4 Merge "Show checkmarks at the start of material AlertDialog list items" into lmp-dev 2014-08-14 16:46:52 +00:00