Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,683 Commits 3 Branches 0 Tags
cbb212ff6f06b004ae19dfb6958ee3852716bbdc
Commit Graph

33203 Commits

Author SHA1 Message Date
Wink Saville
f2c89b9ed6 am 9516ed45: am cfc23ac6: Merge "Add support for MNC=00" 
* commit '9516ed4598948eea5623c57e443bce08c1f48ab6':
  Add support for MNC=00
 2013-07-30 12:28:05 -07:00
Wink Saville
9516ed4598 am cfc23ac6: Merge "Add support for MNC=00" 
* commit 'cfc23ac688be9de1ecd2e659455ea1ebcceb63dc':
  Add support for MNC=00
 2013-07-30 12:24:39 -07:00
Wink Saville
cfc23ac688 Merge "Add support for MNC=00" 2013-07-30 19:19:47 +00:00
Eino-Ville Talvala
2f1a2e423e Camera2 API: Rename package to android.hardware.camera2 
Change-Id: I77b7939e199f9fe8e12a59393c24cff08097448c
 2013-07-30 11:37:31 -07:00
Alan Viverette
39dd5a62ae Merge "Implement drag to open overflow menu, lift to select" 2013-07-30 18:04:43 +00:00
Alan Viverette
f45bdaf512 Merge "Don't show spinner popup if adapter is null" 2013-07-30 18:04:18 +00:00
Jean-Baptiste Queru
d248b0a4de am c2314cf5: am e700a36e: Merge "Update getCheckedItemPositions() documentation" 
* commit 'c2314cf5f4efa2cc767e0069dcc2a67e12d7cd20':
  Update getCheckedItemPositions() documentation
 2013-07-30 10:28:24 -07:00
Yorke Lee
6acfa5d567 Add URI and fields for new pinned position API in ContactsContract. 
Change-Id: I947e49212750e0042a806d8f16817dc65597f45c
 2013-07-30 09:52:36 -07:00
Jean-Baptiste Queru
c2314cf5f4 am e700a36e: Merge "Update getCheckedItemPositions() documentation" 
* commit 'e700a36e4041a921f880a7c3c5ec6ce96c955a92':
  Update getCheckedItemPositions() documentation
 2013-07-30 09:22:51 -07:00
Jean-Baptiste Queru
e700a36e40 Merge "Update getCheckedItemPositions() documentation" 2013-07-30 16:16:38 +00:00
Alan Viverette
b9867eab1d Don't show spinner popup if adapter is null 
BUG: 10076106
Change-Id: I1c1c235645b7963f802b0747f7ca64d8aedaaa66
 2013-07-29 19:07:55 -07:00
Jonathan Dixon
a75246951f Merge "Make WebViewProvider constants private" 2013-07-30 01:22:18 +00:00
Jonathan Dixon
09397ba3d5 Make WebViewProvider constants private 
In preperation for DEFAULT_TO_EXPERIMENTAL_WEBVIEW flag-flip, make this
field and WEBVIEW_EXPERIMENTAL_PROPERTY private so we know all users are
querying the property in a consistent way.

Change-Id: Iabaffb8ac5a34e323b170339d47f872eb4c83042
 2013-07-29 16:42:42 -07:00
Wink Saville
5e56bc5437 Add network type TYPE_MOBILE_IA. 
Add a network type for establishing connections to the apn used for
the initial connection.

Enable some debug for now.

Bug: 8733613
Change-Id: Ia627ac0cf5715660b6d02bb13a83d46ec1727b87
 2013-07-29 15:02:29 -07:00
Alan Viverette
80e7270085 Implement drag to open overflow menu, lift to select 
BUG: 9437139
Change-Id: Iaa962453ba1b2c739a04b6b1be4f6de1fb2fa752
 2013-07-29 13:59:41 -07:00
Jonathan Dixon
d8501485e3 Build fix for WebViewFactory 
Make fields public again until users are no longer using them

Change-Id: I27d06ca8478f5ba44940e8ce15d65df97cbbb5f1
 2013-07-29 13:05:52 -07:00
Jonathan Dixon
01914014ca Merge "Add accessors for WebViewFactory.UseExperimentalWebView" 2013-07-29 18:50:55 +00:00
Jonathan Dixon
a7eaa8ee22 Add accessors for WebViewFactory.UseExperimentalWebView 
In preperation for flag-flip, have Settings app access the current
state via methods that are neutral to the on/off state.
Also setup the property to change name when enabled by default, to reset
any user changes to this setting.

Change-Id: I55017bcd89573c1ecac7de8913264d9cf66fdcd9
 2013-07-29 11:45:34 -07:00
Satoshi Kataoka
eb219ee190 Change visibility of the hidden input method utility 
Change-Id: I66303bc9e056388fef8cc884d7d98b0660ccdd15
 2013-07-29 18:50:49 +09:00
Jonathan Dixon
fa80ad95d3 Merge "Remove spurious @Deprecate tag from WebView.onMeasure" 2013-07-27 01:40:18 +00:00
Jonathan Dixon
697c8ed523 Remove spurious @Deprecate tag from WebView.onMeasure 
onMeasure is not deprecated, this tag is spurious (and has no effect on
the api.txt or SDK anyway)

Change-Id: Iae003727649e86db2e0adaa5071399b676526c38
 2013-07-26 16:40:02 -07:00
Alan Viverette
7e897aa600 Merge "Show FastScroller thumb on mouse-over" 2013-07-26 22:56:39 +00:00
David Christie
54e5f0eb76 Merge "Revert "Add WorkSource capability to AlarmManager"" 2013-07-26 19:45:28 +00:00
David Christie
f10f9ea06c Revert "Add WorkSource capability to AlarmManager" 
This reverts commit 02600fb66b.

Broke some tests.

Change-Id: Ic47b23a935bf90aba817073c27cd247306db7d5f
 2013-07-26 19:40:53 +00:00
Mattias Petersson
1d766b5321 Add support for MNC=00 
This adds support for operators with MNC (Mobile Network Code) zero
to add customized resources. For example, it makes it possible to
add a folder called "/res/values-mnc00/" in an application. This will
cause resources in that folder to be used when MNC is zero.
(There is a total of 14 countries that have an operator with MNC
zero.)

Without this fix, the resource framework gets confused, because MNC 0
is normally used when the MNC is undefined (not set).

Bug: 7170488
Change-Id: Icfd39fd0c739216e89446252ea0e7ceba6f002c6
 2013-07-26 18:42:34 +00:00
John Spurlock
136247b037 Merge "StatusBarNotification cleanup." 2013-07-26 18:42:12 +00:00
David Christie
52235b844f Merge "Add WorkSource capability to AlarmManager" 2013-07-26 18:38:40 +00:00
Zhihai Xu
876d100f02 Merge "Add debug menu to enable btsnoop" 2013-07-26 18:33:43 +00:00
Zhihai Xu
c8a4d7d089 Merge "Revert "Bluetooth stopped working in master - "bad file descriptor""" 2013-07-26 18:15:13 +00:00
Zhihai Xu
560a523159 Revert "Bluetooth stopped working in master - "bad file descriptor"" 
This reverts commit df3cedab6f.

Change-Id: I9ffaf5580924c150145d37ec38ffde602199b7e2
 2013-07-26 18:10:06 +00:00
Zhihai Xu
d4360f0c17 Merge "Bluetooth stopped working in master - "bad file descriptor"" 2013-07-26 18:08:32 +00:00
Martijn Coenen
437d770118 Merge "Change XML-grammar for (Off)HostApduServices." 2013-07-26 16:52:55 +00:00
David Christie
02600fb66b Add WorkSource capability to AlarmManager 
Change-Id: Ibcff01a9f54a89fde6e7e5b7658e9a90b9a2445b
 2013-07-26 09:41:59 -07:00
John Spurlock
a381d375f3 StatusBarNotification cleanup. 
Remove obsolete ctor and obsolete accessor comment.

Change-Id: Ib72abc8fbd2a5f9a1b82da986094667f39e0bf62
 2013-07-26 10:42:56 -04:00
Martijn Coenen
c3178e5f1c Change XML-grammar for (Off)HostApduServices. 
AIDs can now carry a category attribute. Clarified that
"OffHostApduService" is not bound to by Android, and may
be extended by offering service interfaces that are not
defined in the platform.

Change-Id: Idd0a3990beb927e8d81366013f53386fb46e3f9f
 2013-07-25 17:43:47 -07:00
Chet Haase
b63425e4e7 Merge "Fix lazy measure logic to not use obsolete values" 2013-07-26 00:27:50 +00:00
Matthew Williams
09d20f3bc2 Merge "Fixed NPE in SyncRequest for Bundle.EMPTY" 2013-07-26 00:23:11 +00:00
Dianne Hackborn
5bd42924f2 Merge "Okay, I give in, add null key support to ArrayMap and ArraySet." 2013-07-26 00:16:38 +00:00
Chet Haase
1f99240c64 am d766d71a: am d547bcec: Merge "Return the actual interpolator of the ViewPropertyAnimator" 
* commit 'd766d71a4ccb2d2a6966b2319f272f64fdcbfa7d':
  Return the actual interpolator of the ViewPropertyAnimator
 2013-07-25 17:04:16 -07:00
Dianne Hackborn
62d708f4dd Okay, I give in, add null key support to ArrayMap and ArraySet. 
Change-Id: Iac5035f9c5884a9f9d5acb38132bb128d7a55249
 2013-07-25 16:53:09 -07:00
Matthew Williams
68e39c3411 Fixed NPE in SyncRequest for Bundle.EMPTY 
Writing to bundle caller provides causes app to crash if bundle
is Bundle.EMPTY, which is backed by an unmodifiable map.

Change-Id: Ia9bdf12cddea9673bb84e0458cce8bc8027fbba5
 2013-07-25 16:40:23 -07:00
Chet Haase
deababcd53 Fix lazy measure logic to not use obsolete values 
Issue #10022821 Lazy measure broken

Change-Id: I618ed5e80291304b5430c853d51e70e09f057e4c
 2013-07-25 16:06:48 -07:00
Chet Haase
d766d71a4c am d547bcec: Merge "Return the actual interpolator of the ViewPropertyAnimator" 
* commit 'd547bcec5634f99195a2b12522b6977f61c40d55':
  Return the actual interpolator of the ViewPropertyAnimator
 2013-07-25 14:52:31 -07:00
Chet Haase
d547bcec56 Merge "Return the actual interpolator of the ViewPropertyAnimator" 2013-07-25 21:46:49 +00:00
Alan Viverette
a709b37eab Show FastScroller thumb on mouse-over 
BUG: 9484233
Change-Id: I99a37e6d582e42b9a0fae4a0fc2d4348419bfa35
 2013-07-25 14:43:24 -07:00
Matthew Williams
c81891c125 Fixes to javadoc 
That was breaking sdk(linux) and aosp_mips-eng (linux)

Change-Id: I1d6737baf68e004a2764d1dbee816f98a1a49be8
 2013-07-25 14:27:43 -07:00
Zhihai Xu
118c85156a Bluetooth stopped working in master - "bad file descriptor" 
only close file descriptor which is created internally for LocalSocketImpl

bug:9960585
Change-Id: I79492a05cc7c81ae6e134058840d5ca0b7663795
 2013-07-25 13:44:50 -07:00
Elliott Hughes
efaad3e2c6 resolved conflicts for merge of a35ec14f to master 
Change-Id: Ib2eb18fe6df2e404d0bf739b300fc200ca81f539
 2013-07-25 10:36:59 -07:00
Elliott Hughes
a35ec14f78 am 03bd8324: Merge "Switch DateUtils.formatDateRange over to an icu4c-based implementation." 
* commit '03bd832461d02675d5a4c6a9c072bed18e81781e':
  Switch DateUtils.formatDateRange over to an icu4c-based implementation.
 2013-07-25 10:26:32 -07:00
Cyril Mottier
d40acfb89e Return the actual interpolator of the ViewPropertyAnimator 
The implementation of getInterpolator() was always returning null
(probably a quick copy-paste from the default Animator implementation).
This patch fixes the problem by returning the interpolator set by
setInterpolator(TimeInterpolator) or the default one if none has been
set yet.

This patch also avoid creating multiple instances of ValueAnimator in 
order to retrieve some default values.

Change-Id: I8880f419f021a8b980fb32bebe927915fde19bf7
 2013-07-25 10:08:29 +02:00