Commit Graph

4063 Commits

Author SHA1 Message Date
Dianne Hackborn
27eac1d58f Add ability to get a screenshot for assist.
New flag you pass in to startSession() to say you want it,
new callback on VoiceInteractionSession to receive it.

Change-Id: I61fdcfdee41a60d46036a2ef16681a9b4181115a
2015-03-17 16:45:51 -07:00
Clara Bayarri
4d3494000c Merge "Delete the ActionModeWrapper now that it is not needed anymore." 2015-03-17 19:12:27 +00:00
Yohei Yukawa
6aa0378878 Remove deprecated hidden public methods from InputMethodUtils.
This is a follow up CL for a recent attempt to minimize
the number of default enabled IMEs.
- part1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3
- part2: Ife93d909fb8a24471c425c903e2b7048826e17a3
- part3: I6571d464a46453934f0a8f5e79018a67a9a3c845
- part4: I871ccda787eb0f1099ba3574356c1da4b33681f3

This CL removes following deprecated hidden public methods
from InputMethodUtils as planned.
- isSystemImeThatHasEnglishKeyboardSubtype(InputMethodInfo)
- isValidSystemDefaultIme(boolean, InputMethodInfo, Context)
- containsSubtypeOf(InputMethodInfo, String, String)

This is a pure code refactoring with preserving the current
logic. Hence no behavior change is intended.

Change-Id: I1ff994cbbdef83e1e907a0d88aa9ae09d45263b4
2015-03-17 21:59:26 +09:00
Dianne Hackborn
3d07c94c39 Add new voice request for picking from a list.
Also add API for voice interaction service to control
whether the system should hold a wake lock while it is
working with an activity (and actually *do* hold a wake
lock while doing so, duh!).

And while in there, clean up the launching wake lock to
correctly give blame to the app that is launching.

Change-Id: I7cc4d566b80f59fe0a9ac51ae9bbb7188a01f433
2015-03-16 11:29:12 -07:00
John Reck
2c528c2175 am 059ba981: am 386dcbdd: Merge "Frameworks/base: Fix missing cast"
* commit '059ba9814bb07aeebd8bf697fc05ff833c63033b':
  Frameworks/base: Fix missing cast
2015-03-16 15:16:17 +00:00
John Reck
059ba9814b am 386dcbdd: Merge "Frameworks/base: Fix missing cast"
* commit '386dcbddf5c166f98209b78389e79d49ab3a8222':
  Frameworks/base: Fix missing cast
2015-03-16 15:09:04 +00:00
Andreas Gampe
65ac8a2bd7 Frameworks/base: Fix missing cast
Without a cast, the division is integer division.

Change-Id: I050e53778de8b1591a0be16ebbee8eed70eb1528
2015-03-15 14:10:23 -07:00
Christopher Tate
de2826b1e9 Properly set up local transport data dirs after an initialize operation
We were properly setting up the underlying storage at boot time, but
*not* doing so after an "initialize" operation, i.e. after wiping all
of the data upon request.  The effect was that after an init operation
while using the local transport (e.g. if you disabled backup and then
reenabled it with the local transport as your active one), full-data
backup operations wouldn't work until after the next reboot.

(Resubmit, with fixes, of earlier revert.)

Change-Id: I745cb49b5155119d63cff6fffad5230687faca71
2015-03-13 14:41:45 -07:00
Ed Heyl
33dd7a4684 Merge "Fix build: Revert "Properly set up local transport data dirs after an initialize operation"" 2015-03-13 21:03:07 +00:00
Ed Heyl
0a809733da Fix build: Revert "Properly set up local transport data dirs after an initialize operation"
This reverts commit dc205b3f95.

Change-Id: I6ed27c1eb8ddd1894bf0374b989a1b4e3d7761a3
2015-03-13 21:00:45 +00:00
Christopher Tate
6bfcc6bf1c Merge "Properly set up local transport data dirs after an initialize operation" 2015-03-13 20:12:44 +00:00
Dianne Hackborn
484bc6e5a7 Merge "More work on collecting assist data." 2015-03-13 16:41:29 +00:00
Clara Bayarri
af9047161a Delete the ActionModeWrapper now that it is not needed anymore.
Change-Id: I7fcd6cb92a7259168d9f45d9bdfd9ab155a25d0f
2015-03-13 14:15:54 +00:00
Yohei Yukawa
2fbea7ff90 Merge "Expose isSystemImeThatHasSubtypeOf to Settings" 2015-03-13 13:46:40 +00:00
Yohei Yukawa
9c83ff471d Expose isSystemImeThatHasSubtypeOf to Settings
This is a follow up CL for a recent attempt to minimize
the number of default enabled IMEs.
- part1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3
- part2: Ife93d909fb8a24471c425c903e2b7048826e17a3
- part3: I6571d464a46453934f0a8f5e79018a67a9a3c845
- part4: I871ccda787eb0f1099ba3574356c1da4b33681f3

In the avobe CLs, an internal (hidden) method
InputMethodUtils.isValidSystemDefaultIme was marked as
deprecated and we decided to migrate to
InputMethodUtils.isSystemImeThatHasSubtypeOf.

To finish this refactoring, this CL make the new
method visible to the settings app.

InputMethodUtils.isValidSystemDefaultIme remains
to be an internal method. No behavior change is
intended.

Change-Id: I8cb9ca40d15af099c3d1ded46797fb57f14fb9e8
2015-03-13 22:43:06 +09:00
Clara Bayarri
4423d91de5 Add a type parameter to startActionMode() calls.
This requires adding a new method to View and Window.Callback to pass
down the type as a parameter.

For compatibility purposes, the new method implementations keep the
type and call the old method, in case clients have subclassed it.

Change-Id: If5d857f131e33be8cc6a8814f2e9c4e85ad2da25
2015-03-13 10:51:51 +00:00
Christopher Tate
dc205b3f95 Properly set up local transport data dirs after an initialize operation
We were properly setting up the underlying storage at boot time, but
*not* doing so after an "initialize" operation, i.e. after wiping all
of the data upon request.  The effect was that after an init operation
while using the local transport (e.g. if you disabled backup and then
reenabled it with the local transport as your active one), full-data
backup operations wouldn't work until after the next reboot.

Change-Id: I3bfda1e94ae2312678b0bb2dde13ebdb64a56d2b
2015-03-12 19:00:39 -07:00
Wenchao Tong
f5ea340aab NetworkStatsService to adjust VPN stats before recording.
* Creates a new Parcelable class VpnInfo to hold required
  parameters for VPN stats adjustments.
* ConnectivityService to collect infomation and provide
  a list of VpnInfo, one for each user.
* NetworkStatsService passes the VpnInfo array to
  NetworkStatsRecorder.
* NetworkStatsRecorder calls NetworkStats.migrateTun()
  to do the math.
* Poll NetworkStats when the vpn application calls
  setUnderlyingNetworks().

Bug: 19536273
Change-Id: I7a4c7726b8243fead10416f7ec6eb5cf95f20183
2015-03-12 17:43:41 -07:00
Dianne Hackborn
a83ce1dd2a More work on collecting assist data.
Optimize parceling of AssistData (which is now renamed to
AssistStructure) by pooling duplicated class name strings.

Change text associated with a view node to a CharSequence,
so styling information comes along.

Include global text attributes -- size, colors, etc.

Introduce a new AssistContent structure, which allows us
to propagate information about the intent and data the
activity is looking at.  This further allows us to propagate
permission grants, so the assistant can dig in to that data.
The default implementation propagates the base intent of an
activity, so if for example you bring up the assistant while
doing a share the assistant itself has the same information
and access that was given to the share activity (so it could
for example share it in another way if it wanted to).

Did some optimization of loading PersistableBundle from xml,
to avoid duplicating hash maps and such.

Changed how we dispatch ACTION_ASSIST to no longer include
the more detailed AssistStructure (and new AssistContent)
data when launching; now the example code that intercepts
that needs to be sure to ask for assist data when it starts
its session.  This is more like it will finally be, and allows
us to get to the UI more quickly.

Change-Id: I88420a55761bf48d34ce3013e81bd96a0e087637
2015-03-12 17:07:51 -07:00
Alan Viverette
1130363f18 Merge "Various fixes for popup monkey testing" 2015-03-11 21:04:28 +00:00
Alan Viverette
8fd949e680 Various fixes for popup monkey testing
Ensures PopupMenu works correctly when multiple calls are made to show
and dismiss. Ensure PopupWindow works correctly when multiple calls are
made to showAsDropDown and dismiss (fixes multiple clicks on Spinner).

Bug: 19672907
Bug: 19671831
Change-Id: Ib92accd8fd70a1ff1f8cda27155347b007a4d25b
2015-03-11 12:21:30 -07:00
Andreas Gampe
2c1078fbbd resolved conflicts for merge of b6d6c04a to master
Change-Id: I5286b9fe2d9bde4b219496e593cf028cc4c75bc7
2015-03-10 15:45:36 -07:00
dcashman
86bb9ba586 am 4c887ac9: am db7fa51f: am c7446790: Merge "ZygoteConnection: remove obsolete security checks."
* commit '4c887ac9318402b914dbee4462485006395bdfbe':
  ZygoteConnection: remove obsolete security checks.
2015-03-10 18:15:54 +00:00
Sander Alewijnse
053d3ddd40 Do not show toast when forwarding from resolver activity to itself.
Bug:19540802
Change-Id: I99409aab42bdbf187c07a345ca5c404e88a4c918
2015-03-10 16:37:53 +00:00
Andreas Gampe
b6d6c04a71 am 174a4488: am 7f383873: Merge "Frameworks/base: Pass APK debugability to installd"
* commit '174a44888ec56f688426c80d50b9e0021f47c16f':
  Frameworks/base: Pass APK debugability to installd
2015-03-10 15:11:56 +00:00
Andreas Gampe
174a44888e am 7f383873: Merge "Frameworks/base: Pass APK debugability to installd"
* commit '7f383873566024c7121cadae3bbdd2a7c47150bc':
  Frameworks/base: Pass APK debugability to installd
2015-03-10 02:10:22 +00:00
Adam Lesinski
216f3edcb9 Merge "BatteryStats: Record energy info stats from WiFi and Bluetooth controllers" 2015-03-10 01:35:54 +00:00
Adam Lesinski
33dac55935 BatteryStats: Record energy info stats from WiFi and Bluetooth controllers
Surface some of this information in BatteryStatsHelper. If we are given a
total energy from the WiFi controller, we normalize the computed
energy of each app and blame them for a fraction of the real energy.

Change-Id: I64051b600f5d9f6ac4580d56ef0977971eb4be2d
2015-03-09 17:36:13 -07:00
Alan Viverette
b5c4623b7f Merge "Copy ViewPager and PagerAdapter into framework-internal widgets" 2015-03-10 00:22:39 +00:00
Alan Viverette
75fd8f9fdc Copy ViewPager and PagerAdapter into framework-internal widgets
Converted all compat references to native implementations. Removed all
backwards compatibility SDK version checks.

Bug: 19431364
Change-Id: Ia79ed65bd2d041e4c0de6839b64707b9dba3ac22
2015-03-09 15:51:10 -07:00
Andreas Gampe
7f38387356 Merge "Frameworks/base: Pass APK debugability to installd" 2015-03-09 22:14:54 +00:00
dcashman
4c887ac931 am db7fa51f: am c7446790: Merge "ZygoteConnection: remove obsolete security checks."
* commit 'db7fa51ff0f330b79b171f03b4304a75affaabce':
  ZygoteConnection: remove obsolete security checks.
2015-03-09 20:58:54 +00:00
dcashman
db7fa51ff0 am c7446790: Merge "ZygoteConnection: remove obsolete security checks."
* commit 'c74467902b5a9a7267b6cb8f30b364b8373eac72':
  ZygoteConnection: remove obsolete security checks.
2015-03-09 20:51:33 +00:00
dcashman
fc4c0bf8bc ZygoteConnection: remove obsolete security checks.
SELinux guarantees that only the system_server and permissive domains such as su
are allowed to connect to the zygote socket. Remove obsolete security checks
that were only applicable when other processes could connect.

Bug: 19624279
Change-Id: I1c925d7facf19b3953b5deb85d992415344c4c9f
2015-03-09 12:37:08 -07:00
Dianne Hackborn
62793e4382 Battery stats issues: fix jiffy handling, print scan counts.
Issue #19431959: Framework incorrectly assumes that kernel
clock_ticks are 10ms

We now retrieve the time of a jiffy from the kernel, and all CPU
times are now handled in milliseconds.

Issue #19571810: Add per-app breakdown of number of WiFi scans
in batterystats checkin data

Added to the report (the information was already being tracked).

Change-Id: If1702d6b9bcf851704129f1811471e68ed576a5d
2015-03-09 11:15:41 -07:00
Andreas Gampe
735600c1e6 Frameworks/base: Pass APK debugability to installd
Change-Id: Id17ec72babe2ee88713a0d274eff86508de30666
2015-03-09 08:57:23 -07:00
Dianne Hackborn
b9a5e4ad30 Add new debug feature to automatically create heap dumps.
Not yet working, unless you turn off SELinux enforcing.
We need to update SElinux to allow the system process
to give apps access to /data/system/heapdump/javaheap.bin.

Currently watching can only be enabled through the shell,
such as:

adb shell am set-watch-heap com.android.systemui 1024

The last number is the process pss size in bytes, so this is
asking us to warn if it goes about 1K which will be all the
time.

Change-Id: I2089e5db2927afca0bf01a363c6247ee5dcb26e8
2015-03-06 16:42:03 -08:00
Christopher Tate
e51f79975e Merge "Don't enqueue allowBackup=false apps for full backup attempts" 2015-03-06 02:05:34 +00:00
Christopher Tate
77a2d78dbf Don't enqueue allowBackup=false apps for full backup attempts
We are correctly refusing to actually process apps for backup if they have
declared android:allowBackup="false" in their manifests, but we're still
wasting bookkeeping & a certain amount of work in tracking them as part of
the full backup queue.  Fix that; now we recognize that they shouldn't be
in the queue in the first place.

When reinflating the queue at boot time we also re-verify the participation
of each mentioned app so that we properly drop ones that have been uninstalled
or altered such that they are no longer full-data backup candidates.

Finally, if an app previously implemented key/value backup, so we think
we'll be running it in that mode in a future backup pass, but has been
updated to use the full-data path instead, we don't want to go ahead and
run a key/value pass on it.  Added a backstop check and proceed gracefully
in this situation.

(Also add bit more debug-build logging to LocalTransport)

Bug 19462310

Change-Id: I07ab4f2e68e92766d9e8f2595fa763c91193d743
2015-03-05 18:04:16 -08:00
George Mount
f2e9ca1f52 Merge "Handle null epicenters in EpicenterClipReveal." 2015-03-05 22:36:02 +00:00
George Mount
3c75db9961 Handle null epicenters in EpicenterClipReveal.
Bug 19617067

Change-Id: Ie288288f7a8e0c95ed07d8beb40b78f80048fa98
2015-03-05 14:33:37 -08:00
Dianne Hackborn
7d088428f3 Merge "Add new "daily stats" tracking to battery stats." 2015-03-04 00:57:54 +00:00
Dianne Hackborn
d4a8af7b6a Add new "daily stats" tracking to battery stats.
Currently is only used for tracking the daily charge
and discharge rates.  We keep up to 10 days of data.

Change-Id: I54e29e35ff60d9277da9e476cdab22f4a6d540bf
2015-03-03 15:38:58 -08:00
Chris Craik
4939e2bf36 Merge "Improve docs for drawable tint and color filters" 2015-03-03 16:46:48 +00:00
Chris Craik
bd3bfc5285 Improve docs for drawable tint and color filters
bug:19564477
Change-Id: I7e11baae2d4dd245965904c85b8855de71f6b6ac
2015-03-02 16:21:02 -08:00
John Spurlock
7b91c55b3f Merge "Remove unused imports in frameworks/base." 2015-03-02 20:43:50 +00:00
Clara Bayarri
727899fd0d Merge "Floating Toolbar: Wrap the ActionBar ActionMode handling." 2015-03-02 10:04:42 +00:00
John Spurlock
08c7116ab9 Remove unused imports in frameworks/base.
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
2015-02-28 14:47:49 -05:00
Mike Lockwood
238cba3593 Merge "Move ALSA utilities to com.android.internal.alsa package" 2015-02-27 18:42:13 +00:00
Alan Viverette
228fd600ce Merge "Implement landscape layout for time picker dialog" 2015-02-27 18:13:54 +00:00