Commit Graph

13462 Commits

Author SHA1 Message Date
Daniel Sandler
aefdfa5721 Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev am: 3af45bd
am: 73a694b

* commit '73a694b486b8b37d7e61e5ad53b3c9b139b783e9':
  Allow system apps to substitute a different app name in notifications.

Change-Id: Id47615712e65e8a11edd68dcd729824c9c37c85a
2016-04-14 19:29:49 +00:00
Clara Bayarri
7b02468b34 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev am: 6e58549
am: bdcd8dc

* commit 'bdcd8dce23ad83a696fc350374abde50ee91c6d0':
  Provide startIntentSenderForResult for fragments

Change-Id: I5746132388eabcf5e29a948cb36d30745ae73887
2016-04-14 19:26:09 +00:00
Joe Onorato
075bb7e3f4 Merge commit '034b58c2f53a9101395b2cd8cd4e01be9f93c2b2' into manual_merge_034b58c
More work on issue #26390151: Add new JobScheduler API...

...for monitoring content providers

We now have some delays before reporting URI changes, to allow
them to batch together.

Also clean up debug output, and fix some issues with how we
were managing the content observer state.

And while I am here, fix the device idle and app idle controllers
to no longer maintain their own list of jobs, but just directly
iterate over the JobStore.

Change-Id: I709bd7c77e1b5ffb012e36149a739ecb245dd5cd
2016-04-14 10:27:31 -07:00
Dan Sandler
732bd6cb27 Allow system apps to substitute a different app name in notifications.
This is a privileged permission and is only to be used by
the core OS and related packages whose names are confusing
or misleading when shown in notifications.

The user will always be able to see the true package name by
accessing the notification inspector (longpress or swipe
gesture on the notification row in SystemUI).

Fixes: 26517701
Change-Id: I2b021c9da0757b99df76399666af263668d88070
2016-04-14 13:48:03 +00:00
Kirill Grouchnikov
698b751dc7 Add @TestApi-guarded way to get bounds of specific day in CalendarView
Two separate implementation paths, one for Material look / layout, and
one for legacy / pre-Material one.

Bug: 28037149
Change-Id: Id1946802c0a93218d9eb0b73c81ad76dc027763c
2016-04-14 08:47:05 -04:00
Clara Bayarri
6e58549740 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev 2016-04-14 10:05:35 +00:00
Dianne Hackborn
9e31b3fd81 Merge "More work on issue #26390151: Add new JobScheduler API..." into nyc-dev 2016-04-13 23:30:14 +00:00
Sudheer Shanka
38e0c19717 Merge "Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence." into nyc-dev am: fd580f7
am: 0306304

* commit '03063041002228b247d68a53198c76824a8d30f3':
  Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence.

Change-Id: I1ea3d55c212811c118c8912fe8a8efa302938e60
2016-04-13 20:24:59 +00:00
Sudheer Shanka
fd580f7d1a Merge "Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence." into nyc-dev 2016-04-13 20:12:05 +00:00
Sudheer Shanka
fe7184e5b2 Merge "Add an intent action ACTION_SHOW_APP_INFO." into nyc-dev am: b53a36b
am: dab38b0

* commit 'dab38b0aaa5086656b519f3fe636f6619228bc29':
  Add an intent action ACTION_SHOW_APP_INFO.

Change-Id: Iad5fe29e6b7874fe63cc04636a2c91ddc9c14650
2016-04-13 18:01:00 +00:00
Dianne Hackborn
8db0fc15b8 More work on issue #26390151: Add new JobScheduler API...
...for monitoring content providers

We now have some delays before reporting URI changes, to allow
them to batch together.

Also clean up debug output, and fix some issues with how we
were managing the content observer state.

And while I am here, fix the device idle and app idle controllers
to no longer maintain their own list of jobs, but just directly
iterate over the JobStore.

Change-Id: If3fdff23c00c2f1b99901a9be096d851562d3439
2016-04-13 10:54:16 -07:00
Sudheer Shanka
b53a36b8cf Merge "Add an intent action ACTION_SHOW_APP_INFO." into nyc-dev 2016-04-13 17:47:07 +00:00
Michal Karpinski
dc8ac6fbb5 Merge "API polish in DPM for organization color and name methods" into nyc-dev am: 1271cef
am: 96d49b1

* commit '96d49b1ac6e197f64103e5454e308f65609b2853':
  API polish in DPM for organization color and name methods

Change-Id: I90b74fa1b0c3e2961fb26fc5e84e85d5bc5da1f5
2016-04-13 13:40:03 +00:00
Michal Karpinski
1271cef419 Merge "API polish in DPM for organization color and name methods" into nyc-dev 2016-04-13 13:28:08 +00:00
Clara Bayarri
a0c2dc3cf5 Provide startIntentSenderForResult for fragments
Bug: 27700608
Change-Id: Ibb7689ba0527048dd5944c4315b986f16030081d
2016-04-13 12:33:30 +01:00
Dongwon Kang
5e3c6801f4 Merge "TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()" into nyc-dev am: 4c3dcc0
am: 4655cdd

* commit '4655cdd5c3ddf378eb134649e659e2dece973c83':
  TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()

Change-Id: I6a413c97013430638ede5aa90099a54be0ecc770
2016-04-13 02:01:14 +00:00
Eino-Ville Talvala
552781c9c0 Merge "Camera/Surface: Update OutputConfiguration API" into nyc-dev am: 777c4e7
am: d848ebb

* commit 'd848ebb7a5930a8ad6c93efd2b8b0ccf2116a664':
  Camera/Surface: Update OutputConfiguration API

Change-Id: I10d13c49771baea1968d79a5359deaaca1697e5d
2016-04-13 02:00:38 +00:00
Dongwon Kang
4c3dcc0a16 Merge "TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()" into nyc-dev 2016-04-13 00:36:35 +00:00
Eino-Ville Talvala
777c4e7644 Merge "Camera/Surface: Update OutputConfiguration API" into nyc-dev 2016-04-13 00:08:09 +00:00
Dongwon Kang
e9db0e1ed1 TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()
Bug: 28078300
Change-Id: I0546c80b50475b1f05d5c5229f6d3796c7372b60
2016-04-12 16:44:40 -07:00
Makoto Onuki
a9a8d44cdc Merge "ShortcutManager: Address API review feedback." into nyc-dev am: 1d616f0
am: 9d25ead

* commit '9d25ead98b6b09611fd95dfdd2b49ef5191ea030':
  ShortcutManager: Address API review feedback.

Change-Id: I663034ac1ae3bdb7b0757efae0396235784b8dce
2016-04-12 23:07:29 +00:00
Sunny Goyal
0a6fc940d7 Merge "Merge "Changing LauncherApps to resolve activity by component name" into nyc-dev am: 1fe7dfa" into nyc-dev-plus-aosp
am: 411d2f9

* commit '411d2f97054a1265a117c2bcdf8f83683846d73b':
  Changing LauncherApps to resolve activity by component name

Change-Id: I9fc47dfb6e801ab30babc012ff82011c48ab57b5
2016-04-12 22:41:37 +00:00
Felipe Leme
877d517b4f Merge "Merge "Make getStorageVolume(File file) public." into nyc-dev am: 93c442e" into nyc-dev-plus-aosp
am: d5ce189

* commit 'd5ce189a6924245cc924a3289d4006cc48d2994b':
  Make getStorageVolume(File file) public.

Change-Id: I98f6fee2a1a0b8ad709bba0f554c79f61921df1c
2016-04-12 22:41:12 +00:00
Makoto Onuki
1d616f0d88 Merge "ShortcutManager: Address API review feedback." into nyc-dev 2016-04-12 22:34:17 +00:00
Eino-Ville Talvala
fa5e2a156d Camera/Surface: Update OutputConfiguration API
- Rename "surface set ID" to "surface group ID"
- Remove setSurfaceSetId
- Use constructor overloads to set surface group ID, make
  OutputConfiguration immutable
- Add Surface.getConsumerDescriptor to make it possible to verify
  if two Surfaces have the same backing consumer
- Cache initial surface generation ID in OutputConfiguration so that
  changes in a Surface's internals will label it is as a
  new output
- Add sample use case for surface group IDs

Bug: 27950763
Bug: 28076469
Change-Id: I13251d1dd3d26a978ffbedc519966524e93bc61c
2016-04-12 14:51:17 -07:00
Sunny Goyal
1fe7dfa66a Merge "Changing LauncherApps to resolve activity by component name" into nyc-dev 2016-04-12 20:55:32 +00:00
Felipe Leme
93c442e44f Merge "Make getStorageVolume(File file) public." into nyc-dev 2016-04-12 20:44:06 +00:00
Makoto Onuki
b6d3523dfb ShortcutManager: Address API review feedback.
- "delete" -> "remove"
- add/deleteDynamicShortcut() now takes a list.
- Throttling default settings is now 2 calls / hour.

- Add categories to ShortcutInfo.
- getIconResourceId() is now public

Bug 27923857
Bug 27548047

Change-Id: I8457b30e4b2f7c63ab2988648b37178fd16ea45b
2016-04-12 10:35:20 -07:00
Alexander Hills
d98785e288 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev am: e3f3cb1
am: 0666069

* commit '06660697a3198835b5a7955f3955e58fb92e407f':
  Fixes name of intent launch flag for Action Extender

Change-Id: Ia824a1bc0a6c52697e0e0ce7cea0f6448ef60594
2016-04-12 17:29:39 +00:00
Alexander Hills
e3f3cb1048 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev 2016-04-12 17:10:19 +00:00
Yi Kong
0755fc6c61 Track libcore change 2115cc0ca7d60965a361129d8826478ff2d847e4
Bug: 28108421
Change-Id: I774f264bf538b0fa2aac63c8e5225f82d7b03c2e
(cherry picked from commit 5182e272ad)
(cherry picked from commit 05a77eee41)
2016-04-12 17:12:26 +01:00
Alex Hills
4ec3ff4f8f Fixes name of intent launch flag for Action Extender
Changes the name from set/getHintContentIntentLaunchesActivity
to set/getLaunchesActivty

Change-Id: I8ef879ae82cc360163fcd689eb5fad0d2b9d7db0
2016-04-12 11:44:36 -04:00
Yi Kong
05a77eee41 Track libcore change 2115cc0ca7d60965a361129d8826478ff2d847e4
Bug: 28108421
Change-Id: I774f264bf538b0fa2aac63c8e5225f82d7b03c2e
(cherry picked from commit 5182e272ad)
2016-04-12 15:45:10 +01:00
Michal Karpinski
74cd73079c API polish in DPM for organization color and name methods
- Returning and accepting CharSequence instead of String
- Enforcing 100% opacity and adjusting javadocs for color
format
- Adding @ColorInt annotations

Bug: 27531295
Change-Id: Id27d4fd5e7bb4d746cc61288457eb4eb86224505
2016-04-12 15:17:52 +01:00
Shubham Ajmera
aeeabf072f Merge "Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00" into nyc-dev am: 68b19f2
am: 0983951

* commit '098395171952abb0a2fd8bdeb5ecb7b8f5d8b2f4':
  Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00

Change-Id: I10b7b20ca7cd96b57c68a85377e6ea8ba4c83546
2016-04-12 12:38:31 +00:00
Kirill Grouchnikov
e1684cda2b Merge "Add @TestApi method to Spinner to test whether popup is showing." 2016-04-12 12:29:08 +00:00
Shubham Ajmera
a871ab1687 Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00
Bug: 27426743
Change-Id: I4c77de05c99b811f60f2421d1f41e62c1404a4a4
2016-04-12 10:10:25 +01:00
Sudheer Shanka
3ccca91e6e Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence.
Bug: 27531295
Change-Id: Ib28c509a3112046c14d812265ce43bc5b5574f12
2016-04-11 21:46:24 -07:00
Felipe Leme
c250e45eda Make getStorageVolume(File file) public.
BUG: 27951594
Change-Id: I354f6a29b3fa3374ea07bcbe14096e9673d282c5
2016-04-11 18:52:28 -07:00
Makoto Onuki
1187239423 Merge "ShortcutManager: First cut of CTS" into nyc-dev am: bc20320
am: 0beb56d

* commit '0beb56d4e49f433759f7c825374c90442f2aed53':
  ShortcutManager: First cut of CTS

Change-Id: I048150bf9451e8d28dc599673321bd31f8d119a1
2016-04-11 23:30:43 +00:00
Makoto Onuki
bc20320f7f Merge "ShortcutManager: First cut of CTS" into nyc-dev 2016-04-11 23:11:41 +00:00
Sunny Goyal
45d3e97748 Changing LauncherApps to resolve activity by component name
This makes the behavior of resolveActivity similar to isActivityEnabled.
Not that starting this activity may still fail due to other reasons.

Bug: 27549770
Change-Id: I924d7aa2305c64fd319ca1e38058f9f956c0c256
2016-04-11 16:02:27 -07:00
Makoto Onuki
5ba0d3e3a3 ShortcutManager: First cut of CTS
Bug 27548047

Change-Id: Idd7a768ea4fee44c2cf6e3bd473cea9e67f5f7cd
2016-04-11 14:48:44 -07:00
Jeff Sharkey
dd1a2a3bb8 Merge "Clean up AudioRouting API internals." into nyc-dev am: 0e2e780
am: 98646e8

* commit '98646e8e5d0ca69ece528935c74546fcac81972b':
  Clean up AudioRouting API internals.

Change-Id: Ic93a353100f85ca701ee182b179514649d0681f3
2016-04-11 20:51:22 +00:00
Hangyu Kuang
402a01ea74 Merge "media: update VP9 CodecProfileLevel" into nyc-dev am: 333c7d3
am: a20e438

* commit 'a20e438c8f987cb1610f8e0a1ae31ba3cd0affcd':
  media: update VP9 CodecProfileLevel

Change-Id: I1d5fe2735b9da4eb1c490209db5131ca43d1a95d
2016-04-11 20:40:37 +00:00
Jeff Sharkey
0e2e7806b7 Merge "Clean up AudioRouting API internals." into nyc-dev 2016-04-11 20:33:50 +00:00
Hangyu Kuang
f0ef572fd0 media: update VP9 CodecProfileLevel
Bug:27969307
Change-Id: I44f230bb691bd193c2119b399eca17da87bfbc97
2016-04-11 12:08:03 -07:00
Jeff Sharkey
ed2edc7a8e Clean up AudioRouting API internals.
Reuse existing OnRoutingChangedListener APIs and internal logic by
extending the new AudioRouting.OnRoutingChangedListener.  We use
new default methods to delegate incoming calls on the legacy
interfaces.

Fix a handful of locking bugs.

Bug: 27950070, 27952052, 27949198
Change-Id: Ie584108bcbeeab064d8e27d4984e541f31d36728
2016-04-11 13:01:55 -06:00
Greg Kaiser
4f633c7d32 Merge "ContextHubManager: Avoid bad NanoApp objects" into nyc-dev am: f4d3805
am: 1fd8534

* commit '1fd853468f4071cbdeb913954c9786d6cb6347ef':
  ContextHubManager: Avoid bad NanoApp objects

Change-Id: Id42d34e96b39771a41acad0690553aecf896dd08
2016-04-11 17:35:52 +00:00
Greg Kaiser
f4d380537a Merge "ContextHubManager: Avoid bad NanoApp objects" into nyc-dev 2016-04-11 17:23:48 +00:00