Rich Slogar
b2a9bd5e9b
am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update
...
* commit '895d16945e97e108e33c614f87004c3f1efe5cb4':
docs: studio 1.0.1 revision update
2014-12-13 06:24:20 +00:00
Rich Slogar
895d16945e
am 6b8756c3: docs: studio 1.0.1 revision update
...
* commit '6b8756c39764b166c9f7d384e4542960dd8a7f98':
docs: studio 1.0.1 revision update
2014-12-13 06:17:00 +00:00
Rich Slogar
6b8756c397
docs: studio 1.0.1 revision update
...
Change-Id: If9ef9ba986ae02463bec8040924a06ab0ccc8124
2014-12-12 21:19:02 -08:00
Guang Zhu
18b892c723
shell based UI Automator source move
...
frameworks/testing/uiautomator -> frameworks/base/cmds/uiautomator
(samples, utils sub folders exlcuded)
frameworks/testing/uiautomator/utils -> frameworks/base/tests/utils
no source files changed, only one line makefile update (for
UI Automator API check)
Bug: 18708851
Change-Id: I396bd386d3d55a52df18af183685daf80caa9f73
2014-12-12 17:31:38 -08:00
smain@google.com
63ed5e1b77
am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs
...
* commit '8bb3962b2e58870efa01b2fc0fd8c2a620414974':
fix distribute nav styles. they were not highlighted correctly.
2014-12-13 01:12:37 +00:00
Christopher Tate
fe9e3195fa
am 36ba3e47: am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev
...
* commit '36ba3e478fbbb664a97b24723836444184c6943f':
Check which file changed before requesting backup
2014-12-13 01:09:03 +00:00
smain@google.com
8bb3962b2e
am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs
...
* commit '8e8f29e34266b49d02f236367be98d6885f2f8a6':
fix distribute nav styles. they were not highlighted correctly.
2014-12-13 01:04:02 +00:00
Christopher Tate
36ba3e478f
am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev
...
* commit '90c0ae637ab84d1954ce972f55c5d3e2d2b20586':
Check which file changed before requesting backup
2014-12-13 00:59:10 +00:00
smain@google.com
8e8f29e342
Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs
2014-12-13 00:55:32 +00:00
Christopher Tate
90c0ae637a
Merge "Check which file changed before requesting backup" into lmp-mr1-dev
2014-12-13 00:52:14 +00:00
Joe Fernandez
d799f75c6b
am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs
...
* commit '4234fca655819538fea60cafe2b8bf3e597fa3ea':
docs: uiautomator blog link removal
2014-12-13 00:34:20 +00:00
Joe Fernandez
4234fca655
am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs
...
* commit '044f3947bc2e5e1beb2e46dd8e32822b57132b4a':
docs: uiautomator blog link removal
2014-12-13 00:25:14 +00:00
Joe Fernandez
044f3947bc
Merge "docs: uiautomator blog link removal" into lmp-docs
2014-12-13 00:20:35 +00:00
Tim Murray
07a2efce2c
am 42d33aa6: am 3d00fdf4: Merge "Enable native tracking for RS contexts to improve GC behavior."
...
* commit '42d33aa635fbe0768b0be44568077874e66e39e0':
Enable native tracking for RS contexts to improve GC behavior.
2014-12-13 00:17:47 +00:00
Joe Fernandez
72268ad3d4
am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs
...
* commit 'e70cb874d9a53c6afa78c752ababe8e2f44ba0c8':
docs: studio basics typo
2014-12-13 00:16:56 +00:00
Amith Yamasani
52d750c5c2
Check which file changed before requesting backup
...
Make sure that the changed file is one of the wallpaper files
before requesting backup or informing listeners.
Bug: 18694053
Change-Id: Iaa8fe9d3c97634b3cc6a9ccd67c36cf394d17ca0
2014-12-13 00:15:45 +00:00
Tim Murray
efc5ceaaa1
am a6bfe6c9: Merge "Enable native tracking for RS contexts to improve GC behavior." into lmp-mr1-dev
...
automerge: 54bab10
* commit '54bab10b1facad1ae8ad522b57785f449f3227f9':
Enable native tracking for RS contexts to improve GC behavior.
2014-12-13 00:15:08 +00:00
Luan Nguyen
bb01880e62
am 47efca78: am a854ddfd: docs: Add two new general functionality requirements
...
* commit '47efca783cda4a9f13d172ddfc30443de1d94b91':
docs: Add two new general functionality requirements
2014-12-13 00:12:16 +00:00
Tim Murray
54bab10b1f
am a6bfe6c9: Merge "Enable native tracking for RS contexts to improve GC behavior." into lmp-mr1-dev
...
* commit 'a6bfe6c957739fc172dd97ce4e26d8ec4ee4aa6f':
Enable native tracking for RS contexts to improve GC behavior.
2014-12-13 00:10:46 +00:00
Joe Fernandez
e70cb874d9
am c59d1d78: Merge "docs: studio basics typo" into lmp-docs
...
* commit 'c59d1d780b03b96b3d92990d629de865dd2c585c':
docs: studio basics typo
2014-12-13 00:10:17 +00:00
Tim Murray
42d33aa635
am 3d00fdf4: Merge "Enable native tracking for RS contexts to improve GC behavior."
...
* commit '3d00fdf4cbe9f8fe8363f4ad4fa6c98ae03573ac':
Enable native tracking for RS contexts to improve GC behavior.
2014-12-13 00:09:38 +00:00
Luan Nguyen
47efca783c
am a854ddfd: docs: Add two new general functionality requirements
...
* commit 'a854ddfd79c7d1458452b6238fbc5f69ba610002':
docs: Add two new general functionality requirements
2014-12-13 00:04:06 +00:00
Tim Murray
a6bfe6c957
Merge "Enable native tracking for RS contexts to improve GC behavior." into lmp-mr1-dev
2014-12-13 00:03:53 +00:00
Joe Fernandez
c59d1d780b
Merge "docs: studio basics typo" into lmp-docs
2014-12-13 00:03:10 +00:00
Tim Murray
3d00fdf4cb
Merge "Enable native tracking for RS contexts to improve GC behavior."
2014-12-13 00:02:31 +00:00
Rich Slogar
7789f4dbee
docs: studio basics typo
...
Change-Id: I3e20deb2abc8513266cc2182d9be1ae809bbeae0
2014-12-12 15:56:46 -08:00
Elliott Hughes
a95b568f9a
am 20c906a8: am a101befb: Merge "Lose some unnecessary JNI from the zygote."
...
* commit '20c906a8d40aed68ee35095f322739664e1e223a':
Lose some unnecessary JNI from the zygote.
2014-12-12 23:32:06 +00:00
Elliott Hughes
20c906a8d4
am a101befb: Merge "Lose some unnecessary JNI from the zygote."
...
* commit 'a101befbef6a07af0746e3dbcd646d2b69a23492':
Lose some unnecessary JNI from the zygote.
2014-12-12 23:24:37 +00:00
Elliott Hughes
a101befbef
Merge "Lose some unnecessary JNI from the zygote."
2014-12-12 23:18:48 +00:00
Luan Nguyen
a854ddfd79
docs: Add two new general functionality requirements
...
Bug: 18733124
Change-Id: Ia4b1e74980cbb645d1ab0b61ec56f06a3704fd3b
2014-12-12 15:10:19 -08:00
Bart Sears
2648a66bda
am 10fe046c: am 1f28a6a5: resolved conflicts for merge of 08c72334 to lmp-mr1-dev
...
* commit '10fe046c93324903eea2667dd3ff679930ec997d':
Tune delivery and batching of alarms
2014-12-12 22:56:43 +00:00
Bart Sears
10fe046c93
am 1f28a6a5: resolved conflicts for merge of 08c72334 to lmp-mr1-dev
...
* commit '1f28a6a571a9b4ff78d85e2b62a30d77ce986d7b':
Tune delivery and batching of alarms
2014-12-12 22:49:43 +00:00
Christopher Tate
75070f2f18
am 125579ca: am 012de64e: Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms"
...
* commit '125579caa1b4fb2de4242b0af3f4749bac9fa699':
Fix bugs regarding delay the dispatching of non-wakeup alarms
2014-12-12 22:45:34 +00:00
Christopher Tate
125579caa1
am 012de64e: Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms"
...
* commit '012de64e2dade079979bfa6cdca323b36901a0e6':
Fix bugs regarding delay the dispatching of non-wakeup alarms
2014-12-12 22:37:47 +00:00
Alan Viverette
0cecbc9c72
Avoid self-recursion if client calls init() from date listener
...
BUG: 18736166
Change-Id: Ibe04040356f4a3e4479ea55c53a0e167144ff877
2014-12-12 14:32:43 -08:00
Bart Sears
1f28a6a571
resolved conflicts for merge of 08c72334 to lmp-mr1-dev
...
Used "-s ours" for the merge since this CL had been cherry-picked from
lmp-mr1-dev to lmp-dev so when auto-merging back, we want to keep what
is already in lmp-mr1-dev.
2014-12-12 14:19:57 -08:00
Alan Viverette
cd305ae3ce
Give accessibility delegate the first pass at handling ACTION_CLICK
...
Delegation is broken for widgets, but this fixes the most egregious issue
where TextViews that are top-level list items weren't handling CLICK
actions correctly. This will still need work, since now the focus action
won't run, but it's an improvement.
BUG: 18736135
Change-Id: I808ef628198946cc87f13c53d6245cd162a1e517
2014-12-12 14:13:24 -08:00
Alan Viverette
81612d80c5
am e260a358: am 7c3212b2: Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev
...
* commit 'e260a358bfc945bf01d901f496b7f30784cbf920':
Propagate DrawableContainer state on mutate, fix ColorDrawable theming
2014-12-12 22:11:46 +00:00
Alan Viverette
2e0e2a4407
am 1060d75e: am 9a1b4c29: Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev
...
* commit '1060d75e3abd37671b0962297f4587dd3d6e0cc8':
Move ripple to end state on jump when hardware exit is pending
2014-12-12 22:11:40 +00:00
Christopher Tate
012de64e2d
Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms"
2014-12-12 22:11:16 +00:00
Elliott Hughes
3fe595108f
Lose some unnecessary JNI from the zygote.
...
Bug: 18719692
Change-Id: Ie2d50400f10f3c54cfbf94e54656f6d704eac267
2014-12-12 14:07:34 -08:00
Alan Viverette
e260a358bf
am 7c3212b2: Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev
...
* commit '7c3212b2f4f2f4b5ee18f2db925db95ee420d489':
Propagate DrawableContainer state on mutate, fix ColorDrawable theming
2014-12-12 22:04:10 +00:00
Alan Viverette
1060d75e3a
am 9a1b4c29: Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev
...
* commit '9a1b4c29672f7b7a8cfdeedfc2421854439c0af0':
Move ripple to end state on jump when hardware exit is pending
2014-12-12 22:04:04 +00:00
Alan Viverette
7c3212b2f4
Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev
2014-12-12 22:00:26 +00:00
Alan Viverette
9a1b4c2967
Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev
2014-12-12 21:59:22 +00:00
Alan Viverette
9bc11ac168
Move ripple to end state on jump when hardware exit is pending
...
BUG: 18734676
Change-Id: Ie063e1eec0b4f28f936ea27822afacfd1b72a0e9
2014-12-12 13:38:10 -08:00
Tim Murray
eae2472985
Enable native tracking for RS contexts to improve GC behavior.
...
This should prevent apps from leaking RS contexts as easily.
bug 18579193
Change-Id: I2d943ce4443ce7cb90ebdd3dd37d338eda6df3a2
2014-12-12 13:30:15 -08:00
Chong Zhang
d7383a8f00
am d4bef185: am bb177db1: Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev
...
* commit 'd4bef185a5057904f0e230ac8a2c5866e590094f':
parse bitrate range for video/audio caps
2014-12-12 21:02:36 +00:00
Svet Ganov
9b3ab29ffa
am 26c88954: am 14e3351a: Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev
...
* commit '26c8895465bbc94efb0cc96460e5eabe88382698':
Fix a NPE in AccessiiblityManagerService.
2014-12-12 21:02:30 +00:00
Svet Ganov
1301446c01
am e608644a: am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev
...
* commit 'e608644a9f0fa54a05379c171814569816145801':
Fix an edge case in computing click location in accessibility mode.
2014-12-12 21:02:24 +00:00