Alan Viverette
bfe76f4547
Fix docs build error in MediaFormat
...
Change-Id: I5faf72efa1a792f9a500eb4abc76d4e4cda5516d
2014-07-21 19:37:17 -07:00
Adam Powell
66e207ec54
Merge "Revert "Revert "Block focus with a touchscreen for ActionBars and Toolbars""" into lmp-dev
2014-07-21 15:42:19 +00:00
Adam Powell
02a7b78eab
Revert "Revert "Block focus with a touchscreen for ActionBars and Toolbars""
...
This reverts commit 9d629b6daba8c433fe014728e1ad07e034906c79.
Once more, with feeling!
Bug 16284253
2014-07-21 18:12:34 -07:00
Adam Powell
88c11754c1
Allow focusable in touch mode views to ignore touchscreen focus blocks
...
Bug 16284253
Change-Id: I7cddf1988b0c24ae3050a13d2ce6fb3143d8aade
2014-07-21 18:12:34 -07:00
Deepanshu Gupta
f89bff9ed8
am aa474ff0: (-s ours) am 9a61270d: Merge "LayoutLib: Fix EditText rendering [DO NOT MERGE]" into klp-modular-dev
...
* commit 'aa474ff0f3bf68110dc60f9472c062ff1a4a44ae':
LayoutLib: Fix EditText rendering [DO NOT MERGE]
2014-07-22 01:09:02 +00:00
Deepanshu Gupta
52948ffdf2
am b51750fd: (-s ours) am 0ca0853c: Merge "Update layoutlib create README [DO NOT MERGE]" into klp-modular-dev
...
* commit 'b51750fda671c8ec7a7ed9037aad1a65e49539ec':
Update layoutlib create README [DO NOT MERGE]
2014-07-22 01:08:55 +00:00
Deepanshu Gupta
aa474ff0f3
am 9a61270d: Merge "LayoutLib: Fix EditText rendering [DO NOT MERGE]" into klp-modular-dev
...
* commit '9a61270d67f654f3558b29f6b3e78c0b2fbe0178':
LayoutLib: Fix EditText rendering [DO NOT MERGE]
2014-07-22 01:04:00 +00:00
Deepanshu Gupta
b51750fda6
am 0ca0853c: Merge "Update layoutlib create README [DO NOT MERGE]" into klp-modular-dev
...
* commit '0ca0853c52a81b317996b2997373f5882b369c80':
Update layoutlib create README [DO NOT MERGE]
2014-07-22 01:03:55 +00:00
Dirk Dougherty
b810999637
am d1929c50: am f3659284: Doc change: add reminder for developers on using ad id.
...
* commit 'd1929c505a66afc13d661beac9868f2886cbd1e8':
Doc change: add reminder for developers on using ad id.
2014-07-22 00:58:13 +00:00
Dirk Dougherty
d1929c505a
am f3659284: Doc change: add reminder for developers on using ad id.
...
* commit 'f365928406ef0a80d3aecc2d025642f9efb80a05':
Doc change: add reminder for developers on using ad id.
2014-07-22 00:54:01 +00:00
Dirk Dougherty
f365928406
Doc change: add reminder for developers on using ad id.
...
Change-Id: I2a6109bd1b97e4432e36c6a5055aee6e2b1c3edd
2014-07-21 22:15:04 +00:00
Andrew Solovay
30aa5924f0
am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev
...
* commit '643fa8d1ecf5d2a485b7b30d43a47d090b5e3dcc':
docs: Noted how singleTop affects "up" navigation.
2014-07-21 17:47:13 +00:00
Ricardo Cervera
fef0011144
am d73eb7f9: am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
...
* commit 'd73eb7f9c96c2211ab12a09c319978915cf593bf':
docs: Added note suggesting use of Android Studio over ADT
2014-07-21 17:11:42 +00:00
Ricardo Cervera
d73eb7f9c9
am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
...
* commit '940ae93043a7d36d89ab777cbc691893590d326c':
docs: Added note suggesting use of Android Studio over ADT
2014-07-21 17:07:00 +00:00
Robert Ly
205196f128
am efca30d0: am 62c81ab5: docs: change copy for edu video
...
* commit 'efca30d0fafefb9f59668ee9d918cd7cc6098e6c':
docs: change copy for edu video
2014-07-21 16:17:39 +00:00
Robert Ly
efca30d0fa
am 62c81ab5: docs: change copy for edu video
...
* commit '62c81ab580ec39635fc8b52f552872675c87a816':
docs: change copy for edu video
2014-07-21 16:11:39 +00:00
Robert Ly
62c81ab580
docs: change copy for edu video
...
Change-Id: I88e5ae8e9c0f899f0e4dfc5087de9ea18153894d
2014-07-21 09:06:50 -07:00
Deepanshu Gupta
0ca0853c52
Merge "Update layoutlib create README [DO NOT MERGE]" into klp-modular-dev
2014-07-21 15:43:35 +00:00
Deepanshu Gupta
c54100d449
Update layoutlib create README [DO NOT MERGE]
...
Update the doc to reflect the current state of the tool and use a
consistent 100 char column limit.
Change-Id: I64fb58cc46abbc2f3759cb1f99d42b5090c1409f
(cherry picked from commit 88585f404cb493129847e4487b628062674a4ede)
2014-07-21 17:37:20 -07:00
Ricardo Cervera
940ae93043
Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
2014-07-21 15:43:35 +00:00
Ricardo Cervera
448525e98e
docs: Added note suggesting use of Android Studio over ADT
...
Change-Id: Id921c06ea75c70e1ad4741c743f1d15958686b16
2014-07-21 09:08:10 -07:00
Andrew Solovay
643fa8d1ec
Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev
2014-07-21 15:42:19 +00:00
David Friedman
119716f404
am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs
...
* commit '0d5af3f67bdd3734304a19dad45d995e93b6e957':
Minor typos, consistency things, one grammatical error.
2014-07-20 12:43:19 +00:00
David Friedman
0d5af3f67b
am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs
...
* commit '5d59d371f27008214f29febb0595b602edddcc67':
Minor typos, consistency things, one grammatical error.
2014-07-20 07:59:05 +00:00
Adam Powell
f1489c75f6
Merge "Allow focusable in touch mode views to ignore touchscreen focus blocks" into lmp-dev
2014-07-19 22:40:06 +00:00
Jeff Brown
970d4132ea
Allow dreams to control screen state and brightness.
...
Added setDozeScreenState() and setDozeScreenBrightness() methods to
DreamService. The values specified here only take effect once
startDozing is called and can be changed while dozing.
This required some significant rework of the display power controller
but the result seems quite nice and better represents the policy
we want to apply.
Changed the test dream a little bit to make it flash the screen
every minute using the new functions.
Bug: 15903322
Change-Id: I83bcc34503f1b87727d2b2b3c0ef08507f9f0808
2014-07-22 01:18:26 +00:00
Alan Viverette
90d8d2c406
Merge "Remove unused quick setting display preferences" into lmp-dev
2014-07-19 22:40:06 +00:00
Dirk Dougherty
4ebdd2f075
am b8109996: am d1929c50: am f3659284: Doc change: add reminder for developers on using ad id.
...
* commit 'b81099963772f886e68129c33f32fefb85ac673e':
Doc change: add reminder for developers on using ad id.
2014-07-22 01:04:30 +00:00
Alan Viverette
06da1b1ceb
Remove unused quick setting display preferences
...
BUG: 16303790
Change-Id: I0772228aac5a743b9780853c5825252c148b8b5c
2014-07-22 01:04:19 +00:00
Alan Viverette
4f64c04850
Clean up view tinting APIs, tileModeX/Y attribute docs
...
BUG: 16400590
BUG: 16403307
Change-Id: Ie924815a39eb0e683d1982b08ec478ed3edbfb7b
2014-07-22 01:03:58 +00:00
Jean-Michel Trivi
0d964e77b9
Merge "Unhide SoundPool builder with AudioAttributes" into lmp-dev
2014-07-21 15:42:19 +00:00
Alan Viverette
7d6866086a
Fix switch animation end state colors
...
BUG: 16418389
Change-Id: I678eb25c38a1303141dc89cfe1cccbd1bd8bcdc1
2014-07-22 00:17:17 +00:00
Jean-Michel Trivi
fb52139bd8
Unhide SoundPool builder with AudioAttributes
...
Change-Id: I9ec6ca310a342f72cc1a0de5d93fe650b0ca2125
2014-07-21 16:00:43 -07:00
Jeff Sharkey
6038625175
Detect bundled app ABI for cluster-style layout.
...
Now that build system switched to cluster-style layout for bundled
apps, we need to detect primary/secondary ABI based on that layout.
Bug: 16456263
Change-Id: If6daf60ee1815bb6fde560a0c373b4f2bc8bd3a8
2014-07-21 13:28:16 -07:00
Amith Yamasani
b74a7babaa
Merge "Fix a security exception when checking cross-profile caller-id cap." into lmp-dev
2014-07-21 15:43:35 +00:00
Amith Yamasani
eee5094f96
Fix a security exception when checking cross-profile caller-id cap.
...
No need to enforce that the caller is in the system process.
We're only checking if the device policy is allowing access.
Bug: 16301261
Change-Id: I87a7c808d116c86aa68cebb36631c46d0a54be96
2014-07-21 17:04:44 -07:00
Amith Yamasani
9c44933958
API Review: Improvements to RestrictionsManager API
...
Use an activity intent for local approval instead of a type.
Use PeristableBundle instead of Bundle.
Pass requestId as an explicit argument in cases where it's required.
Bug: 16400892
Change-Id: Id882033f17c39aa9cd63a7eeb73bb7b51f98cf5b
2014-07-22 00:03:39 +00:00
Amith Yamasani
e5bcff624f
Rename setApplicationBlocked to setApplicationHidden
...
This corrects the expected behavior of the app state. Hidden apps
can be installed by the store to be brought out of hidden state.
Bug: 16191518
Change-Id: Id128ce971ceee99ba1dea14ba07ce03bd8d77335
2014-07-21 22:18:40 +00:00
Jean-Michel Trivi
79bf7284b9
Merge "New MediaFormat keys for AAC" into lmp-dev
2014-07-21 15:42:19 +00:00
Jinsuk Kim
469085e4fe
Revert "Send TV app the intent for the new active source"
...
This reverts commit 9808af71a190844cd5eb493d87870238a31fa408.
Change-Id: I0e019534c07b230173230d064c6d8bc389fafcbc
2014-07-21 23:52:39 +00:00
Jean-Michel Trivi
a8a3f55865
New MediaFormat keys for AAC
...
Decoder:
KEY_AAC_DRC_ATTENUATION_FACTOR
KEY_AAC_DRC_BOOST_FACTOR
KEY_AAC_DRC_HEAVY_COMPRESSION
KEY_AAC_DRC_TARGET_REFERENCE_LEVEL
KEY_AAC_ENCODED_TARGET_LEVEL
KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT
Encoder:
KEY_AAC_SBR_MODE
Change-Id: I69abe01add135875446914134d93a58815992e07
2014-07-21 16:47:34 -07:00
Jinsuk Kim
0f68d62a4b
Send TV app the intent for the new active source
...
When signalled by an external CEC device about to become a new active
source, TIF(TvInputHardwareManager) sends an intent for TV app to tune to
the input mapped to the device.
Change-Id: I29b28a4365d1454a8bbe947ddb5df4371960c71a
2014-07-21 23:18:00 +00:00
Adam Lesinski
775ded1a91
Merge "Change UsageStatsService to check uses-permission" into lmp-dev
2014-07-21 15:43:35 +00:00
Yorke Lee
3818a89220
Expose call settings as public API (1/3)
...
Other settings activities like wifi settings, mobile network settings
etc are all accessible by third party apps via public intents, so
make CallFeaturesSettings similarly available.
Bug: 16298644
Change-Id: Ia615797e20f396a38fe382f3a2d54ec41c5249ef
2014-07-21 16:10:08 -07:00
Ying Wang
88e199045b
Build framework.jar with multidex support.
...
We don't need the framework/framework2 split now with the multidex
support.
Change-Id: I30ee5c7e24df87b2c54e854f17fbf0b5adef4c60
2014-07-21 15:23:14 -07:00
Adam Lesinski
53ab92d890
Change UsageStatsService to check uses-permission
...
Have UsageStatsService check permission grants when AppOps
returns the default MODE_IGNORED mode for a package.
Change-Id: I784a708451a56863b13fc5f178e10bba6ce37a2f
2014-07-21 13:20:25 -07:00
Craig Mautner
2cfeb1ac39
Merge "Don't create a delegate for null callbacks." into lmp-dev
2014-07-21 15:42:19 +00:00
Craig Mautner
3d0c57a1d3
Don't create a delegate for null callbacks.
...
ActivityView does not create callbacks for the VirtualDisplay. This
leads to setting Looper.myLooper() from a Binder thread which
leads to NPE when trying to dereference its message queue.
Fixes bug 16386002.
Change-Id: I12760a22075ed4770f3fe960763e0135fe095cfe
2014-07-21 14:33:47 -07:00
Santos Cordon
d1c344e412
Revert "Change display Strings to CharSequence (1/2)"
...
This reverts commit b5e0084414258ff294e7d94bcf9f8492f8ab2d25.
Change-Id: I095483414f5e0076c0967b6f1955a0fe71f2b8d9
2014-07-21 18:43:35 +00:00
RoboErik
edb158f55f
Deprecate apis that were replaced by sessions
...
These classes all have new components in the session APIs.
bug:16218444
Change-Id: Ib64ff0e23503e4c9eb2fd9162a878e1eaba7c4df
2014-07-21 18:26:42 +00:00