Quddus Chong
d642f82975
am 54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
...
* commit '54dee349976eaafe7df3a2bb48e9fce2b964a7f0':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
2015-04-04 00:29:11 +00:00
Quddus Chong
54dee34997
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
...
Change-Id: I0e2a49b639101a7607e8e90cf830d9d449ad6328
2015-04-03 17:17:04 -07:00
John Spurlock
552d56348f
Merge "Zen: Changes to support new automation settings sub-section."
2015-04-03 23:53:07 +00:00
Joseph Cooper
88dc5ba692
Merge "Documents the ImageView.ScaleType attributes"
2015-04-03 23:35:40 +00:00
Andreas Gampe
605cca1a98
Frameworks/base: Pass variant and feature-set to runtime
...
This is required so we pick up the settings correctly when compiling
the boot image on device, or compile any dex files through a
DexClassLoader.
Bug: 20055104
Change-Id: Ia3ab2e48855060894b36f7fd360fe17b978e45a6
2015-04-03 16:08:20 -07:00
Luan Nguyen
3195b74751
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
2015-04-03 22:54:37 +00:00
Luan Nguyen
fd4ffb7d00
am 88de9c94: am b0c35f80: am 31947438: am 9b9bda56: am b7647017: am eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
...
* commit '88de9c94eb519f4c69ac7489879eddf7753276b6':
docs: Remove note about inablity to submit apps to Google Play.
2015-04-03 22:54:26 +00:00
Jean-Michel Trivi
105295ed55
Merge "AudioTrack builder API."
2015-04-03 22:54:23 +00:00
Luan Nguyen
88de9c94eb
am b0c35f80: am 31947438: am 9b9bda56: am b7647017: am eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
...
* commit 'b0c35f80f6efd61c553cc4bfc21b896dd5dc27e6':
docs: Remove note about inablity to submit apps to Google Play.
2015-04-03 22:43:25 +00:00
Wei Jia
808ba3b5fe
Merge "MediaSync: add MediaSync JAVA API"
2015-04-03 22:36:39 +00:00
Wei Jia
071a8b71d1
MediaSync: add MediaSync JAVA API
...
Bug: 19666434
Change-Id: Iab6941f6d81cb95a3b86be14b239287acb0d0eee
2015-04-03 15:34:34 -07:00
Jean-Michel Trivi
35ba5ab450
AudioTrack builder API.
...
Add a Builder class for AudioTrack.
Bug 19699343
Change-Id: I65cbcb32242c3d1857e5fca1a2f1dbe58c3b25ed
2015-04-03 15:32:21 -07:00
Luan Nguyen
b0c35f80f6
am 31947438: am 9b9bda56: am b7647017: am eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
...
* commit '3194743890db9337412acf77edfc6924ba1dec6e':
docs: Remove note about inablity to submit apps to Google Play.
2015-04-03 22:28:45 +00:00
Mike Lockwood
9db9326ad4
Add MidiManager and MidiDevice classes to public API.
...
Somehow we missed these two when we made the rest of the MIDI Manager public
Change-Id: I08e94762e155aa6a7f98bd05b363aee5e4744061
2015-04-03 15:19:13 -07:00
Joseph Cooper
d96fdbd0cd
Documents the ImageView.ScaleType attributes
...
Although the ImageView.ScaleType enum is documented, that
documentation was not reproduced in the xml attributes. Copying the
documentation across should fill the previously empty 'Description'
column in
http://developer.android.com/reference/android/R.attr.html#scaleType
and
http://developer.android.com/reference/android/widget/ImageView.html#attr_android:scaleType
Also adds javadocs to ImageView.setImageMatrix(Matrix) because the
ScaleType documentation refers to it and it was also empty.
Change-Id: I7768549970eab2ebfe38cc4677a58dc91e104588
2015-04-03 15:16:38 -07:00
Rom Lemarchand
b2b2923174
Change audio include path from system/core to system/media/audio
...
Change-Id: Iefd5933e7ba10fa2a8ca3489bcbee3bc8f1396ad
2015-04-03 15:11:28 -07:00
Luan Nguyen
3194743890
am 9b9bda56: am b7647017: am eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
...
* commit '9b9bda56238feabb07b7f6f0ad93f007c24de25d':
docs: Remove note about inablity to submit apps to Google Play.
2015-04-03 22:11:14 +00:00
George Mount
28b3ecca86
Reset transitionAlpha when the transition is stopped early.
...
Bug 19273502
When a transition runs several animators and is interrupted,
some animators may not have been started. Those animators
that haven't been started will not reset their contents
the same as if the animator was canceled. Fade modifies
transitionAlpha and if it is interrupted prior to the
animator starting, the transitionAlpha doesn't get reset.
Change-Id: I8a49b4fbb7151aadc43d7b10e6acbae9578e5cc4
2015-04-03 15:01:40 -07:00
Luan Nguyen
9b9bda5623
am b7647017: am eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
...
* commit 'b7647017ddf8f57c7333b5ae3e459639ef0a6a7c':
docs: Remove note about inablity to submit apps to Google Play.
2015-04-03 22:01:12 +00:00
Quddus Chong
cef55cde1c
am b3c310b6: am ba386b55: am f2c2be78: am d9e2c05d: am 0c3b894c: am 91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
...
* commit 'b3c310b60dfab11b9b8d41b00ae06a82090f3d14':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
2015-04-03 21:49:43 +00:00
Luan Nguyen
b7647017dd
am eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
...
* commit 'eeb42053df94de88674caf904a96ec987d55e668':
docs: Remove note about inablity to submit apps to Google Play.
2015-04-03 21:49:32 +00:00
Luan Nguyen
eeb42053df
Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
2015-04-03 21:40:53 +00:00
Quddus Chong
b3c310b60d
am ba386b55: am f2c2be78: am d9e2c05d: am 0c3b894c: am 91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
...
* commit 'ba386b55d6c5a8e19023e93bc281d282951371a7':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
2015-04-03 21:39:58 +00:00
Quddus Chong
ba386b55d6
am f2c2be78: am d9e2c05d: am 0c3b894c: am 91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
...
* commit 'f2c2be78ba26793c05dab7c77c84566265bb6668':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
2015-04-03 21:29:44 +00:00
Joe LaPenna
7c167023ed
am 97a73606: am e59f4260: am 1f956e42: Merge "Make burn in protection updates happen on the minute." into lmp-mr1-modular-dev
...
* commit '97a7360660dc6473286a12d72eecff277e6182e1':
Make burn in protection updates happen on the minute.
2015-04-03 21:29:09 +00:00
Andrew Lee
73576b22bc
Merge "Protect against null ITelephony to fix crash."
2015-04-03 21:24:07 +00:00
Nancy Chen
8bd4f7b3d1
Merge "Include the source package in the voicemail URI."
2015-04-03 21:23:38 +00:00
Quddus Chong
f2c2be78ba
am d9e2c05d: am 0c3b894c: am 91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
...
* commit 'd9e2c05dbf6c6f418b08a8465f1ed8f051015b41':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
2015-04-03 21:19:15 +00:00
George Mount
db22741540
Fix NPE in getForegroundTintList
...
Bug 20068789
Change-Id: I658c6f4504ca78ea839d635f497c48c35e1de6ca
2015-04-03 14:13:43 -07:00
Joe LaPenna
97a7360660
am e59f4260: am 1f956e42: Merge "Make burn in protection updates happen on the minute." into lmp-mr1-modular-dev
...
* commit 'e59f426050f693b62bb5471fca5fb8b7ea2af8ea':
Make burn in protection updates happen on the minute.
2015-04-03 21:13:30 +00:00
Andrew Lee
896a1e650c
Protect against null ITelephony to fix crash.
...
Bug: 20066803
Change-Id: I4336e979dab3a4b1b3d53078af572ff3f822377a
2015-04-03 14:09:29 -07:00
Quddus Chong
d9e2c05dbf
am 0c3b894c: am 91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
...
* commit '0c3b894c2c18b226f58af98569f21bcb4a593b14':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
2015-04-03 21:08:49 +00:00
Ben Kwa
c8adb235b9
Merge "Enable directory selection. Add an IntentService to copy files."
2015-04-03 21:06:30 +00:00
Ye Wen
1dbed5170e
Merge "Return pending intent to service caller if MmsService can't be connected"
2015-04-03 21:03:53 +00:00
Joe LaPenna
e59f426050
am 1f956e42: Merge "Make burn in protection updates happen on the minute." into lmp-mr1-modular-dev
...
* commit '1f956e424320b22255f293e9b6d7d0b30b19a79f':
Make burn in protection updates happen on the minute.
2015-04-03 21:03:33 +00:00
Chris Craik
523735d8cc
Merge "Delete pre-glop path"
2015-04-03 21:02:14 +00:00
Elliott Hughes
dda35c37ea
am 66d94512: am dbb5f5d6: am efcbaec1: Merge "Only Windows doesn\'t have %zd."
...
* commit '66d9451273c4a3775b6b63a0e4b7027bd2eae65d':
Only Windows doesn't have %zd.
2015-04-03 20:58:25 +00:00
Quddus Chong
0c3b894c2c
am 91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
...
* commit '91070dc419b9b60843094ecc02f95b38c784208a':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
2015-04-03 20:57:44 +00:00
Joe LaPenna
1f956e4243
Merge "Make burn in protection updates happen on the minute." into lmp-mr1-modular-dev
2015-04-03 20:55:01 +00:00
Elliott Hughes
66d9451273
am dbb5f5d6: am efcbaec1: Merge "Only Windows doesn\'t have %zd."
...
* commit 'dbb5f5d6c4186e919fa51c019d56ea5fa8ff8b96':
Only Windows doesn't have %zd.
2015-04-03 20:49:38 +00:00
Ben Kwa
d99109fca8
Enable directory selection. Add an IntentService to copy files.
...
Change-Id: I0bec0224aa1b52766664c23f77d60affec702111
2015-04-03 13:49:24 -07:00
Quddus Chong
91070dc419
Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
2015-04-03 20:47:46 +00:00
Elliott Hughes
dbb5f5d6c4
am efcbaec1: Merge "Only Windows doesn\'t have %zd."
...
* commit 'efcbaec14135c42f81e2a8f645584cf7cf542a02':
Only Windows doesn't have %zd.
2015-04-03 20:40:52 +00:00
Ye Wen
61c8d238c2
Return pending intent to service caller if MmsService can't be connected
...
If MmsService can not be connected, broker throws a runtime exception
which does not return to service caller via PendingIntent. MMS app would
wait forever for the return of sent/downloaded PendingIntent. This
change makes sure PendingIntent is always returned so MMS app can be
unblocked.
b/19732709
Change-Id: I694a0fc29bb431b48c7077e7a323844709ae695f
2015-04-03 13:37:42 -07:00
Alex Klyubin
b7f9aca713
am ba88b692: am e2e5b88e: am 64b0062a: Merge "Load fewer classes when AndroidKeyStore provider is installed."
...
* commit 'ba88b692f1a489de308dcf5b5420a23166a94487':
Load fewer classes when AndroidKeyStore provider is installed.
2015-04-03 20:33:29 +00:00
Amith Yamasani
85757fceb7
Turn off a debug flag
...
Change-Id: I5d7edc2838341754dd092410e6e21787a3454834
2015-04-03 13:31:18 -07:00
Amith Yamasani
092f038d50
Merge "Throttle jobs for idle apps"
2015-04-03 20:26:43 +00:00
Alex Klyubin
ba88b692f1
am e2e5b88e: am 64b0062a: Merge "Load fewer classes when AndroidKeyStore provider is installed."
...
* commit 'e2e5b88e3ad2d18cde31f55a750e76d3d1b25185':
Load fewer classes when AndroidKeyStore provider is installed.
2015-04-03 20:21:52 +00:00
Amith Yamasani
b0ff32245c
Throttle jobs for idle apps
...
First pass at delaying jobs from apps that are idle.
TODO: Throttle syncs
TODO: Provide a periodic point at which apps are checked for idleness.
Apps that switch to foreground process state are tracked by UsageStats
as an INTERACTION event that affects the last-used timestamp.
JobScheduler's logic for when an app is ready is trumped by the idleness
of the app, and only if the battery is not charging. When charging state
changes, we update the idle state of all the tracked jobs.
android package is whitelisted.
Bug: 20066058
Change-Id: I0a0acb517b100a5c7b11e3f435f4141375f3451f
2015-04-03 13:20:19 -07:00
Elliott Hughes
efcbaec141
Merge "Only Windows doesn't have %zd."
2015-04-03 20:16:24 +00:00