drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
180,421 Commits 1 Branch 0 Tags
Commit Graph

9614 Commits

Author SHA1 Message Date
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
Justin Koh
2d42f48449 am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit 'b8038d58da04456e9e7b6e264af69226bf21592c':
  Hide Surface#lockHardwareCanvas DO NOT MERGE
 2014-11-06 20:33:36 +00:00
Sailesh Nepal
3fdf2a84c0 Make APIs to get system phone accounts public 
This is used by Wi-Fi calling to handoff and incoming
call to a cellular call.

For example, when doing an handoff we can look through
the outgoing phone accounts and find the one that the user
has verified with their google account. We can then
handoff to that phone account.

Bug: 17686424
Change-Id: I06d42aa8f4a36d11e5293ed6f7c62b796226f5c1
 2014-11-06 12:20:56 -08:00
Jeremy Joslin
46e3ac8bbc Implemented requestNetwork with a PendingIntent. 
ConnectivityManager.requestNetwork(NetworkRequest, PendingIntent)
was unhidden and implemented.

Added ConnectivityManager.removePendingIntentRequest(PendingIntent) as
the companion method.

Bug: 17356414
Change-Id: I656a1e149cc1292c443ebfe9e61ee3eb5a80f143
 2014-11-06 11:43:27 -08:00
Sailesh Nepal
55c3de783b am a4b3d3d3: am 8fafe7b4: am db66e1d2: Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev 
* commit 'a4b3d3d32f924bf29ba081aae8528cf617742667':
  Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause
 2014-11-06 06:26:32 +00:00
Sailesh Nepal
db66e1d2b9 Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev 2014-11-06 06:14:15 +00:00
Sailesh Nepal
7a69c9277f Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause 
This CL adds a new disconnect cause. Connection managers
can specify this disconnect cause when it doesn't want
to route calls.

Bug: 16903083
Change-Id: I05822991c5c34ca3533652a10fbcb8845a604925
 2014-11-05 21:02:37 -08:00
Jim Miller
cc56956025 am 767ae175: am 6230cdf5: am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '767ae175fab5a93f4948b3722549448eb4b55e41':
  Update TrustAgentService API after review
 2014-11-06 03:12:08 +00:00
mike dooley
3f60f6c084 am 9beb54db: am 6b93e2b0: am 8355c500: Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev 
* commit '9beb54db9ef78c23dd06822a6e3426d6374b26c2':
  Adding method to get disconnect cause from conference
 2014-11-06 03:01:54 +00:00
Jim Miller
262dc4dafe Merge "Update TrustAgentService API after review" into lmp-mr1-dev 2014-11-06 02:52:20 +00:00
mike dooley
8355c500ea Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev 2014-11-06 02:44:00 +00:00
Jim Miller
e303bf4435 Update TrustAgentService API after review 
This change incorporates API council feedback and enables the
TrustAgent whitelisting API.

It also contains a minor cleanup of DPM's use of UserHandle
to eliminate unnecessary object creation.

Fixes bug 17008504

Change-Id: I63cc50169fde54b34406845818bcaf6aadc1a3db
 2014-11-05 18:17:56 -08:00
RoboErik
305563bd63 am 6651cd38: am e2b8dab0: am 5604a85a: Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev 
* commit '6651cd38307d516f5c8e322828b7aaa076231071':
  Add extras to the PlaybackState
  Add setRatingType to MediaSession
 2014-11-05 19:01:40 +00:00
RoboErik
5604a85ac6 Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev 
* changes:
  Add extras to the PlaybackState
  Add setRatingType to MediaSession
 2014-11-05 18:26:00 +00:00
RoboErik
131e63adaa Add extras to the PlaybackState 
This allows apps to include extras that are atomic with play state
changes.

bug:18189125
bug:18103891
Change-Id: Ia3bc5b0dcf29960cb70e2ff3a67ec1fdd48b7a5a
 2014-11-04 13:47:45 -08:00
RoboErik
566c1ed18f Add setRatingType to MediaSession 
This was missing in L. Needed to tell controllers how to rate content.

bug:18051829
Change-Id: I26e662ff04f77ed7f2922bf9e74acf74c850547b
 2014-11-04 13:14:19 -08:00
Justin Koh
7c1ad0cac6 Hide Surface#lockHardwareCanvas DO NOT MERGE 
Hide this for now, will be public in a later release.

Change-Id: Ie13438ed10918df8b044103ef04016494aed1d10
 2014-11-04 11:26:14 -08:00
mike dooley
1cf14ac5dc Adding method to get disconnect cause from conference 
Bug: 17842499
Change-Id: Ifb6e61d50d66aa8e8299e7024b2ab6d1d0f9d878
 2014-11-04 11:21:21 -08:00
Griff Hazen
f7936df688 am 472b990a: am 07e8b2fb: am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 
* commit '472b990ae11f4ae4c16d90cbb02e9efa868db382':
  Improve support for the barcode-on-screen use case for wearables.
 2014-11-04 15:37:00 +00:00
Griff Hazen
9c95015b0c Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 2014-11-04 15:23:21 +00:00
Narayan Kamath
f47a6db44b am f2196a6e: am 6220810b: am 78a3b7d5: Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev 
* commit 'f2196a6ed5988f87d0e04cc30f0f82f7ea431095':
  Remove deprecated DateFormat APIs.
 2014-11-04 10:16:22 +00:00
Narayan Kamath
78a3b7d5af Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev 2014-11-04 09:48:19 +00:00
Stuart Scott
f5845fb756 am a93dee63: am 9017e061: Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev automerge: b600d89 
* commit 'a93dee63de4ce37343577e171571ac9e1d6effa0':
  Clean up public API of SubInfoRecord.
 2014-11-04 03:28:04 +00:00
Nancy Chen
4741ceefc2 am 4f03fa90: am bff9a23a: am f9503019: Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev 
* commit '4f03fa903b6ce4ece24b113e0a9440746445a378':
  Adn queries for multi-SIM. (2/3)
 2014-11-04 02:28:24 +00:00
Stuart Scott
b600d890a6 Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev 2014-11-04 01:29:00 +00:00
Nancy Chen
f950301945 Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev 2014-11-04 00:51:29 +00:00
Stuart Scott
95fc99b334 Clean up public API of SubInfoRecord. 
bug: 17575308
Change-Id: I047ce11fb7835d500652b7ef340a30c052e96b21
 2014-11-03 11:11:56 -08:00
Nancy Chen
b2299c1303 Adn queries for multi-SIM. (2/3) 
Define a method in Telecom to take in a subscription account and return
the URI for an ADN query for that account.

Bug: 17917937
Change-Id: Ic50a4add7fe44a5164271dc9c9e5a58e45e72336
 2014-11-03 11:11:56 -08:00
Griff Hazen
5f2edfc12c Improve support for the barcode-on-screen use case for wearables. 
Add two small developer apis to wearable extender to help developers
show barcodes on different shaped wearable screens.

Bug: 16299175
Bug: 17005635

Change-Id: I05088ffcc405c69f1e8df7bf967ea930548c7d51
 2014-11-03 09:53:54 -08:00