Scott Main
4633a50b6d
Merge "new class on using action bar for training basics" into jb-mr2-docs
2013-08-01 21:58:57 +00:00
Scott Main
d041301adb
new class on using action bar for training basics
...
Change-Id: I478a9fb7989a961ebefeee55dc67e9a59c054bb0
2013-08-01 14:56:00 -07:00
Fabrice Di Meglio
851761574a
Merge "Fix Paint Shader copy"
2013-08-01 21:50:14 +00:00
Dirk Dougherty
3ba6747b3c
am 31bd3350: am f518398e: Merge "Doc Update: Delete this unpublished cruft." into jb-mr2-docs
...
* commit '31bd33507bea5c4c2f3f8c6bf30bfb01daa998fd':
Doc Update: Delete this unpublished cruft.
2013-08-01 14:48:54 -07:00
Dirk Dougherty
31bd33507b
am f518398e: Merge "Doc Update: Delete this unpublished cruft." into jb-mr2-docs
...
* commit 'f518398e4c0838c85a7ce988f8ce17b6a8238ffa':
Doc Update: Delete this unpublished cruft.
2013-08-01 14:45:28 -07:00
Dirk Dougherty
f518398e4c
Merge "Doc Update: Delete this unpublished cruft." into jb-mr2-docs
2013-08-01 21:41:30 +00:00
Jean-Michel Trivi
3523a06375
Remove outdated comment in MediaFocusControl
...
The stream type is used in audio focus to better deal with
RemoteControlClient/Display in the case of notifications
during media playback. This comment is therefore outdated.
Change-Id: Ifa33bc4c0fbf065d8288ff5fdfaf1bc67b2a337e
2013-08-01 14:36:32 -07:00
Fabrice Di Meglio
e3c526f4f6
Fix Paint Shader copy
...
- Paint.setClassVariablesFrom(Paint paint) was using the same Shader
for the copy as the initial Paint. Make sure that we are using a copy.
- implement a copy() API for shaders
See bug #7034321 Need Drawable RTL support
Change-Id: I4b9cee386edc72ad670723266333b85f4d2b0ab8
2013-08-01 14:33:22 -07:00
David Christie
40e5782f5c
Allow a particular LocationRequest to be excluded from
...
AppOps monitoring as long as the client as the appropriate
permission (UPDATE_DEVICE_STATS).
Change-Id: I7223a53bc1551e6498302a22eb310c8c5b5684b0
2013-08-01 14:31:48 -07:00
Sascha Prueter
930524ade2
am 95990fe4: am aa268f8f: am d364859c: Merge "Add version identifier to app ops." into jb-mr2-dev
...
* commit '95990fe4c38641ea574efe9224ae279db61cde0f':
Add version identifier to app ops.
2013-08-01 13:59:09 -07:00
Sascha Prueter
95990fe4c3
am aa268f8f: am d364859c: Merge "Add version identifier to app ops." into jb-mr2-dev
...
* commit 'aa268f8fb2855335fc0d4f181cbf91505448e5eb':
Add version identifier to app ops.
2013-08-01 13:55:43 -07:00
Brian Carlstrom
b33278f876
Teach PackageManager to skip core-libart.jar
...
A little grossness for now to support dual booting Dalvik and Art.
While I was here, removed isDexOptNeeded calls for boot class path which already return false.
Change-Id: Iaaaf21b7733c1791e7bd8ae27e84c47463f9e9c9
2013-08-01 13:55:07 -07:00
Sascha Prueter
aa268f8fb2
am d364859c: Merge "Add version identifier to app ops." into jb-mr2-dev
...
* commit 'd364859ce657c6b096cadc703485ccef7979c582':
Add version identifier to app ops.
2013-08-01 13:52:55 -07:00
Sascha Prueter
d364859ce6
Merge "Add version identifier to app ops." into jb-mr2-dev
2013-08-01 20:50:02 +00:00
David Christie
ebe51fc0d8
Add WorkSource capability to AlarmManager.
...
Change-Id: I663ea3078d405f0fa667a04bdaa376ae6652e994
2013-08-01 13:22:40 -07:00
Amith Yamasani
8c80a476d9
Merge "Fix javadoc for new API"
2013-08-01 19:45:20 +00:00
Amith Yamasani
20915daf06
Fix javadoc for new API
...
Change-Id: I31d3eb877552029a346f956414227aac42e5582b
2013-08-01 12:44:01 -07:00
David Christie
e1f886f5e3
Merge "Add new app op to monitor high power location requests."
2013-08-01 19:24:53 +00:00
Scott Main
1a02c22d01
am 3e2b513c: am a7da9423: am 27c57555: fix misc broken links
...
* commit '3e2b513cc21f5ae59bd7304aada2afabc54735cb':
fix misc broken links
2013-08-01 11:49:12 -07:00
Scott Main
31a6da4699
am a9e8364d: am 9cbfea76: am cc0be914: add search suggest tags for "tabs"
...
* commit 'a9e8364ddec69abe5f61fb595491fb624b8eb031':
add search suggest tags for "tabs"
2013-08-01 11:49:05 -07:00
Scott Main
caf45e90f4
am a25f983d: am fb56b4f7: add search suggest tags for "tabs"
...
* commit 'a25f983d3e3706f17299f3de6ff59acea18db3ac':
add search suggest tags for "tabs"
2013-08-01 11:49:02 -07:00
Scott Main
3e2b513cc2
am a7da9423: am 27c57555: fix misc broken links
...
* commit 'a7da9423f368dca38eb6235bfcac94b446aa7bcd':
fix misc broken links
2013-08-01 11:46:23 -07:00
Scott Main
a9e8364dde
am 9cbfea76: am cc0be914: add search suggest tags for "tabs"
...
* commit '9cbfea760fe896638d7b4fec41f71abe0738d265':
add search suggest tags for "tabs"
2013-08-01 11:46:19 -07:00
Scott Main
a25f983d3e
am fb56b4f7: add search suggest tags for "tabs"
...
* commit 'fb56b4f7995cf7effffa2e18f26b40d9c4186482':
add search suggest tags for "tabs"
2013-08-01 11:46:16 -07:00
Scott Main
a7da9423f3
am 27c57555: fix misc broken links
...
* commit '27c57555db9d626f0c20d68d75dd5a3e9832c9b9':
fix misc broken links
2013-08-01 11:42:31 -07:00
Scott Main
9cbfea760f
am cc0be914: add search suggest tags for "tabs"
...
* commit 'cc0be914a9d8f733a82ecb22d56169a32492cb8f':
add search suggest tags for "tabs"
2013-08-01 11:42:28 -07:00
Scott Main
fb56b4f799
add search suggest tags for "tabs"
...
Change-Id: Ic80228c1293811d85a8177c8800e7c68b84fee4e
2013-08-01 11:42:11 -07:00
Jeff Sharkey
3c1a1e4571
Merge "XML metadata for storage backend; custom icons."
2013-08-01 18:38:56 +00:00
Jeff Sharkey
7e258b31e7
XML metadata for storage backend; custom icons.
...
Introduce XML metadata for storage backends, used to indicate if
custom roots should be queried, and provide any custom MIME type
icons inside that backend.
Parse metadata and resolve custom icons in UI.
Change-Id: Iec026c0b10845edff7a345d9389691ddf2c87a0e
2013-08-01 11:34:56 -07:00
Scott Main
27c57555db
fix misc broken links
...
Change-Id: Iecd3462e752eddd0aa2feea3a7e9cf5ff2d92dd3
2013-08-01 11:31:38 -07:00
Dianne Hackborn
483a6bbfc1
Add version identifier to app ops.
...
All old versions drop their modes except for the notification op
(which is the only one there is currently a user-visible control for).
Change-Id: I9e09cebe63e9ea81f2adc01aef7d1a5a59f57a56
2013-08-01 11:15:04 -07:00
Ben Murdoch
9c059d1ef0
Merge "Revert "Revert "Flag-flip: set chromium to be the default WebView"""
2013-08-01 18:14:33 +00:00
Katie McCormick
b1952e4f47
Doc Update: Delete this unpublished cruft.
...
Change-Id: I8ab8a4ddea64a2b0916c4c7d18cd56fe14856bda
(cherry picked from commit d3d242e268ad4517d7ff20c1f221b1d4d7d3347f)
2013-08-01 18:10:46 +00:00
Baligh Uddin
f310fb8e3d
Import translations. DO NOT MERGE
...
Change-Id: I400da658acf872787f81dc223a4c3cf40ceb2f50
Auto-generated-cl: translation import
2013-08-01 10:55:36 -07:00
Baligh Uddin
b291b5e0b7
Import translations. DO NOT MERGE
...
Change-Id: I412cb6d16cfd7efb9befa89fbaaf46aba6839b46
Auto-generated-cl: translation import
2013-08-01 10:54:29 -07:00
Baligh Uddin
1c2d701d6f
Import translations. DO NOT MERGE
...
Change-Id: I5628a9909d4231d5648d64bdd11cad65bf4a882f
Auto-generated-cl: translation import
2013-08-01 10:40:33 -07:00
Baligh Uddin
8a2fc1da30
Import translations. DO NOT MERGE
...
Change-Id: I521eae27b6864e350d4a81c669b5ada426f150dc
Auto-generated-cl: translation import
2013-08-01 10:24:34 -07:00
Amith Yamasani
3d38fa301c
Merge "PreferenceActivity Fragment security"
2013-08-01 17:18:03 +00:00
Derek Sollenberger
5827cb5059
Changes needed to support Skia at r10377.
...
Change-Id: Id1e1c8c5938ee1a33c6fa3caabd2c28e89243eb4
2013-08-01 12:52:21 -04:00
Romain Guy
5d3dff1d66
Merge "Add missing alpha channel to built-in colors"
2013-08-01 16:46:04 +00:00
Romain Guy
86d3e03d38
Add missing alpha channel to built-in colors
...
Change-Id: I911c17b623513b2715668d0f91604b28c32a969a
2013-08-01 09:43:26 -07:00
Daniel Sandler
87d01e9e83
am 9e6f26a8: am f3e2f8fe: am 9eb434c3: Allow the user to block notifications for foreground services.
...
* commit '9e6f26a8e1e69b1c49676d60a5ebe36c0a0f23f9':
Allow the user to block notifications for foreground services.
2013-08-01 09:35:16 -07:00
Daniel Sandler
9e6f26a8e1
am f3e2f8fe: am 9eb434c3: Allow the user to block notifications for foreground services.
...
* commit 'f3e2f8feef1a22708cc7ce1a7bc5d914bb53933d':
Allow the user to block notifications for foreground services.
2013-08-01 09:32:40 -07:00
Daniel Sandler
f3e2f8feef
am 9eb434c3: Allow the user to block notifications for foreground services.
...
* commit '9eb434c3899ce4791ca58affcbe673e5a96ff6b9':
Allow the user to block notifications for foreground services.
2013-08-01 09:29:45 -07:00
Jean-Michel Trivi
9171db2798
Unhide android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE
...
Unhide android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE
Update android.media.AudioManager.requestAudioFocus() javadoc for the
new focus type.
Bug 8251963
Change-Id: I7cd69faaf5f0169ee462b91d0aaa75dc6b092107
2013-08-01 09:19:58 -07:00
Jean-Michel Trivi
5813f240ec
Merge "Notification muting conditional to exclusive audio focus request"
2013-08-01 16:07:08 +00:00
Victoria Lease
f296e317fb
Merge "Support RGBA fonts and bitmap fonts (and RGBA bitmap fonts)"
2013-08-01 14:40:54 +00:00
Ben Murdoch
74c8f51220
Revert "Revert "Flag-flip: set chromium to be the default WebView""
...
Turn the flag back on.
This reverts commit c9f10b6be981ed4b0c4b2f0e2409d0626a3d4016.
Change-Id: I1a77bdf7f59a6868fd8ab30687062f34fc914bc6
2013-08-01 12:14:53 +00:00
Satoshi Kataoka
2f3efcf107
Merge "Cleanup InputMethodSubtype and add "isAsciiCapable"."
2013-08-01 08:26:47 +00:00
Satoshi Kataoka
dc8abf6cee
Cleanup InputMethodSubtype and add "isAsciiCapable".
...
Bug: 8364845
Change-Id: Ic3ace4b6e0432d56696bcbc0be336aec1dc744a5
2013-08-01 17:17:48 +09:00