Sander Alewijnse
25e9dbc4cf
am 75f79bc0: am 7bec28c5: am f39cec0b: Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev
...
* commit '75f79bc08b5d8c2cfe999f1dfd0d1d880c58ff93':
Add extra to enable device admins to skip removal of system apps.
2014-11-14 19:19:36 +00:00
Chris Craik
a76634b855
am bbac83fc: am c3784c4d: am 6b3bf0ce: Merge "Add offset method to Outline" into lmp-mr1-dev
...
* commit 'bbac83fc7987b67e6116b4422aee47580aae128a':
Add offset method to Outline
2014-11-14 19:17:14 +00:00
Abhijith Shastry
e3435feed4
am 0f064207: am 530f25d6: am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev
...
* commit '0f0642075e42f415d7f5244c5d94fe726756afa0':
new sms/mms carrier app API
2014-11-14 19:16:33 +00:00
Sander Alewijnse
f39cec0b06
Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev
2014-11-14 10:26:38 +00:00
Simranjit Singh Kohli
c4d583cd24
am adc62efb: am 91b5550e: am fdcdb742: Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev
...
* commit 'adc62efba6ec60ad216de16875e0ac3b42c41f93':
[RemoveAccount API]: Adding support for intent.
2014-11-14 00:50:15 +00:00
Alexandra Gherghina
798597b613
am a28bd7a0: am 7f39e295: am c61cabe5: Merge "Update current.txt with the new extra" into lmp-mr1-dev
...
* commit 'a28bd7a04b800e237013d1e6233b08fbd4873e91':
Update current.txt with the new extra
2014-11-14 00:43:32 +00:00
Ignacio Solla
7617704dfa
am b993a4c7: am f3bd15cf: am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev
...
* commit 'b993a4c70b55344d35b0435cd3cdbb29c3a50809':
[WebView] Allow the WebView to be compiled against the system SDK.
2014-11-14 00:43:27 +00:00
Jeff Brown
0624d611c0
am 36ed36a2: am 4d9bd151: am fef1e0e7: Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev
...
* commit '36ed36a2ea263439257b3978f6e8c787a3544952':
Make Message.setAsynchronous() public.
2014-11-14 00:43:03 +00:00
Ruben Brunk
0c22e6919a
camera2: Add READ_SETTINGS capability.
...
Bug: 18281970
Change-Id: I28be92a85f0a843c690f9ff49263440cd871e40d
2014-11-13 15:15:07 -08:00
Chris Craik
6b3bf0ceef
Merge "Add offset method to Outline" into lmp-mr1-dev
2014-11-13 22:46:22 +00:00
Abhijith Shastry
fb8db1c84b
Merge "new sms/mms carrier app API" into lmp-mr1-dev
2014-11-13 22:15:46 +00:00
Simranjit Singh Kohli
fdcdb7429e
Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev
2014-11-13 19:18:30 +00:00
Sander Alewijnse
8c41156178
Add extra to enable device admins to skip removal of system apps.
...
Bug:17369849
Change-Id: Ibc1c0f480c436c7075725f79ffaaf92832c1154a
2014-11-13 18:16:28 +00:00
Alexandra Gherghina
c61cabe5b3
Merge "Update current.txt with the new extra" into lmp-mr1-dev
2014-11-13 15:31:11 +00:00
Ignacio Solla
bf79cbaba9
Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev
2014-11-13 15:03:45 +00:00
Alexandra Gherghina
a73766790a
Update current.txt with the new extra
...
Bug: 17716971
Change-Id: Ice82394c681665aff96724faa2e8056656d2b1ab
2014-11-13 14:43:03 +00:00
Chris Craik
0e12fa12cb
Add offset method to Outline
...
Also clean up offset docs in Path
Change-Id: Ieca02611d32acce726efba652ae1969340a55a76
2014-11-12 16:17:33 -08:00
Cheuksan Wang
f9c50c45c6
new sms/mms carrier app API
...
BUG: 18005911
Change-Id: Ib961badc1ccac270f1244f8d971d9abec324b73f
2014-11-12 15:29:41 -08:00
Ignacio Solla
451e338c51
[WebView] Allow the WebView to be compiled against the system SDK.
...
BUG:18152150
Change-Id: Ifd6dcac17663631058d895c61bb6e8018c5aeecc
2014-11-12 22:49:56 +00:00
Shishir Agrawal
5c1a63c223
Add new API to set voicemail number.
...
The API is protected by system or carrier privilege.
Bug: 17393589
Change-Id: I33f4a00b30e0f5d72e5d53553a187d974872eab6
2014-11-12 09:38:18 -08:00
Jeff Brown
9840c07667
Make Message.setAsynchronous() public.
...
There are many cases in real world applications where it is desirable
to continue processing messages on the Looper even when most other
messages have been suspended by a synchronization barrier pending
completion of the next drawing frame on vsync.
Internally the framework is able to mark certain messages as being
independent of these higher level synchronization invariants by
flagging them as asynchronous.
This change exposes the existing function and improves on the
documentation so that it is clearer what is meant by asynchronous.
Bug: 18283959
Change-Id: I775e4c95938123a364b21a9f2c39019bf37e1afd
2014-11-11 20:35:58 -08:00
Wink Saville
f78c50e6da
am 93fc415e: Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 43bbf30 automerge: e76308c
...
* commit '93fc415e6219f59a5b1f2d6fd5e1647551a27742':
Update SubscriptionManager API as per API council.
2014-11-12 03:45:30 +00:00
Wink Saville
43bbf30a06
Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev
2014-11-12 01:13:04 +00:00
Wink Saville
a374c3d03b
Update SubscriptionManager API as per API council.
...
bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
2014-11-11 11:48:04 -08:00
Alan Viverette
3b54b6d78c
am cf7f3b6b: am a9b503ae: Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev automerge: 0aaebd4
...
* commit 'cf7f3b6be252f313536e58cc62763075d4f45e5a':
Fix Material styling in remaining dialogs and layouts
2014-11-11 18:39:44 +00:00
Alan Viverette
a9b503aec2
Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev
2014-11-11 17:34:36 +00:00
Dianne Hackborn
35ed2f4c39
am 95ef0ac7: am 525da301: am 85d558cd: Add Activity API to get referrer information.
...
* commit '95ef0ac77738eac98e4952fe1e94db64c1560f5e':
Add Activity API to get referrer information.
2014-11-11 01:03:02 +00:00
Dianne Hackborn
85d558cd48
Add Activity API to get referrer information.
...
This expands the use of EXTRA_REFERRER to be relevant anywhere,
allowing apps to supply referrer information if they want. However,
if they don't explicitly supply it, then the platform now keeps
track of package names that go with Intents when delivering them
to apps, which it can be returned as the default value.
The new method Activity.getReferrer() is used to retrieve this
referrer information. It knows about EXTRA_REFERRER, it can return
the default package name tracked internally, and it also can return
a new EXTRA_REFERRER_NAME if that exists. The latter is needed
because we can't use EXTRA_REFERRER in some cases since it is a Uri,
and things like #Intent; URI extras can only generate primitive type
extras. We really need to support this syntax for referrers, so we
need to have this additional extra field as an option.
When a referrer is to a native app, we are adopting the android-app
scheme. Since we are doing this, Intent's URI creation and parsing
now supports this scheme, and we improve its syntax to be able to build
intents with custom actions and stuff, instead of being all hung up
on custom schemes.
While doing this, fixed a problem when parsing both intent: and new
android-app: schemes with a selector portion, where we were not
respecting any scheme that was specified.
Change-Id: I06e55221e21a8156c1d6ac755a254fea386917a2
2014-11-11 00:42:18 +00:00
Alan Viverette
f89b58ca83
Fix Material styling in remaining dialogs and layouts
...
Also updates existing row and dialog layouts to use preferred list item
or dialog padding as appropriate, fixes incorrect activity themes, and
updates ChooseAccountActivity variants for Material.
BUG: 18314215
BUG: 18292562
Change-Id: I2fde4ba6db80d839104abdaa334a46ad1861600f
2014-11-10 16:14:27 -08:00
Evan Charlton
12fc80b2b2
am 13cf9cf1: am 3caf6fc7: Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev automerge: e2e649f
...
* commit '13cf9cf1d3f426d82a2af46c36bdf308ff43d428':
Apply @hide / @SystemApi to android.telecom.*
2014-11-10 22:42:46 +00:00
Santos Cordon
c2f2aab667
am fac1b941: am 2ace3d48: Make add-call a global property of telecom. (1/4) automerge: 6c912b7
...
* commit 'fac1b941e9450745563cf989a2ca7a34fe68e5ef':
Make add-call a global property of telecom. (1/4)
2014-11-10 22:13:22 +00:00
Evan Charlton
0e094d926c
Apply @hide / @SystemApi to android.telecom.*
...
Move the android.telecom.* namespace back to @hide, and also mark it
with @SystemApi so that system-privileged apps can use them.
Bug: 18302450
Change-Id: I33ae1b9b0dfdb1c5eff51ca3c829196bcfc9411c
2014-11-10 11:52:31 -08:00
Santos Cordon
6c912b7d05
Make add-call a global property of telecom. (1/4)
...
ADD_CALL didn't make sense as a property of Connection or Call.
This changes it to be a global property instead.
Bug: 18285352
Change-Id: I658e7a6977a848600272cde2914612c8691bb801
2014-11-10 19:19:35 +00:00
Andres Morales
b2201e44d7
am 089792ae: am 3a868411: am 2885c6ba: Merge "Fix build" into lmp-mr1-dev
...
* commit '089792aef91ff3978b487337d3e9f8a2df14e790':
Fix build
2014-11-10 17:45:55 +00:00
Andres Morales
2885c6ba63
Merge "Fix build" into lmp-mr1-dev
2014-11-10 17:31:27 +00:00
Andres Morales
0d8537ae7f
Fix build
...
Forgot to run make update-api in
https://googleplex-android-review.git.corp.google.com/#/c/582630/
Change-Id: I3c4dd253d0f1ffea8ae1b72835aee91541ed7d6f
2014-11-10 09:26:18 -08:00
Pete Gast
2f6cd6489f
am 2ad988aa: am 642b4d93: am 705c9c13: Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev
...
* commit '2ad988aa6e6f7fa89affcfc5b81ac3c28ea525ee':
Expand WearableExtender to customize labels.
2014-11-10 16:48:29 +00:00
Pete Gast
705c9c131a
Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev
2014-11-10 16:35:57 +00:00
Simranjit Singh Kohli
8778f993ae
[RemoveAccount API]: Adding support for intent.
...
Adding support for intent handling provided by authenticators.
Bug: 18292092
Change-Id: I1e94422bc28e5fd54c454ee6542ff2d30f82849f
2014-11-07 18:37:30 -08:00
Stuart Scott
870338c946
am bc1d9755: am 0e58219f: am 90cf41c3: Merge "SubInfoRecord provides a tinted icon with the initial embossed." into lmp-mr1-dev
...
* commit 'bc1d97556d32a45ceca5db3e2af12cd3d4cf5590':
SubInfoRecord provides a tinted icon with the initial embossed.
2014-11-08 00:25:14 +00:00
Stuart Scott
ab45ec177a
SubInfoRecord provides a tinted icon with the initial embossed.
...
bug: 17575308
Change-Id: I895975dfe8d1c4db8381ef9322bd72c8fcb3e22c
2014-11-07 23:53:39 +00:00
Sander Alewijnse
c4ba217474
am 1b0dbd5c: am 8c1cd7e6: am 3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev
...
* commit '1b0dbd5c954b61e2ee95f87817a1ec0e7d242b20':
Added the restrictions pending application restrictions key.
2014-11-07 22:39:38 +00:00
Sander Alewijnse
3eed90f393
Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev
2014-11-07 22:25:00 +00:00
Sander Alewijnse
53d63dcd04
Added the restrictions pending application restrictions key.
...
Bug:17632522
Change-Id: If5a0d0ea1f479b0584fc0b1cff2a179d296d2904
2014-11-07 22:19:48 +00:00
Andrew Lee
e57e8e658a
am a56fa73c: am 8f34e65a: am a70688f2: Merge "Replace onConferenceChanged with onConnectionAdded." into lmp-mr1-dev
...
* commit 'a56fa73c30b4756068fbb6578668e39fb2f5c235':
Replace onConferenceChanged with onConnectionAdded.
2014-11-07 04:17:56 +00:00
Sailesh Nepal
3e9b648664
am 11db8477: am fe319eab: Merge "Make APIs to get system phone accounts public" into lmp-mr1-dev automerge: 7d901cb
...
* commit '11db847774b3049ad889c96bdd49b8cf7ccd167e':
Make APIs to get system phone accounts public
2014-11-07 03:55:44 +00:00
Jeremy Joslin
e4fb9419d8
am 93f515f9: am 91fff05b: Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev automerge: 1a2b99e
...
* commit '93f515f99030f3c8d54005cc0cf600ca06e215b1':
Implemented requestNetwork with a PendingIntent.
2014-11-07 03:55:38 +00:00
Andrew Lee
46f7f5dce4
Replace onConferenceChanged with onConnectionAdded.
...
This change is motivated by a desire to be able to adjust the
phone capabilities of a conference depending on its connections.
Turns out Connection is not a good place to do this, because when
the conference is set, this code is only fired if the connection
service already contains the conference. Conference makes more
sense to do this anyways, at the end of the day.
+ Add onConnectionAdded function to Conference.java.
- Remove onConferenceChanged function from Connection.java.
Bug: 18241753
Change-Id: Ib9212a8483a7a7b542618697399bbab8b2701b04
2014-11-06 17:19:51 -08:00
Sailesh Nepal
7d901cb6f5
Merge "Make APIs to get system phone accounts public" into lmp-mr1-dev
2014-11-06 21:06:36 +00:00
Jeremy Joslin
1a2b99ea26
Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev
2014-11-06 20:51:24 +00:00