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

8737 Commits

Author SHA1 Message Date
Esteban Talavera
09f0e2c125 am c1be5a52: am da3a8981: am f734047a: Renamed getUninstallBlocked to isUninstallBlocked 
* commit 'c1be5a52df1c8b3888dd911a882ecbcb88aa5abe':
  Renamed getUninstallBlocked to isUninstallBlocked
 2014-08-28 11:01:36 +00:00
Esteban Talavera
729b2a6c2f Renamed getUninstallBlocked to isUninstallBlocked 
As per API review.

Bug: 17297103
Change-Id: Icb4ceded317b0df4deb0f5221512541a632e150b
 2014-08-28 10:56:18 +01:00
Jae Seo
98a1942f20 am d55533a7: am edf8161e: am 9d86176d: Merge "Add android.software.live_tv feature" into lmp-dev 
* commit 'd55533a7d301205dff23ba2d01cc8d7d7fc47457':
  Add android.software.live_tv feature
 2014-08-28 09:41:59 +00:00
Jae Seo
4abfc99c51 am 554f2adf: am f69d30a0: am 3de3e67b: API Review: TV 
* commit '554f2adf5f09f07644ab5f231af7a4751eeb679a':
  API Review: TV
 2014-08-28 09:41:54 +00:00
Jae Seo
f565c3569a am 2eba45ce: am e1c0d6f0: am 5bb8065a: TIF: Enable applications to register custom content rating systems 
* commit '2eba45cea451399c9da75601524eb0ded2aa2875':
  TIF: Enable applications to register custom content rating systems
 2014-08-28 09:41:29 +00:00
Jae Seo
11cfe2c036 Merge "Add android.software.live_tv feature" into lmp-dev 2014-08-28 05:50:19 +00:00
Jae Seo
a899be4ebd API Review: TV 
This change addresses the following feedback:

- "ageHint" attribute should be renamed to "contentAgeHint"
- "country" attribute should be doc'd to specify valid formats (two
character country codes or whatever)

Bug: 17293643
Change-Id: Ia5e58e191c3678bb2d6b1be36c4275d323675ad9
 2014-08-28 05:48:36 +00:00
Jae Seo
9c165d6e9a TIF: Enable applications to register custom content rating systems 
A recent change that moved the string resource for the system supported
content ratings from the framework to the TV app led to a need for
allowing the TV app to publish its own content rating systems. This
change added an intent action and a metadata key to be used by the TV
input manager service for querying available content rating systems,
similarly to the way InputManager defined ACTION_QUERY_KEYBOARD_LAYOUTS
and META_DATA_KEYBOARD_LAYOUTS for custom keyboard layouts. Applications
now can register their own rating systems simply by declaring a
broadcast receiver in their manifests.

Bug: 17167287, Bug: 17114406
Change-Id: I1808c624014b603ea709714737c2a880714bdc0a
 2014-08-27 21:52:07 -07:00
Selim Gurun
bd9e521c43 am 2537ad58: am 405c03ad: am 8f1de303: Merge "Address API Feedback" into lmp-dev 
* commit '2537ad58dacfe8aa84d467782df10fb4ef9de366':
  Address API Feedback
 2014-08-28 04:17:42 +00:00
Yorke Lee
af74216c4e am 64c86ede: am 9aedb262: am e4ba7f2b: Merge "Update value of EXTRA_CALL_TYPE_FILTER" into lmp-dev 
* commit '64c86edeb93c8b7dcde4c2a6288414e3ab416055':
  Update value of EXTRA_CALL_TYPE_FILTER
 2014-08-28 04:17:16 +00:00
Michael Wright
cb14761ed4 am f06b6386: am f7898245: am d0f6975b: Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 
* commit 'f06b6386de250240cbaaa5cca922a4f9e8915680':
  Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY
 2014-08-28 04:17:06 +00:00
Selim Gurun
d576bf310b Merge "Address API Feedback" into lmp-dev 2014-08-28 01:47:31 +00:00
Selim Gurun
17d1adb183 Address API Feedback 
Bug: 17253647

This is Part I of API feedback. It does not address portions
of the feedback that is still pending a response from API council.

Change-Id: I6ae250c6455a5545912623aeb34332d564fffde7
 2014-08-27 17:56:08 -07:00
Yorke Lee
fe7c3bc082 Merge "Update value of EXTRA_CALL_TYPE_FILTER" into lmp-dev 2014-08-28 00:16:27 +00:00
Michael Wright
b4558af745 Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 2014-08-28 00:00:56 +00:00
Yorke Lee
52e7750184 Update value of EXTRA_CALL_TYPE_FILTER 
Bug: 17253963
Change-Id: I1e98fc2a25b0bc807b0b4d1af2941da6660e09e0
 2014-08-27 16:28:12 -07:00
Michael Wright
219857b900 Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY 
Also add docs to PowerManager.WakeLock#release(int)

Bug: 17290118
Change-Id: Ibcbc4279efdd0f275808042356e6ff843958e23f
 2014-08-27 15:37:27 -07:00
Jim Miller
db72969e93 am 9c9d3c42: am 694a6bbc: am c5cabe2d: Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 
* commit '9c9d3c4257c1cbd4a7831b28378ff368566bb081':
  Hide trust agent whitelisting until new API is ready.
 2014-08-27 22:06:22 +00:00
Jim Miller
6979cd1e4d am 58c53113: am 56c0e1db: am 61043233: Merge "Change name of confirm credentials method after API review" into lmp-dev 
* commit '58c53113c4fb2cc13ac3e8f37d73fc0dad9b5799':
  Change name of confirm credentials method after API review
 2014-08-27 21:51:36 +00:00
Alan Viverette
659156b8d1 am 7fe5136e: am 7d5bbea6: am 11e73661: Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev 
* commit '7fe5136e77835d00a5f1d345b9b608fec73a60fe':
  Rename Spinner.Form to Spinner.Underlined, make Alert theme public
 2014-08-27 21:51:20 +00:00
Jim Miller
e193455ee2 Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 2014-08-27 21:29:12 +00:00
Jim Miller
b1474f4432 Hide trust agent whitelisting until new API is ready. 
Fixes bug 17008504

Change-Id: Ic93d52042e9b6d6f7d634f22aa04642f2da1af32
 2014-08-27 14:27:49 -07:00
Jae Seo
cfd861ec15 Add android.software.live_tv feature 
This feature will be listed by Android TV devices that allow displaying
contents from TV inputs implemented with the
android.media.tv.TvInputService API. (Note that not all leanback devices
support this feature.)

Bug: 17284986
Change-Id: Ic1f23f6f5955866e9f1db9229693d370576066a3
 2014-08-27 14:02:15 -07:00
Jim Miller
f88c2569e9 Merge "Change name of confirm credentials method after API review" into lmp-dev 2014-08-27 20:42:19 +00:00
Alan Viverette
12c75ab730 Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev 2014-08-27 19:44:37 +00:00
Alan Viverette
d890c13981 Rename Spinner.Form to Spinner.Underlined, make Alert theme public 
BUG: 17286794
BUG: 17295515
Change-Id: I010bb1591f7690dbc40020d3fdd413f8e1bd8547
 2014-08-27 12:28:18 -07:00
Makoto Onuki
63d3e8fe01 am a3ed4ae9: am 1a8674f1: am d37368bf: Address API review comments: 
* commit 'a3ed4ae9578a49981e40746614940de1b54ccf25':
  Address API review comments:
 2014-08-27 17:14:24 +00:00
Sander Alewijnse
b6c0fc8625 am 12df8729: am 45fb047d: am eb3f4b1c: Merge "Provide lockdown of date/time device owners." into lmp-dev 
* commit '12df87292e529a13ae033cda7197abacdd68b9ee':
  Provide lockdown of date/time device owners.
 2014-08-27 17:05:48 +00:00
Makoto Onuki
0e917336a2 Address API review comments: 
- Rename isCorpContactId() to isEnterpriseContactId().
- Update EXTRA_* constant values.
- Update javadoc on NAME_VERIFIED.

Bug 17253963

Change-Id: I1bef3adbb4125b39129c77cca29c4b8089e1f8cc
 2014-08-27 16:29:40 +00:00
Sander Alewijnse
ebaf5c70e9 Merge "Provide lockdown of date/time device owners." into lmp-dev 2014-08-27 14:25:35 +00:00
Yorke Lee
2822d16b02 am 14407ed0: am cca60741: am 60a3817c: Merge "API changes for ContactsContract" into lmp-dev 
* commit '14407ed0cc8d23c4bbf6609611d522c0986894c1':
  API changes for ContactsContract
 2014-08-27 04:33:54 +00:00
Jim Miller
bde3d18dd5 Change name of confirm credentials method after API review 
Changed from getConfirmDeviceCredentialIntent to createConfirmDeviceCredentialIntent

Fixes bug 17288988

Change-Id: Iae9a997d9ea49ce23bdbbe38ad7b0763779b8f59
 2014-08-26 19:53:17 -07:00
Yorke Lee
5edb638eed Merge "API changes for ContactsContract" into lmp-dev 2014-08-27 00:51:07 +00:00
Yorke Lee
b31c8abdc4 API changes for ContactsContract 
* Hide NAME_VERIFIED
* Add PinnedPositions.pin

Bug: 17253963
Change-Id: I887fb291fa4de8db6859655956a80898d1ee618c
 2014-08-26 17:13:02 -07:00
Alan Viverette
5fdd5bc3e3 am c60c9895: am fd6bc26a: am 413e2c21: Merge "Make shadow alpha properties public, add lighting values for TV" into lmp-dev 
* commit 'c60c989509fda863aff17361fe26008070455296':
  Make shadow alpha properties public, add lighting values for TV
 2014-08-26 23:21:13 +00:00
Alan Viverette
f3542fd63f Merge "Make shadow alpha properties public, add lighting values for TV" into lmp-dev 2014-08-26 22:52:32 +00:00
Jim Miller
23cfead9e6 am f5b9dacd: am ed18d240: am fc5346ed: Merge "Hide fingerprint API until new API is ready" into lmp-dev 
* commit 'f5b9dacd48d29877a1c92414fd4d2973e3db6837':
  Hide fingerprint API until new API is ready
 2014-08-26 22:34:34 +00:00
Christoph Studer
37b84639a2 am d4b0a4b1: am deefd534: am 7e637d1e: Merge "NoListener: meetsInterruptionFilter -> matchesInterruptionFilter" into lmp-dev 
* commit 'd4b0a4b1641031fc3d2e74beecee4eccea46d1ae':
  NoListener: meetsInterruptionFilter -> matchesInterruptionFilter
 2014-08-26 22:16:27 +00:00
Jim Miller
e7b6b1aae7 Merge "Hide fingerprint API until new API is ready" into lmp-dev 2014-08-26 22:02:52 +00:00
Alan Viverette
ed6f14a20c Make shadow alpha properties public, add lighting values for TV 
BUG: 17189722
BUG: 17221975
Change-Id: I4ed477b658fec96ce69fa278f67345dab6bacaa3
 2014-08-26 14:53:28 -07:00
vandwalle
7aea15a08e Merge "remove passpoint - DO NOT MERGE" into lmp-dev 2014-08-26 21:26:42 +00:00
Christoph Studer
faa9957fd3 Merge "NoListener: meetsInterruptionFilter -> matchesInterruptionFilter" into lmp-dev 2014-08-26 21:16:22 +00:00
Jeff Sharkey
fe6754f944 am be8c6d58: am f3f849d1: am 206f982b: Merge "Treat moving app as installing in new location." into lmp-dev 
* commit 'be8c6d5803093578f6710778436c0233469b6536':
  Treat moving app as installing in new location.
 2014-08-26 21:02:47 +00:00
Adam Lesinski
d3eb9151b4 am 2626a16b: am 90675431: am a707b2b8: Merge "Split up ComponentName in UsageEvents.Event" into lmp-dev 
* commit '2626a16b53267832f13a8c222f7b65514f24ae9d':
  Split up ComponentName in UsageEvents.Event
 2014-08-26 20:39:41 +00:00
Jeff Sharkey
264a5f5b34 Merge "Treat moving app as installing in new location." into lmp-dev 2014-08-26 20:29:13 +00:00
Dianne Hackborn
e9c13a60c0 am 11bba84c: am f1bb15d2: am 55953caa: Merge "Fix issue #16311398: Limit number of documents a process can open" into lmp-dev 
* commit '11bba84c2da1c30e0d3b67456c04995d16a5db52':
  Fix issue #16311398: Limit number of documents a process can open
 2014-08-26 20:23:49 +00:00
Adam Lesinski
1dc0f36401 Merge "Split up ComponentName in UsageEvents.Event" into lmp-dev 2014-08-26 20:09:07 +00:00
Adam Lesinski
12302fe7f5 am 8b474e12: am 800225b1: am ef3e6d97: Merge "Add indexOf method to ArrayMap & ArraySet" into lmp-dev 
* commit '8b474e12f87d829e70e74468d7d3b80e070005ba':
  Add indexOf method to ArrayMap & ArraySet
 2014-08-26 20:08:40 +00:00
Dianne Hackborn
4610545dd2 Merge "Fix issue #16311398: Limit number of documents a process can open" into lmp-dev 2014-08-26 19:56:26 +00:00
Adam Lesinski
9d9607527f Split up ComponentName in UsageEvents.Event 
Some events in the future may not have originated
from a class, so we shouldn't be using ComponentName.

Bug:17259858
Change-Id: Id7fe3245b91596cf27ae4ec51655602f01665622
 2014-08-26 12:41:31 -07:00