Commit Graph

36599 Commits

Author SHA1 Message Date
Chris Wren
5c57c44eea Merge "record the notification style" 2014-01-31 19:19:23 +00:00
Chris Craik
1d89563ff8 Merge "Add initial hidden outline APIs" 2014-01-31 18:56:41 +00:00
Chris Wren
91ad563da3 record the notification style
Bug: 10634902
Change-Id: I7d29f252367f4ab58e97a6ac8b0c6702f558e5cf
2014-01-31 12:15:03 -05:00
Narayan Kamath
90b8eaa68b am 797b5adc: am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
* commit '797b5adcb4ead3c687db3d9fd831dff93760dd4a':
  AArch64: Make AssetManager and related classes 64-bit compatible
2014-01-31 17:12:42 +00:00
Narayan Kamath
fd6a44d0b5 am ff62e966: am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly"
* commit 'ff62e966b60bb20dc7c3384485816b1e7bf06057':
  Fixed cancel() not working correctly
2014-01-31 16:41:42 +00:00
Narayan Kamath
797b5adcb4 am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
* commit '77a1986c69760583f05eabbf7dac7c25dd8b7e7b':
  AArch64: Make AssetManager and related classes 64-bit compatible
2014-01-31 16:29:23 +00:00
Narayan Kamath
ff62e966b6 am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly"
* commit '149510e010b46a445355a8d7fcdb8401125b92c3':
  Fixed cancel() not working correctly
2014-01-31 16:29:16 +00:00
Ashok Bhat
896043d67d AArch64: Make AssetManager and related classes 64-bit compatible
Following changes have been done:

[x] Long is used to store native pointers as pointers can be
    64-bit.

[x] AssetManager openAsset native function returned -1 if
    file name was empty and java function considered any
    non-zero value as success. This has been fixed by native
    function throwing Illegal Argument Exception as well.

[x] AssetManager incRefsLocked and decRefsLocked now accept
    long as input to support 64-bit native references.

[x] AssetManager incRefsLocked method incorrecly used
    'this.hashCode()' instead of the passed parameter id.
    This has been fixed.

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

Change-Id: I095b9f900d49e51f43ad6afc47cbc23116a6a64a
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-31 14:14:29 +00:00
Narayan Kamath
b9f960e094 Merge "Fixed cancel() not working correctly" 2014-01-31 13:20:58 +00:00
Narayan Kamath
dfd1aa4331 resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp
Change-Id: Ia28df1c1aa084959ed9289bfe90e7f6a4bffb8a2
2014-01-31 12:57:24 +00:00
Narayan Kamath
5cdbac1e44 am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '70986e197bbaf4de4f8126519a75df2b057c3b52':
  AArch64: Use of long for pointers in PropertyValuesHolder
2014-01-31 12:17:09 +00:00
Hui Lu
945d69d7b8 am 3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev
* commit '3cab7fc1b8f06166df3a58cf10d4a0db36bde788':
  Add proxy as another network.
2014-01-31 08:11:57 +00:00
George Mount
d085625976 Merge "Add PathInterpolator to interpolate along a Path." 2014-01-31 00:53:20 +00:00
George Mount
6e5f045ddf Add PathInterpolator to interpolate along a Path.
Change-Id: I45b361ef8edd49b5e22d66ba9e25600065e0d5e7
2014-01-30 16:50:15 -08:00
Brian Carlstrom
a76be8ba7a Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default" 2014-01-31 00:21:16 +00:00
Chris Craik
a2fe7affd3 Add initial hidden outline APIs
Background drawable outline usage and drawable outline calculation
still to come.

Change-Id: I8c7539f1638f86e1f8eb11f4fe49f705f61d58ba
2014-01-30 16:04:16 -08:00
Brian Carlstrom
fdb98d4770 frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
(cherry picked from commit c6c633608a)

Bug: 12798969
Change-Id: Ibb7ed86867e4dca53ad7fe33326b08e6f5e664c4
2014-01-30 15:56:37 -08:00
Hui Lu
3cab7fc1b8 Merge "Add proxy as another network." into klp-modular-dev 2014-01-30 22:58:48 +00:00
Hui Lu
1c5624a012 Add proxy as another network.
Change-Id: I70cb6ac5604c4f0d6a752a291c40de2445ae98bb
2014-01-30 17:26:18 -05:00
Fabrice Di Meglio
d95dc28f8e Merge "Make public but hide OnPreferenceTreeClickListener" 2014-01-30 22:17:16 +00:00
Fabrice Di Meglio
25da1bac82 Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216)" 2014-01-30 22:15:07 +00:00
Andy McFadden
acdbb9a9e1 Merge "Allow "opaque" flag to be updated" 2014-01-30 21:41:38 +00:00
Brian Carlstrom
c6c633608a frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
Bug: 12798969
Change-Id: Ibb7ed86867e4dca53ad7fe33326b08e6f5e664c4
2014-01-30 13:16:48 -08:00
Dan Sandler
a5e0f415d3 SystemUI support for notification visibility.
In this implementation, DISABLE_NOTIFICATION_TICKER (which was never
really used on its own and can be safely subsumed by
DISABLE_NOTIFICATION_ICONS) is now DISABLE_PRIVATE_NOTIFICATIONS;
when this SystemUI bit is set by the keyguard, SystemUI knows to switch
its presentation into "public" mode, in which
VISIBILITY_PRIVATE notifications are replaced with their
publicVersion's contentView (or a placeholder view,
synthesized by SystemUI, that leaks no additional
information about the notification). VISIBILITY_SECRET
notifications are suppressed altogether in this mode.

This behavior is enabled but not activated by default. To
turn it on, run:

  $ adb shell settings put secure lock_screen_allow_notifications 1

and restart SystemUI.

Change-Id: Id660bef7737580e16a83f60567c22b53ee81c602
2014-01-30 13:23:14 -05:00
Dan Sandler
0bf2ed8ae3 Notification visibility APIs.
The new visibility property allows an application to signal
to SystemUI whether a notification's contents are safe to
show in "public" situations, i.e. outside of a secure
lockscreen, or whether they should be treated as "private"
(where only the icon is revealed).

Apps that post information that includes no personal or
sensitive information (e.g. a weather alert) can use
VISIBILITY_PUBLIC to allow users to see (and potentially
even dismiss) this kind of notification without unlocking
their devices.

The historical treatment of Android notifications
corresponds to VISIBILITY_PRIVATE, which is the default
visibility setting for all notifications, including apps
that are not aware of this API.

VISIBILITY_PRIVATE notifications may optionally specify a
publicVersion, which is a whole other Notification object
whose contentView will be shown in public contexts. This
allows an app to provide a "redacted" public version of its
notification that is more useful than the system-supplied
version (showing just the icon and app name) but still
conceals private information. For example, a messaging app
that today posts a Notification including the sender and
contents of each message could additionally specify a
publicVersion that says, simply, "N new messages".

There's also VISIBILITY_SECRET for notifications that should
be totally concealed (that is, no icon) in public contexts.
To reveal any hint of this kind of notification would
require the user to unlock the device.

Change-Id: I1552db36c469954d27d3c92ba21ac5c703d47ae1
2014-01-30 12:26:30 -05:00
jl1990
3cd12a5155 Fixed cancel() not working correctly
The method handleMessage(Message msg) from mHandler variable was
not checking if the timer was cancelled, so
sendMessageDelayed(obtainMessage(MSG), delay) was keeping the
timer alive. The patch simply adds a boolean and checks if the
CountDownTimer was cancelled before calling
sendMessageDelayed(obtainMessage(MSG), delay)

bug: https://code.google.com/p/android/issues/detail?id=58668

Change-Id: Ic6bbb9d33a3616f8503db222513cc14ad2270cb8
Signed-off-by: jl1990 <jlcarrasco1990@gmail.com>
2014-01-30 13:46:44 +00:00
Przemyslaw Szczepaniak
8399aae0a0 Add public SynthesisRequestV2 constructor.
While implementing the new TTS API, I found out that it's very difficult
to create an SynthesisRequestV2 instance for testing purposes - it's
a final class, with no publicly visible constructors.

Bug: 8259486
Change-Id: I88b84fd8ad1ac6960f3932863ca758657f9547ff
2014-01-30 13:27:00 +00:00
Przemyslaw Szczepaniak
1ca1d88658 Allow clients to extend the TTS UtteranceId class.
This change allows TTS clients to create (and use) classes derived from the
UtteranceId class. This allows to attach a custom data and methods that
can be reached later in callbacks that take the UtteranceId instance as
parameter.

Also, since we can't depend on the identityHashCode results being unique,
this change adds AtomicInteger to generate unique identifiers for UtteranceId
instances.

Bug: 8259486
Change-Id: Id1e9eabc890ec585a7f8570fd20e287dcda9a11d
2014-01-30 10:41:26 +00:00
Andy McFadden
314405bf89 Allow "opaque" flag to be updated
Added a setOpaque() call and a bunch of comments.

Bug 12387406

Change-Id: Ic066cba926223f22f9bc56a7013987001d9cc795
2014-01-29 17:38:10 -08:00
Chris Craik
0e7eb954f1 Fix build breakage
Change-Id: I65ab3cb691935db23b7a1f600e421fb5d8e850cd
2014-01-29 15:30:50 -08:00
Chris Craik
6657a6c539 Update reordering method names, and make 3d reordering API public
IsContainedVolume -> hasIsolatedZVolume conveys that this affects Z
ordering of views

ProjectToContainedBackground -> ProjectBackwards, since it ended up
using its own projection target, separate from the 3d volume bit

Change-Id: Ia2cde838cc4da134366fe6ff623290fbd65e50c3
2014-01-29 13:55:39 -08:00
Dan Sandler
4d67c3a070 Merge "Fix NPE in empty SizeAdaptiveLayouts." 2014-01-29 17:26:32 +00:00
Narayan Kamath
c2cf1e1df4 Merge "AArch64: Use of long for pointers in PropertyValuesHolder" 2014-01-29 15:26:48 +00:00
Evan Charlton
33da8dde5f Merge "Allow for a configurable WiFi restore bounce delay" 2014-01-29 14:58:29 +00:00
Narayan Kamath
ef099b7183 am 4a587146: am 09d07d0d: am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
* commit '4a58714606fdeb2e740b0ce51ea5074783e2ecf4':
  AArch64: Make Binder and Parcel 64-bit compatible
2014-01-29 12:50:02 +00:00
Ashok Bhat
fbb35fb39e AArch64: Use of long for pointers in PropertyValuesHolder
Long is used in PropertyValuesHolder class to store native pointers
as they can be 64-bit. Note that jmethodID, a pointer to structures,
is also carried in long rather than int to support 64-bit system.

Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>

(cherry picked from commit 0141e88434)

Change-Id: I80408a7227427732db0d8b4c960bcb849b7c8060
2014-01-29 11:07:06 +00:00
Narayan Kamath
4a58714606 am 09d07d0d: am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
* commit '09d07d0d33d44fc87c02a8f607ecb7b96dbb4145':
  AArch64: Make Binder and Parcel 64-bit compatible
2014-01-29 10:54:26 +00:00
Narayan Kamath
09d07d0d33 am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
* commit 'e3e4b40577032f6fad38bfbeb9c2b40df89f0ef9':
  AArch64: Make Binder and Parcel 64-bit compatible
2014-01-29 10:51:51 +00:00
Narayan Kamath
e3e4b40577 am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
* commit '9846fb695a3c41aabde4ca0061d583b35f9621d1':
  AArch64: Make Binder and Parcel 64-bit compatible
2014-01-29 10:48:52 +00:00
Ashok Bhat
0141e88434 AArch64: Use of long for pointers in PropertyValuesHolder
Long is used in PropertyValuesHolder class to store native pointers
as they can be 64-bit. Note that jmethodID, a pointer to structures,
is also carried in long rather than int to support 64-bit system.

Change-Id: Ifb514fc8473d7c41c0d6194fc6eb85d4816b2cd9
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-01-29 10:47:27 +00:00
Narayan Kamath
50afaefdc0 Merge "AArch64: Make Binder and Parcel 64-bit compatible" 2014-01-29 10:43:23 +00:00
Fabrice Di Meglio
ab5e089585 Merge "Fix bug #12467741 Java crash in com.android.settings: java.lang.IllegalStateException: The content of the adapter has changed but ListView did not receive a notification." 2014-01-28 23:16:08 +00:00
Fabrice Di Meglio
ef4aad220f Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API" 2014-01-28 23:15:24 +00:00
Fabrice Di Meglio
fa55105137 Merge "Fix new TimePicker accessibility" 2014-01-28 23:14:49 +00:00
Fabrice Di Meglio
83ed4fe1d5 Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216)
- fix the NPE by checking the validity of the child reference retrieved by View.getChildAt(...)

Change-Id: I6821448a5831c83c0931eb7bb0ef4c3f1a47247f
2014-01-28 15:11:49 -08:00
Svetoslav Ganov
c0877962b3 Adding the print and accessibility pacelables to framework.aidl
1. There are a few parcelable classes related to printing and accessibility
   which are public but not added in the framework.aidl list so third parties
   cannot write aidl interfaces that pass these classes. As these classes
   are public it is resonable for devepers to be able to pass them between
   processes.

Change-Id: I85da1de5198902b74f19d23e3fe16b45b4a11051
2014-01-28 23:00:14 +00:00
Fabrice Di Meglio
ba4d2a08f9 Fix bug #12467741 Java crash in com.android.settings: java.lang.IllegalStateException: The content of the adapter has changed but ListView did not receive a notification.
- add missing notifyDataSetChanged() call

Change-Id: I633b78be3805bc8610b4aaeb70b1988768f764b7
2014-01-28 14:55:17 -08:00
Mike J. Chen
5dadeba229 am 1ece04f3: Merge "BluetoothInputJava: Add broadcast action REPORT" into klp-modular-dev
* commit '1ece04f37fc93983ee058916e9913b6341e6de83':
  BluetoothInputJava: Add broadcast action REPORT
2014-01-28 20:44:25 +00:00
Mike J. Chen
1ece04f37f Merge "BluetoothInputJava: Add broadcast action REPORT" into klp-modular-dev 2014-01-28 20:41:22 +00:00
Narayan Kamath
583b7b1671 am 39a789bf: am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"
* commit '39a789bf6efd5c3478a442e60e896cae371fd04c':
  AArch64: Make graphics classes 64-bit compatible
2014-01-28 19:26:29 +00:00