1892 Commits

Author SHA1 Message Date
Jae Seo
128d7fdc0c am 13e3153f: am 8eda50d4: am 6185858b: Merge "TIF: Add COLUMN_SEARCHABLE to TvContract.Programs" into mnc-dev
* commit '13e3153f978194faedb9c30215992403747a975d':
  TIF: Add COLUMN_SEARCHABLE to TvContract.Programs
2015-06-21 21:22:08 +00:00
Jae Seo
6185858bd9 Merge "TIF: Add COLUMN_SEARCHABLE to TvContract.Programs" into mnc-dev 2015-06-21 20:48:27 +00:00
Jae Seo
546ef567b8 TIF: Add COLUMN_SEARCHABLE to TvContract.Programs
This allows applications to specify not only channels but also programs
searchable or not enabling finer grained access control.

Bug: 18910284
Change-Id: Id476c37ae8521301c50a4fb2007b41661e74fe89
2015-06-19 23:47:48 -07:00
Paul Jensen
6e940c659c am 2e2cc43e: am ae6d0354: am 2f56a330: Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)" into mnc-dev
* commit '2e2cc43e3353ca433fc7f85521102cb138faeb65':
  Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)
2015-06-20 05:43:50 +00:00
Paul Jensen
2f56a33041 Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)" into mnc-dev 2015-06-20 01:13:18 +00:00
Junda Liu
1f19c0cd8b am a8d3177f: am c4bef48a: am 8f87c824: Merge "Fix spelling of a config variable." into mnc-dev
* commit 'a8d3177fb7e74599bf51a7236b0a79f0dbecd194':
  Fix spelling of a config variable.
2015-06-20 00:23:04 +00:00
Junda Liu
8f87c8249b Merge "Fix spelling of a config variable." into mnc-dev 2015-06-19 23:49:07 +00:00
Jonathan Basseri
1826c234bc Fix spelling of a config variable.
This is to be consistent with the style/format in CarrierConfigManager.

Fortunately, nothing in packages/apps/CarrierConfig needs to be updated,
since this variable doesn't have any overrides.

Change-Id: I8910abd28d9c0aae68a04dcfcfb2f3d0c0466ca9
2015-06-19 16:07:12 -07:00
Jae Seo
81c754a54a TIF: Add the columns for the app-linking to TvContract.Channels
The app-linking allows channel input sources to provide activity links
from their live channel programming to another activity. This enables
content providers to increase user engagement by offering the viewer
other content or actions.

Bug: 21884742
Change-Id: Iabeea57884c63ac31ee164c27c6e2fe1860f15f6
2015-06-19 15:04:28 -07:00
Miao Wang
524711edc7 am 1db4e1a1: am 1fff1371: am df584d34: Merge "[RenderScript] Add documentation for IntrinsicBLAS, and @hide annotations." into mnc-dev
* commit '1db4e1a1cb924b1651ae936865022bd2f7a8e0b4':
  [RenderScript] Add documentation for IntrinsicBLAS, and @hide annotations.
2015-06-19 22:04:00 +00:00
Jonathan Basseri
b7d4814c45 am 6a55fc86: am 44caca3c: am 48fb9d15: Merge "Migrate \'csp_enabled\' to CarrierConfigManager." into mnc-dev
* commit '6a55fc8662b6f80c963e2b3a13aa4de46b49bf18':
  Migrate 'csp_enabled' to CarrierConfigManager.
2015-06-19 21:40:14 +00:00
Miao Wang
df584d34b5 Merge "[RenderScript] Add documentation for IntrinsicBLAS, and @hide annotations." into mnc-dev 2015-06-19 21:19:56 +00:00
Jonathan Basseri
019523a8a4 Migrate 'csp_enabled' to CarrierConfigManager.
This variable controls whether SIM cards are allowed to disable manual
carrier selection, so it makes more sense for it to be managed as
carrier config.

Currently the variable is only used in device overlays
for specific networks, but we are dropping the device-overlay so that
this simply applies to those networks.

Change-Id: Ia6ba6a89c94c0916c19bdf792e48a4feac87eded
2015-06-19 12:28:08 -07:00
Jeff Tinker
8de94b8adb am f5a0e227: am 129d5782: am 969a0647: Merge "Improve robustness of MediaDrm after mediaserver crash" into mnc-dev
* commit 'f5a0e227435721d0271201d7a895dba07a22f33d':
  Improve robustness of MediaDrm after mediaserver crash
2015-06-19 16:44:14 +00:00
Abodunrinwa Toki
32e4e77b8d am 54103b79: am 2508c6df: am 07e440b2: Merge "Fix FloatingToolbar flickers." into mnc-dev
* commit '54103b7968f0817c77a8d7a054adda1673d4b044':
  Fix FloatingToolbar flickers.
2015-06-19 16:26:05 +00:00
Jonathan Basseri
b105662328 am aec8de6e: am 915d0a64: am cb8bb390: Merge "Add VVM carrier config to public API." into mnc-dev
* commit 'aec8de6ed4f7d2da9054242c44ba45a737229dba':
  Add VVM carrier config to public API.
2015-06-19 16:25:42 +00:00
Jeff Tinker
969a06475c Merge "Improve robustness of MediaDrm after mediaserver crash" into mnc-dev 2015-06-19 16:05:13 +00:00
Abodunrinwa Toki
07e440b278 Merge "Fix FloatingToolbar flickers." into mnc-dev 2015-06-19 14:26:11 +00:00
Yang Ni
ae83880720 am d6909748: am 44095579: am 159f442f: Merge "Unpublish methods in class ScriptGroup.Binding" into mnc-dev
* commit 'd6909748d39e17f6dfb42c219ee8344e2d1a59a7':
  Unpublish methods in class ScriptGroup.Binding
2015-06-19 14:17:06 +00:00
Todd Kennedy
5297c2fb7f am bd626dd9: am 24cd7b03: am f29c4a07: Merge "Add getPackageImportance() system API" into mnc-dev
* commit 'bd626dd96d25033812e7d3aa528d63fafc96cb0d':
  Add getPackageImportance() system API
2015-06-19 14:17:00 +00:00
Jonathan Basseri
cb8bb39001 Merge "Add VVM carrier config to public API." into mnc-dev 2015-06-19 06:16:48 +00:00
Paul Jensen
694f2b8472 Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)
Without this API we're more or less encouraging apps to have long running
processes (battery draining) to receive NetworkCallbacks for the stateful
NetworkCapabilities NET_CAPABILITIES_VALIDATED and
NET_CAPABILITIES_CAPTIVE_PORTAL.  With this API they can instead using
PendingIntents which outlive their apps.

Bug: 21343774
Change-Id: I168d0ac3757729acf7ca5546079846f575a0eedd
2015-06-18 20:00:44 -04:00
Jonathan Basseri
6c1dc315aa Add VVM carrier config to public API.
These bits of carrier config were @hidden, but in order for carrier apps
to set them, they need to be public.

Bug: 21930513
Change-Id: Ifa49cf7441a8c6b6cf7e1aadb46abeb41054fcc3
2015-06-18 16:05:39 -07:00
Yang Ni
159f442fa3 Merge "Unpublish methods in class ScriptGroup.Binding" into mnc-dev 2015-06-18 22:39:00 +00:00
Todd Kennedy
f29c4a07f4 Merge "Add getPackageImportance() system API" into mnc-dev 2015-06-18 22:37:40 +00:00
Todd Kennedy
69810483c7 Add getPackageImportance() system API
Callers must have the permission GET_PACKAGE_IMPORTANCE

Bug: 20642684
Change-Id: I6f3ef2ec810c884e0dee239e5909bcb314957302
2015-06-18 15:27:44 -07:00
Alan Viverette
f1da9a1401 Merge "DO NOT MERGE: Remove DayNight theme" into mnc-dev 2015-06-18 22:21:49 +00:00
Alan Viverette
15d48a16f6 DO NOT MERGE: Remove DayNight theme
Do not go gentle into that good night,
Old age should burn and rave at close of day;
Rage, rage against the dying of the light.

Though wise men at their end know dark is right,
Because their words had forked no lightning they
Do not go gentle into that good night.

Bug: 21854466
Change-Id: I0b7cd116c23f7df88e94f31b3aee7dd22a102804
2015-06-18 15:15:16 -07:00
Adam Powell
ed213cfea3 am 0f6dd549: am 7fd90265: am 2a1f9164: Merge "Un-hide ViewGroup#onViewAdded/onViewRemoved" into mnc-dev
* commit '0f6dd54943f3b343406c655d3efc392ede0cf0ea':
  Un-hide ViewGroup#onViewAdded/onViewRemoved
2015-06-18 17:57:51 +00:00
Adam Powell
2a1f916418 Merge "Un-hide ViewGroup#onViewAdded/onViewRemoved" into mnc-dev 2015-06-18 17:20:44 +00:00
Adam Powell
6690d018b9 Un-hide ViewGroup#onViewAdded/onViewRemoved
These methods are generally useful for writing custom views, and by
exposing them we make it easier for custom view authors to still allow
app developers to use an OnHierarchyChangedListener since it will not
be occupied by a custom view's implementation.

Also move the actual dispatch to package-scoped dispatch methods so
that a developer forgetting to call super won't stop a listener from
functioning.

Bug 21866523

Change-Id: Ie2bb5e241d7c5a02a5033f33ecdaeb40aceb20b5
2015-06-18 10:19:18 -07:00
Craig Lafayette
9faad27a1e am 2cabb0da: am a4e0fca0: am b4c46909: Merge "Remove FRP wipe support for device initializers" into mnc-dev
* commit '2cabb0da0c5b09f3736c61a7eea74ee947182702':
  Remove FRP wipe support for device initializers
2015-06-18 16:19:34 +00:00
Craig Lafayette
b4c469095f Merge "Remove FRP wipe support for device initializers" into mnc-dev 2015-06-18 15:44:49 +00:00
Abodunrinwa Toki
972ab4f858 Fix FloatingToolbar flickers.
This is fixed by avoiding calling toolbar.show() in PhoneWindow.
FloatingActionMode coordinates whether or not the toolbar should be
visible. PhoneWindow differs to it.

This CL also adds a new API:
ActionMode#onWindowFocusChanged(boolean)

Bug: 21617792
Change-Id: Ic49ce1000ce9c782d0f9e17e3d024d462c7b758b
2015-06-18 03:16:21 +01:00
Tomasz Mikolajewski
58461ebdef am 87a45380: am 456778ff: am 9ce9ffec: Merge "Allow to customize title of the dialog." into mnc-dev
* commit '87a4538034d41964ed81b69749939c1868505847':
  Allow to customize title of the dialog.
2015-06-18 00:31:20 +00:00
Tomasz Mikolajewski
9ce9ffec9e Merge "Allow to customize title of the dialog." into mnc-dev 2015-06-17 23:51:07 +00:00
Raph Levien
d5a0e5c84b am fc40d939: am efe1f4bb: am 8872ca4d: Merge "Remove indents from TextView" into mnc-dev
* commit 'fc40d939819dca79cd02b7be93531cf2268bb9fa':
  Remove indents from TextView
2015-06-17 23:41:15 +00:00
Dianne Hackborn
22afc5469e am 2133afc7: am d21b695f: am 22433a33: Merge "Fix issue #21814207 and issue #21814212 (alarm manager)" into mnc-dev
* commit '2133afc77aa36f186b9e5c0ff9954d0d26848e3e':
  Fix issue #21814207 and issue #21814212 (alarm manager)
2015-06-17 23:27:55 +00:00
Tomasz Mikolajewski
0e591f95bd Allow to customize title of the dialog.
TEST=adb shell am start -a android.intent.action.OPEN_DOCUMENT -e
     android.intent.extra.TITLE 'Upload!' -t "text/plain"
BUG=19150996

Change-Id: Ibded6cfaa2de3698c5eada154efbee2b323464d4
2015-06-17 16:12:14 -07:00
Raph Levien
8872ca4d55 Merge "Remove indents from TextView" into mnc-dev 2015-06-17 23:06:17 +00:00
Raph Levien
8edac58e55 Remove indents from TextView
On more careful reflection, the "indents" feature was not ready for
inclusion in the public API. It is still available at a lower level
in StaticLayout.

Also fix a minor typo in the doc for breakStrategy.

Bug: 20641996
Change-Id: I5cd976a536c48615980860396b1564b51b19e14a
2015-06-17 15:53:33 -07:00
Dianne Hackborn
22433a337a Merge "Fix issue #21814207 and issue #21814212 (alarm manager)" into mnc-dev 2015-06-17 22:18:37 +00:00
Miao Wang
fb675a5396 [RenderScript] Add documentation for IntrinsicBLAS, and @hide
annotations.

bug: 21039492
Change-Id: I50a6beca22c9e524a76925d8e497b2618177491d
2015-06-17 15:17:18 -07:00
Yang Ni
77eba48889 Unpublish methods in class ScriptGroup.Binding
b/21187932

Made it an opaque class, since there is no need for a user to
inspect its fields after creation.

Change-Id: I9101afdecc5e25bb484d060be2a08c470faa92e5
2015-06-17 15:06:30 -07:00
Chris Manton
5d0098e3f9 am 054088ce: am 4b4495f0: am 69dd4bba: Merge "Add keys to handle GSM and CDMA roaming/non roaming overrides" into mnc-dev
* commit '054088cec2f19870ab40512c9222d70cc147f6dd':
  Add keys to handle GSM and CDMA roaming/non roaming overrides
2015-06-17 21:57:24 +00:00
Alan Viverette
2d5b72f991 am 5949a974: am 357ea6a6: am 95b6fdeb: Merge "Refactor Drawable.getDither() to isDither()" into mnc-dev
* commit '5949a974bcda214fb8ce43d6ec655bd066a4b930':
  Refactor Drawable.getDither() to isDither()
2015-06-17 21:38:56 +00:00
Chris Wren
ae62d12cc2 am 93b046d6: am 65d94514: am e222a444: Merge "Revert "remove setLatestEventInfo"" into mnc-dev
* commit '93b046d64f1eb0628edb9804b99dcc95535bceef':
  Revert "remove setLatestEventInfo"
2015-06-17 21:38:50 +00:00
Chris Manton
69dd4bba65 Merge "Add keys to handle GSM and CDMA roaming/non roaming overrides" into mnc-dev 2015-06-17 21:21:40 +00:00
Alan Viverette
95b6fdebb4 Merge "Refactor Drawable.getDither() to isDither()" into mnc-dev 2015-06-17 21:06:07 +00:00
Adam Powell
5407bdcc34 am c0611fd7: am fb1fdca9: am 074c3404: Merge "Add matching xml attributes for existing Toolbar properties" into mnc-dev
* commit 'c0611fd77e27addfdef8a2b870328b4985d28b91':
  Add matching xml attributes for existing Toolbar properties
2015-06-17 21:03:52 +00:00