Commit Graph

46534 Commits

Author SHA1 Message Date
ztenghui
df62ab4833 Merge "Add group scaling factor into stroke width." 2015-04-03 20:09:02 +00:00
John Spurlock
689dd8fb5b Merge "Zen: Changes to support new priority settings." 2015-04-03 20:07:56 +00:00
John Spurlock
fc746f8ac5 Zen: Changes to support new priority settings.
Bug: 20064962
Change-Id: Iac3444c0a55830d5e5459e26c2172d974db600d6
2015-04-03 15:55:13 -04:00
Fabrice Di Meglio
96bba82ac4 Merge "Add private flag PRIVATE_FLAG_HAS_DOMAIN_URLS to ApplicationInfo" 2015-04-03 19:33:41 +00:00
Fabrice Di Meglio
d3d8a32217 Add private flag PRIVATE_FLAG_HAS_DOMAIN_URLS to ApplicationInfo
This is for supporting Settings UX and Domain URLs

- the new PRIVATE_FLAG_HAS_DOMAIN_URLS flag will be set by
generateApplicationInfo() when the Activity is said to have some
IntentFilter with a VIEW action and a http / https data URI

- code cleaning for args passing
- also add a new constant for the MetricsLogger

Change-Id: I5c9762fc2c4a9b46c0e255b9a23bffd70fae40c7
2015-04-03 12:29:53 -07:00
Eino-Ville Talvala
456432ead7 Camera2: Wire depth formats into StreamConfigurationMap
Change-Id: I9046b60dca83d090efd9c74c98bfdfebdeae8751
2015-04-03 18:48:04 +00:00
Jorim Jaggi
64e71cd6cc Merge changes from topic 'assist'
* changes:
  Add test assist to implement motion study
  Implement new assist gesture and motion
  Add flag to voice interactor for supporting assist gesture
  Add more internal API's for assist
  Add ability to start voice interaction session directly
2015-04-03 18:26:41 +00:00
Jorim Jaggi
0b68ff4512 Add flag to voice interactor for supporting assist gesture
Add an additional flag to the voice-interaction-service declaration
so it can indicate whether it is able to handle the assist gesture.
Use that information in SystemUI so it only starts the voice
interaction session if the service is able to support it.

Change-Id: I62b035ce4f4cf06ee6e7eb0ddc4bf5edbc0e6737
2015-04-03 11:12:13 -07:00
Jorim Jaggi
225d3b5449 Add more internal API's for assist
- When starting a voice interaction session from SysUI, a callback
can be passed to know when voice interaction has successfully started
- Add a new window type for the voice interaction starting window,
which resides behind the voice interaction layer.
- SystemUI now also inspects the voice interaction service to get the
logo asset for the starting window.
- Make VoiceInteractionSession window fullscreen, to accomodate for
the visuals.

Change-Id: If8c3c445e8b39841f48e8d153e6d1ba81e447286
2015-04-03 11:12:03 -07:00
Jorim Jaggi
25e12abc5b Add ability to start voice interaction session directly
Add internal API's for SystemUI to start a voice interaction session
directly, without using an intent.

Make the assist gesture use that ability, if available.

Change-Id: I88ce3c7514714eb45666884847193585a07417a9
2015-04-03 11:11:51 -07:00
Doris Liu
34ed4dbe57 Merge "Add per-interval interpolation support for keyframe in xml resources" 2015-04-03 17:17:09 +00:00
Dianne Hackborn
12611bdf6d Merge "Add quick and dirty async AssistStructure building." 2015-04-03 16:46:54 +00:00
Fyodor Kupolov
c38a54b1f0 am 30c688da: am 031898df: am 3d8b7f4d: Merge "Support for storing OAT files in app directory"
* commit '30c688da8bd2b3320446a06424e1cc57b693522a':
  Support for storing OAT files in app directory
2015-04-03 14:52:14 +00:00
Julia Reynolds
3370e446b1 Merge "Store the device initializer componentname in addition to package." 2015-04-03 14:30:18 +00:00
Julia Reynolds
eaafdf72a4 Store the device initializer componentname in addition to package.
This removes ambiguity about which component in the initializer
package handles device initialization when setting up secondary users.
Bug: 19992262

Change-Id: I2e48168907725a56cd05d0b51c9f28b34fa28d1a
2015-04-03 08:27:34 -04:00
John Spurlock
ad80b437f9 Merge "Zen: Add a new level: alarms-only." 2015-04-03 03:03:46 +00:00
John Spurlock
4f1163c83e Zen: Add a new level: alarms-only.
Like no-interruptions, but allows alarms.

Bug: 19260237
Change-Id: I36bf0a333362256c8e54cd83992cb46c3bcb7f69
2015-04-02 23:00:40 -04:00
Dianne Hackborn
5688b03f7f Add quick and dirty async AssistStructure building.
New APIs on ViewAssistStructure all the app to request to
build a sub-tree asynchronously and indicate when it is done
with that.  The overall AssistStructure is now only flattened
and transfered on-demand, when the app receiving it requests
its data -- and at that point we can wait for any asynchronous
building to complete.

New AsyncStructure view is a very simple example of using this
to asynchronously build a child view.

Change-Id: I14f9199bee64915ad3dc80b2190916ec874308af
2015-04-02 18:43:31 -07:00
Tor Norbye
2a53812cfa Merge "Fix resource type annotations for obtainStyledAttributes" 2015-04-02 23:45:22 +00:00
Doris Liu
6aac06ab94 Add per-interval interpolation support for keyframe in xml resources
Bug: 19913234
Change-Id: Ie46af02b2db3dad6ace667480aa556e0f645d278
2015-04-02 16:28:40 -07:00
Fyodor Kupolov
031898dfd2 am 3d8b7f4d: Merge "Support for storing OAT files in app directory"
* commit '3d8b7f4d50c2f7c64ec4e5874fd95cf837ddc12e':
  Support for storing OAT files in app directory
2015-04-02 23:27:38 +00:00
Fyodor Kupolov
3d8b7f4d50 Merge "Support for storing OAT files in app directory" 2015-04-02 23:11:11 +00:00
ztenghui
9af77a4ce2 Add group scaling factor into stroke width.
Originally, stroke width is independent of group scaling.
But that is a bug and causing animation trouble.

b/19501782

Change-Id: I33d5e44f2f8b2a82fee1a5a326223a39aaffa86c
2015-04-02 16:09:03 -07:00
Chris Craik
ec3c97d27f Merge "Add compat path for restore underflow" 2015-04-02 22:38:49 +00:00
Chris Craik
3891f3ad59 Add compat path for restore underflow
bug:19829784

Change-Id: Ia761664208ab80c055ca11174db3ddc74457b92b
2015-04-02 15:30:32 -07:00
Tor Norbye
c91531a863 Fix resource type annotations for obtainStyledAttributes
Change-Id: I7681249ff46d687675d0dcd7d4f077646efba687
2015-04-02 14:51:16 -07:00
Jeff Davidson
845e196cb3 Merge "Actually allow all valid characters in a Wi-Fi SSID." 2015-04-02 18:55:15 +00:00
Dianne Hackborn
9e57a25495 Merge "Rework assist to walk down the view hierarchy." 2015-04-02 18:18:42 +00:00
John Spurlock
24d3dad8dd Add new notification category for reminders.
Bug: 20045407
Change-Id: I5c449551fb7ec5a3e2c350f443e1a18b84b4d03f
2015-04-02 14:14:27 -04:00
Alan Viverette
0daa5713ee Merge "Fix issues with theming of preloaded ColorStateLists" 2015-04-02 18:02:04 +00:00
Filip Gruszczynski
ad0eacb917 Merge "Provide size hint inside UNSPECIFIED measure spec." 2015-04-02 15:57:08 +00:00
Jim Miller
0feaaafd7a Merge "Prepare to make Fingerprint API public." 2015-04-02 03:09:39 +00:00
Etan Cohen
36711e0e2c Merge changes from topic 'mwd-merge-040115'
* changes:
  Merge (manually) pag/209446: Increase allowed duration to connect to HOGP profile
  Merge commit 'd91f193' into merge2
  Merge commit '5718646' into merge2
  Merge commit '7aa0345' into merge2
2015-04-02 03:08:02 +00:00
Elliott Hughes
d14f7f12a1 am 095428d2: am d15958f6: am 64c8a073: Merge "Early return in RemoteViewsAdapter is too late"
* commit '095428d262f1cb0cf09d8722fdd9a53661d7513b':
  Early return in RemoteViewsAdapter is too late
2015-04-02 02:58:34 +00:00
Alan Viverette
0048b6e629 Merge "Scale month view for small screens, use verbatim span for AM/PM label" 2015-04-02 02:51:24 +00:00
Jim Miller
ebbf205bc6 Prepare to make Fingerprint API public.
- move fingerprint support files into hardware area
- move jni into services/core

Change-Id: I48a8e43d6d328fb66d79919c255e4c44e984b4d1
2015-04-01 19:20:08 -07:00
Alex Klyubin
305ebe207a resolved conflicts for merge of 261e7a37 to master
Change-Id: If0a3389764965fe27bf567090a6e24069b61c544
2015-04-01 18:23:27 -07:00
Elliott Hughes
d15958f661 am 64c8a073: Merge "Early return in RemoteViewsAdapter is too late"
* commit '64c8a07345cb7cb01b3e98442b52c51d473fbf2d':
  Early return in RemoteViewsAdapter is too late
2015-04-02 01:13:09 +00:00
Alan Viverette
f63757b7a6 Scale month view for small screens, use verbatim span for AM/PM label
Also fixes initial day selection in DatePickerDialog.

Bug: 19933912
Bug: 19937345
Change-Id: I88264a192c087361dbf21b055e74e1facf2506bc
2015-04-01 17:14:45 -07:00
Dianne Hackborn
6251f0d42b Rework assist to walk down the view hierarchy.
Instead of collecting all of the data directly in AssistStructure,
we now have a dispatch mechanism down the hierarchy to do so.
While doing this, also added the ability to automatically collect
assist data from AccessibilityNodeProviders attached to views
(so now we see all of the data in for example Calendar).

This is a first step needed towards being able to asynchronously
populate assist data.

Change-Id: I59ee1ea104ca8207bad8df7a38195d93da1adea7
2015-04-01 17:08:27 -07:00
Elliott Hughes
64c8a07345 Merge "Early return in RemoteViewsAdapter is too late" 2015-04-01 23:34:25 +00:00
Kweku Adams
030980a1fb Fixing issue related to printing out of display state and idle mode in the batterystats checkin.
Change-Id: I533bd53f375bf6d9f818a8e8aa75932986ad779b
2015-04-01 16:07:48 -07:00
Santos Cordon
885b3ef519 Merge "New generic intent for SIM Activation" 2015-04-01 22:38:26 +00:00
Santos Cordon
15a13781ad New generic intent for SIM Activation
New hidden intents and permissions for a generic SIM-activation
activity.  New activity will handle generic SIM setup requests and then
delegate to the appropriate activation method (OTASP, HFA,
CARRIER_SETUP).

Change-Id: I1b22200544abefe486ec961b67a6e77b4d15aec3
2015-04-01 15:35:55 -07:00
Raph Levien
521252225e Merge "Add breakStrategy attribute to TextView" 2015-04-01 21:11:41 +00:00
Alex Klyubin
39b9918631 am 97467d82: Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."
* commit '97467d82a31964e36cb6bc32ac4cf00e884c190e':
  Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
2015-04-01 20:38:07 +00:00
Alan Viverette
c21d0ca48e Merge "Fix docs" 2015-04-01 20:24:20 +00:00
Alan Viverette
1579edcaba Fix docs
Bug: 20011464
Change-Id: Ifcda3e562a3baea474b824e5ac2adcd36e17ae60
2015-04-01 13:23:06 -07:00
Alan Viverette
e0f95f39c5 Fix issues with theming of preloaded ColorStateLists
Ensures changing configurations mask is propagated to the host drawable
so that it can be properly cleared from cache on configuration changes.
Also fixes constant state handling of the mask in the Inset and Rotate
drawables.

Hides new ColorStateList methods related to theming, since they should
only be used during preloading or internally by framework drawables.

Fixes bug where the cached versions of themeable ColorStateLists were
modified by calling applyTheme() on the host drawable.

Also cleans up some docs and naming in GradientDrawable.

Bug: 19966397
Change-Id: I8c8d3cabbaf94b488c2b8fe9fd423e07d824c19c
2015-04-01 13:10:18 -07:00
Alex Klyubin
3f24a1d94a Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
This makes the hidden API android.net.Uri.toSafeString omit most parts
of HTTP, HTTPS, and FTP URLs to avoid leaking anything unsafe. Only
the host and port are retained for these URLs.

Bug: 19215516
Change-Id: I2e9e33d9afaa9de5dd07a40532d56f0a2179f62a
2015-04-01 13:09:22 -07:00