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

160877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luan Nguyen
dd7d025b97 am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 
* commit 'ca0db1a0ec0fc0456ec4180d7b0bbac7e43dffec':
  Revert "docs: Update auto landing and design page image assets"
 2015-03-11 19:07:52 +00:00
Andrew Lee
74050f58d5 Merge "Indicate local and remote RX/TX capabilities for VT." into m-wireless-dev 2015-03-11 18:32:32 +00:00
Luan Nguyen
52def6d1c8 am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs 
automerge: b0422a4

* commit 'b0422a41ed0f0e2c08e92cc75201c53224a01b67':
  docs: Update auto landing and design page image assets
 2015-03-11 17:43:15 +00:00
Rich Slogar
b55db05b26 am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
automerge: 709e9a8

* commit '709e9a88075570ebbafd53a7921faf7d7436c591':
  docs: eclipse revisions update
 2015-03-11 17:43:07 +00:00
Andrew Solovay
d9a99e03ed am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" 
automerge: baf3451

* commit 'baf345120bc291ec1378618a5cc200ccc78864ba':
  docs: Revisions to "Providing Messaging for Auto"
 2015-03-11 17:42:59 +00:00
Luan Nguyen
b0422a41ed am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs 
* commit '50a9b83554decb4913fc8eac9862edf902149265':
  docs: Update auto landing and design page image assets
 2015-03-11 17:31:34 +00:00
Rich Slogar
709e9a8807 am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
* commit '8ab872dba1eff1477cb12da63d1f882260a271ae':
  docs: eclipse revisions update
 2015-03-11 17:31:30 +00:00
Andrew Solovay
baf345120b am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" 
* commit 'a493c48989f3c80dd061b86a6216a622b20dfc7f':
  docs: Revisions to "Providing Messaging for Auto"
 2015-03-11 17:31:26 +00:00
Luan Nguyen
50a9b83554 am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs 
* commit '42ee70aac023da26a6dc4dee5856871372e792e8':
  docs: Update auto landing and design page image assets
 2015-03-11 17:18:43 +00:00
Rich Slogar
8ab872dba1 am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
* commit 'dcc5a34b14ae09598d9c019c0d4706c5e2d00be2':
  docs: eclipse revisions update
 2015-03-11 17:18:39 +00:00
Andrew Solovay
a493c48989 am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" 
* commit '5f8e08ed2c97bb92232e500e7c32b31b8bbd5dcd':
  docs: Revisions to "Providing Messaging for Auto"
 2015-03-11 17:18:23 +00:00
Luan Nguyen
ca0db1a0ec am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 
* commit 'eeb79d104fc09ea727108bde7a7ef06f3300241a':
  Revert "docs: Update auto landing and design page image assets"
 2015-03-11 16:42:52 +00:00
Luan Nguyen
eeb79d104f am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 
* commit '9a7238d8f5bd4ec90c2b887808ea26e5f55d0154':
  Revert "docs: Update auto landing and design page image assets"
 2015-03-11 16:35:32 +00:00
Luan Nguyen
9a7238d8f5 Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 2015-03-11 16:25:33 +00:00
Luan Nguyen
36b8a59a6d Revert "docs: Update auto landing and design page image assets" 
This reverts commit 7859590acd229b66c1953d3d4ed9538261d6b898.

Change-Id: Iab71d4a2ce0eb6dbbab685433a7c991015402e19
 2015-03-11 16:20:52 +00:00
Nancy Chen
8b97ee3c48 Helper methods for voicemail status provider. 
Added method to make it easier to insert into the voicemail status
table. Also takes in a phone account for future multi-SIM support.

Remove VvmSyncService class in favor of moving most of the code to
OmtpVvmSyncService.

Bug: 19236241
Change-Id: I5d9def276fbdbc6f825fb35e9fa31bfc3cead1ba
 2015-03-11 08:45:00 -07:00
Deepanshu Gupta
7b2cae5072 Fix project settings. 
1. Update layoutlib_api source path.
2. Update jdk version
3. Update nullity annotations.

Change-Id: I48db7dbd7ba5ff02fcf11672608b75e072385166
 2015-03-10 18:16:21 -07:00
Deepanshu Gupta
d345f44a87 Add RecyclerView support. 
Bug: http://b.android.com/72117
Change-Id: Iba95baff59f1b715f91da25e15acf27bc052d95e
 2015-03-10 18:16:21 -07:00
Craig Mautner
60a907e60c Correct docs to specify leading slash in paths. 
The guide documentation for the manifest data element contains a
grammar that implies leading slashes are not required for the path
part of a URI string. Also the path documentation does not mention
the need for a leading slash.

Grammar from documentation:
<scheme>://<host>:<port>/[<path>|<pathPrefix>|<pathPattern>]
                        ^
                        |
Included "/" -----------+

All internal usages of path, pathPrefix, and pathPattern, have a /
starting out the string and these attributes don't work without that
/.

This change updates the grammar and the documentation for the path
attributes.

Fixes bug 19540035

Change-Id: I931a25fd1c10c01eaa32a7cfa82cca256b129efb
 2015-03-10 15:52:35 -07:00
Andrew Lee
5e9e8bb30e Indicate local and remote RX/TX capabilities for VT. 
This provides more granular API support for representing the mix of
state and capabilities of local and remote video clients. For our
implementation, we are primarily concerned with bidirectional video
calling. But, this provides support for representing certain error
scenarios, and flexibility for other parties which may desire to
implement one-way video calling.

Change-Id: I0373ffd377c3547fa8dd98ab5fde4f8d616a1d2f
 2015-03-10 15:41:52 -07:00
Pavel Zhamaitsiak
4a2ca9da48 Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev 
automerge: 8b438c8

* commit '8b438c8c1abc3e5e5cce2c9ee22f64c9a5a30290':
  Add strings for IMS Registration error notifications.
 2015-03-10 19:34:02 +00:00
Luan Nguyen
42ee70aac0 am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs 
* commit '24b4e5729ed917dc2831a111f917d0a5fbd4e4d0':
  docs: Update auto landing and design page image assets
 2015-03-10 19:28:57 +00:00
Rich Slogar
dcc5a34b14 am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
* commit '08ddf132bfb2117d49ea3ca70861a227c39e8115':
  docs: eclipse revisions update
 2015-03-10 19:28:53 +00:00
Luan Nguyen
24b4e5729e am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs 
* commit '0fc17c37a514a80073631dffa381ec07caed93cf':
  docs: Update auto landing and design page image assets
 2015-03-10 19:22:37 +00:00
Rich Slogar
08ddf132bf am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
* commit '0c1076b270bd718cab4b89acc96f6cbbbd1e9774':
  docs: eclipse revisions update
 2015-03-10 19:22:33 +00:00
Pavel Zhamaitsiak
8b438c8c1a Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev 2015-03-10 19:22:17 +00:00
Luan Nguyen
0fc17c37a5 Merge "docs: Update auto landing and design page image assets" into lmp-docs 2015-03-10 19:18:54 +00:00
Rich Slogar
0c1076b270 Merge "docs: eclipse revisions update" into lmp-docs 2015-03-10 19:15:10 +00:00
Rich Slogar
05298d0fd5 docs: eclipse revisions update 
Change-Id: I163f9ef9d8cd0c4e4fe5d7a19b76e239af2ee2d3
 2015-03-10 11:46:49 -07:00
Vinit Deshpande
93e314e82d Add missing system-api.txt for RTT API changes 
Change-Id: I85bd48daf3da16ab3b14dc55083fba78372a6cc5
 2015-03-10 11:41:45 -07:00
Andrew Solovay
5f8e08ed2c am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" 
* commit '66b4b3179b0b98e89daaacf0e4d926c72341ea6a':
  docs: Revisions to "Providing Messaging for Auto"
 2015-03-10 15:11:01 +00:00
Rich Slogar
1123a3eb52 am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev 
automerge: 9462a93

* commit '9462a93b053d11e77a3024951ce2c9b36cffb18d':
  docs: build tools revision 22.0.0:
 2015-03-10 03:22:26 +00:00
Rich Slogar
9462a93b05 am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev 
* commit '464a2bc261ac3b3ad817e3d5cc7fa8f3dae0a6c3':
  docs: build tools revision 22.0.0:
 2015-03-10 03:08:58 +00:00
Vinit Deshpande
046ac5e6f7 Few changes to make API check happy [DO NOT MERGE] 
These changes are made to make the API check in mwd-staging
happy. It doesn't look like they are needed in master branch;
so marking them as DO NOT MERGE.

Change-Id: I45363165b6a8ffe896cf9a31c0b3cb410aa69cba
 2015-03-09 19:02:09 -07:00
Vinit Deshpande
0019e53e11 am "add 2 side RTT support on scan" 
merged from partner/m-wireless-wifi-dev
6e58424 add 2 side RTT support on scan
 2015-03-09 19:01:39 -07:00
Vinit Deshpande
bc93466e5a am "Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev" 
merged from partner/m-wireless-wifi-dev
a357b5a Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev
 2015-03-09 19:01:39 -07:00
Vinit Deshpande
4300ac49e3 am "Merge "Passpoint API - Take 1" into m-wireless-wifi-dev" 
merged from partner/m-wireless-wifi-dev
c4423a5 Merge "Passpoint API - Take 1" into m-wireless-wifi-dev
 2015-03-09 19:01:38 -07:00
Vinit Deshpande
d2585f3050 am "Passpoint API - Take 1" 
merged from partner/m-wireless-wifi-dev
b21d248 Passpoint API - Take 1
 2015-03-09 19:01:37 -07:00
Vinit Deshpande
e95944300e am "Do not provide 5GHz option for softap if there is no country code available" 
merged from partner/m-wireless-wifi-dev
b938c0e Do not provide 5GHz option for softap if there is no country code available
 2015-03-09 19:01:37 -07:00
Vinit Deshpande
14a2008f63 am "Introduce onLost event on bssid hotlist [DO NOT MERGE]" 
merged from partner/m-wireless-wifi-dev
ab325cb Introduce onLost event on bssid hotlist [DO NOT MERGE]
 2015-03-09 19:01:36 -07:00
Vinit Deshpande
3cb5e4d72f am "get channel list from driver for SoftAP channel selection" 
merged from partner/m-wireless-wifi-dev
18ae1d2 get channel list from driver for SoftAP channel selection
 2015-03-09 19:01:35 -07:00
Vinit Deshpande
76f9aceecf am "Revert "Initial Passpoint code."" 
merged from partner/m-wireless-wifi-dev
5d7768f Revert "Initial Passpoint code."
 2015-03-09 19:01:34 -07:00
Vinit Deshpande
29267b6dd6 am "Initial Passpoint code." 
merged from partner/m-wireless-wifi-dev
2eba02a Initial Passpoint code.
 2015-03-09 19:01:33 -07:00
Vinit Deshpande
f0bfa91103 am "Merge "set softAP on a specified band, including both 2.4 and 5 GHz band" into m-wireless-wifi-dev" 
merged from partner/m-wireless-wifi-dev
08cbd3e Merge "set softAP on a specified band, including both 2.4 and 5 GHz band" into m-wireless-wifi-dev
 2015-03-09 19:01:32 -07:00
Vinit Deshpande
b4499afde5 am "set softAP on a specified band, including both 2.4 and 5 GHz band" 
merged from partner/m-wireless-wifi-dev
a0be0fb set softAP on a specified band, including both 2.4 and 5 GHz band
 2015-03-09 19:01:31 -07:00
Vinit Deshpande
1aa4dcee03 am "Bring in passpoint code [DO NOT MERGE]" 
merged from partner/m-wireless-wifi-dev
7dd2f6b Bring in passpoint code [DO NOT MERGE]
 2015-03-09 19:01:31 -07:00
Vinit Deshpande
472cca08eb am "New Additions to WifiScanner APIs [DO NOT MERGE]" 
merged from partner/m-wireless-wifi-dev
f45acfe New Additions to WifiScanner APIs [DO NOT MERGE]
 2015-03-09 19:01:29 -07:00
Andrew Solovay
66b4b3179b am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" 
* commit '0a3f9c7dd26ba31e75552db6ec0eb27cb7267c00':
  docs: Revisions to "Providing Messaging for Auto"
 2015-03-10 01:29:29 +00:00
Rich Slogar
464a2bc261 Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev 2015-03-09 23:42:48 +00:00
Pavel Zhamaitsiak
36d96e0b1e Add strings for IMS Registration error notifications. 
Change-Id: I14808e1dbbd14b5124be7303d586638b9e210269
 2015-03-09 14:58:19 -07:00