Commit Graph

1963 Commits

Author SHA1 Message Date
Yorke Lee
38e2d104d8 Merge "ContactsContract API changes" into lmp-dev 2014-07-25 23:00:08 +00:00
Yorke Lee
94c8761dc5 ContactsContract API changes
* Make ContactCounts an interface
* Improve clarity of ContactCounts documentation
* Add PinnedPositions.undemote method, and hide the method name
constant that is only used for the internal implementation

Bug: 16403306

Change-Id: If8b5cad779293cb9a3b90e698b13481f79b2351f
2014-07-29 19:00:32 -07:00
Jae Seo
783645e99f TIF: Merge TvParentalControlManager into TvInputManager
This change addresses the following API council feedback.

TvParentalControlManager:
-- Replace the listener interface with a broadcast Intent with well-known
   action, something like ACTION_BLOCKED_RATINGS_CHANGED.
-- TvParentalControlManager goes away, and two remaining methods move to
   TvInputManager.

== Implementation changes ==
-- The user-selected rating preferences should be stored in an XML file, and
   loaded at boot by your internal system service.  It should _not_ be stored in
   a Secure/Global setting.

Bug: 16542165
Change-Id: I278df963576652ec9163a66c1ef99419fcdb36c2
2014-07-30 15:39:39 +09:00
John Spurlock
2b0e09c59f Settings: Constants for notification settings.
Bug:16208321
Change-Id: Iaf18dfc2edda9d80553f02ea0a74236230f89079
2014-07-28 20:43:47 -04:00
Amith Yamasani
da466e1e91 am 8a8c5f4d: am 7ef87d4d: am 0a4e461e: Hidden global setting to allow adding users from lockscreen
* commit '8a8c5f4d305d0dad0f051af32914b07012bfc6a4':
  Hidden global setting to allow adding users from lockscreen
2014-07-26 01:11:09 +00:00
Amith Yamasani
23a0f0512a Hidden global setting to allow adding users from lockscreen
This will be undefined/off by default. User has to explicitly
turn it on in the Settings->Users->menu.

Bug: 15760168
Change-Id: I204f28cee2b04832c42e8ec5ced960f6916bfe5a
2014-07-26 00:58:38 +00:00
John Spurlock
486c89842f am 58981510: am cbdadc7d: am d5410ff7: Merge "Volume: Persist unsafe volume playback time." into lmp-dev
* commit '58981510296ed03f9deee0829461bfe76647996b':
  Volume: Persist unsafe volume playback time.
2014-07-25 22:27:40 +00:00
Yorke Lee
acaf686488 am ff650115: am e120d1e5: am c8f3ac84: Merge "Update the value of PinnedPositions.UNPINNED to 0" into lmp-dev
* commit 'ff65011576f13cd28cafe6a83098b18bf66344db':
  Update the value of PinnedPositions.UNPINNED to 0
2014-07-25 21:57:43 +00:00
Paul Soulos
bda303319b am d6e7338f: am 22a78a16: am 50655afc: Adds getTypeLabel to ContactsContract Event
* commit 'd6e7338f2ae25670e4b4ef4b7f9cda5ac9117449':
  Adds getTypeLabel to ContactsContract Event
2014-07-25 19:24:41 +00:00
Paul Soulos
6b2dd6337e Adds getTypeLabel to ContactsContract Event
Bug: 16550284
Change-Id: Ie95093a2c9bca2b9ba130dea470c8beef94cd659
2014-07-25 18:17:35 +00:00
John Spurlock
addcf34645 Merge "Volume: Persist unsafe volume playback time." into lmp-dev 2014-07-24 23:36:47 +00:00
John Spurlock
aa5ee4d65f Volume: Persist unsafe volume playback time.
Instead of warning after every reboot, remember the
playback time after a user confirmation and only
reset after the 20 hour playback threshold.

Bug:16543104
Change-Id: I783358d97b88302a28fe77a8eb88bcd338ef1c87
2014-07-25 17:00:25 -04:00
Nicolas Prevot
73b941f761 am c5435cdd: am e7469eca: am c50bbc02: Merge "Migrate extras to ClipData for image/video capture intents." into lmp-dev
* commit 'c5435cdd91f6778d753f99ee6ee8c5132e0ae962':
  Migrate extras to ClipData for image/video capture intents.
2014-07-25 12:38:32 +00:00
Yorke Lee
77e56a1152 am a8f55d15: am 5a9a76b5: am 9abe5673: Merge "Add Calls.TRANSCRIPTION to CallLog (2/2)" into lmp-dev
* commit 'a8f55d158c9926afbf5ab2f8f4434d8db5447e0e':
  Add Calls.TRANSCRIPTION to CallLog (2/2)
2014-07-24 23:49:06 +00:00
Nicolas Prevot
d1c99b1fe8 Migrate extras to ClipData for image/video capture intents.
The intents ACTION_IMAGE_CAPTURE, ACTION_IMAGE_CAPTURE_SECURE and ACTION_VIDEO_CAPTURE are now handled in a way
similar to ACTION_SEND and ACTION_SEND_MULTIPLE.
Migrate the uri in the EXTRA_OUTPUT extra to clipData, and add the flag GRANT_WRITE_URI_PERMISSION.

The userIds are now added to extra uris in the process receiving the intent, (not in the system process), because the
system process may not be able to parcel/unparcel the extras.

BUG: 15534203

Change-Id: I8f79666b726bc6d7745bf777ad3c7518945c5cc3
2014-07-25 10:22:19 +01:00
Yorke Lee
eea3c5d735 Merge "Update the value of PinnedPositions.UNPINNED to 0" into lmp-dev 2014-07-24 15:36:02 +00:00
Yorke Lee
7d24679c6c Update the value of PinnedPositions.UNPINNED to 0
Bug: 16403306
Change-Id: I6ff5a6051694245831db31db9d37ac0793eb0c32
2014-07-25 10:05:55 -07:00
Yorke Lee
c91079c3c3 am 56c351b7: am 59942b1b: am 6faad8cb: Merge "Improve documentation for for CallLog.CONTENT_URI_WITH_VOICEMAIL" into lmp-dev
* commit '56c351b7781de509c0cadca265d441e486e1dd05':
  Improve documentation for for CallLog.CONTENT_URI_WITH_VOICEMAIL
2014-07-24 19:58:43 +00:00
Yorke Lee
7a5e5726ab Add Calls.TRANSCRIPTION to CallLog (2/2)
Dialer needs access to the TRANSCRIPTION column via the CallLog to
show voicemail transcriptions inline.

Change-Id: Id1807923a07af9e9e34783e6be2e39485eee7795
2014-07-24 08:30:33 -07:00
Yorke Lee
624d0d64ab Improve documentation for for CallLog.CONTENT_URI_WITH_VOICEMAIL
Change-Id: I6e1a4811f822f2211070edd7c9aa486005e53cea
2014-07-23 19:09:27 -07:00
Brian Attwell
4f3afa6039 am 16846152: am 1a038e57: am 41b62ac7: Add PICK_JOIN_CONTACT_ACTION action contact
* commit '16846152b19b9487cf3403b3d3b7e4d4af6e6f46':
  Add PICK_JOIN_CONTACT_ACTION action contact
2014-07-23 18:23:47 +00:00
Brian Attwell
e98a95c156 Add PICK_JOIN_CONTACT_ACTION action contact
This ContactsContract change is needed by ag/509090

Bug: 16190113
Change-Id: I0f96286bdf45015148d2e84f7fe7aac5b23e1ba2
2014-07-23 18:11:13 +00:00
Alan Viverette
301a072c3f am 3db52061: am f7b914b8: am a27cc3f4: Merge "Remove unused quick setting display preferences" into lmp-dev
* commit '3db52061967a14a2d197e8850160d5a0a6ec16dd':
  Remove unused quick setting display preferences
2014-07-22 01:17:10 +00:00
Yorke Lee
b38a8d5ec1 am aebd7c1c: am b9105f15: am ec0197da: Merge "Add call log entries to all currently running users" into lmp-dev
* commit 'aebd7c1c6764a8535aaf29ba334225d1ea42dff7':
  Add call log entries to all currently running users
2014-07-21 19:23:35 +00:00
Evan Charlton
a961ff298f am ae930cb8: am d5d9a4de: am 19e236f5: Merge "Rename PhoneAccountMetadata to PhoneAccount" into lmp-dev
* commit 'ae930cb836c784df45d76e9716610de91747ac24':
  Rename PhoneAccountMetadata to PhoneAccount
2014-07-21 19:19:06 +00:00
Evan Charlton
4373edd648 am 2254cebd: am 144036b8: am 1bb914ea: Rename PhoneAccount to PhoneAccountHandle
* commit '2254cebd48a8702210a1c3fdcc77a5bcc8151f4b':
  Rename PhoneAccount to PhoneAccountHandle
2014-07-21 18:27:35 +00:00
Evan Charlton
6eb262c351 Rename PhoneAccount to PhoneAccountHandle
Change-Id: I2e97b348e6316a8b3ccc39fd81013e7f514a2889
2014-07-20 10:34:59 -07:00
Alan Viverette
06da1b1ceb Remove unused quick setting display preferences
BUG: 16303790
Change-Id: I0772228aac5a743b9780853c5825252c148b8b5c
2014-07-22 01:04:19 +00:00
Winson Chung
7bb0933698 am 01eca811: am c655f3a4: am 51b044a2: Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev
* commit '01eca811404a02bcbfe01231d88fe8fa9ac57df3':
  Add setting to guard the lock-to-app recents icon
2014-07-20 02:27:30 +00:00
Evan Charlton
8c8a062f52 Rename PhoneAccountMetadata to PhoneAccount
Change-Id: I4597b14110c1cee7f637ec125b839852ef0f34c4
2014-07-20 15:12:16 -07:00
Jason Monk
56e09b42a0 Add setting to guard the lock-to-app recents icon
Lock-to-app (soon to be screen-pinning) will now only show up once
it has been enabled in settings.

Bug: 16378448
Change-Id: Ide333463f86310eacb7a1d8b6dc7b1aea8722713
2014-07-18 16:45:34 -07:00
Yorke Lee
158c5e41d4 Add call log entries to all currently running users
When a call log entry is inserted by Telecomm as the primary user,
insert the entry for all other currently running users as well.

Bug: 16298776
Change-Id: Ie48049d7e1847bff03d4f96eb644d27b8dd0c1cd
2014-07-21 09:54:34 -07:00
Brian Attwell
ace692ef6d am 8f17b084: am a08e00c7: am fa15c729: Merge "Mark social APIs stream APIs as deprecated" into lmp-dev
* commit '8f17b084f9d75c33ed2c5a74f755f37d030f9650':
  Mark social APIs stream APIs as deprecated
2014-07-18 19:05:29 +00:00
Jae Seo
c2809b7597 am cdc49c6c: am b719bf57: am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev
* commit 'cdc49c6c4a9e106b220b29a7da68141489a0d175':
  TIF: Add TvParentalControlManager
2014-07-18 03:37:10 +00:00
Jinsuk Kim
3a96903be4 am 2fa30b74: am eff7b1af: am ba5ba7a2: Merge "Remove system audio output option for HdmiControlService" into lmp-dev
* commit '2fa30b74b14b07fa83c811da748cf66d48018c4c':
  Remove system audio output option for HdmiControlService
2014-07-18 02:57:49 +00:00
Jinsuk Kim
fe61a67bb9 Merge "Remove system audio output option for HdmiControlService" into lmp-dev 2014-07-17 21:07:39 +00:00
Jae Seo
54a4634983 Merge "TIF: Add TvParentalControlManager" into lmp-dev 2014-07-17 18:11:21 +00:00
Jae Seo
6057102dbb TIF: Add TvParentalControlManager
Each TV input service is now required to query the system whether the
user is allowed to watch the current program before showing it to the
user if the parental control is turned on, which can be checked by
calling TvParentalControlManager.isEnabled(). Whether the TV input
service should block the content or not is determined by invoking
TvParentalControlManager.isRatingBlocked() with the content rating for
the current program. Then the TvParentalControlManager makes a judgment
based on the user blocked ratings stored in the secure settings and
returns the result. If the rating in question turns out to be blocked,
the TV input service must immediately block the content and call this
method with the content rating of the current program to prompt the PIN
verification screen.

Each TV input service also needs to continuously listen to any changes
made to the parental control settings by registering a
TvParentalControlManager.ParentalControlCallback() to the manager and
immediately reevaluate the current program with the new parental control
settings.

Bug: 13172379
Change-Id: I8e1900d4b8d28c56798986d5c3906bd418ab97ac
2014-07-17 16:29:36 -07:00
Chris Craik
b7f22787ef am 3e95764e: am b63869a6: Merge "Add accessibility text contrast setting" into lmp-dev
* commit '3e95764e68ea93918d455b8b2c08d9ff02dc36f8':
  Add accessibility text contrast setting
2014-07-17 18:21:26 +00:00
Brian Attwell
891f5b2638 Merge "Mark social APIs stream APIs as deprecated" into lmp-dev 2014-07-17 17:59:02 +00:00
Brian Attwell
bdb13c8c07 Mark social APIs stream APIs as deprecated
Bug: 14490632
Change-Id: I6b54613514e52f34cfcc37d25493a7ea7d636a86
2014-07-18 10:43:31 -07:00
Barnaby James
48f3552093 Add intents for setting airplane and zen mode by voice only.
Change-Id: I28a262da86eb102d1bd12265f96db0efec5db203
2014-07-17 07:24:09 -07:00
Jinsuk Kim
55021797c6 Remove system audio output option for HdmiControlService
Turned out it is not necessary to specify the audio output device
for system audio mode, as it will be chosen based on audio policy.

Change-Id: I611381d38bf188425f0833fe9d1f454400f6c69a
2014-07-16 22:54:39 +00:00
Chris Craik
889fc94ffa Merge "Add accessibility text contrast setting" into lmp-dev 2014-07-16 21:54:23 +00:00
Chris Craik
cce47eb580 Add accessibility text contrast setting
b/14624452

Adds a feature which draws all text (in the HW accelerated standard
path) in a high contrast mode. Text is drawn at full alpha, and either
white or black (depending on its original color) with a starkly
contrasted outline beneath it.

Change-Id: I943f624b6367de35367cced3b2a8298f2bc62377
2014-07-16 18:25:23 -07:00
Yorke Lee
95a18a8f96 Merge "Make ContactPreferences use SharedPreferences instead of System settings (1/5)" into lmp-dev 2014-07-16 00:46:50 +00:00
Jason Monk
febcb9d42b Merge "Finalizing lock-to-app UX" into lmp-dev 2014-07-16 00:53:22 +00:00
Yorke Lee
9b34a4e5d1 Make ContactPreferences use SharedPreferences instead of System settings (1/5)
* Move constants that originally lived in the framework into ContactsCommon
* Use SharedPreferences instead of System settings to persist preferences
* Use a SharedPreferenceListener to monitor changes instead of a content observer
on system settings
* Move DisplayOrderPreference and SortOrderPreference into ContactsCommon so that
it can be used by Dialer
* Create base DialerSettingsActivity in Dialer, and make GoogleDialerSettingsActivity
extend it
Bug: 16153186

Change-Id: I14edf1e2277441b2d2a8f004b651ebd97bc06aa9
2014-07-14 19:25:02 -07:00
Amith Yamasani
b99a90227a Merge "Introduce a public intent for launching Home settings" into lmp-dev 2014-07-15 00:22:01 +00:00
Amith Yamasani
eb7b94a388 Introduce a public intent for launching Home settings
Bug: 16303152
Change-Id: I47e4461ae246aae7e31c8e06ca9370d6f04f61b4
2014-07-14 18:02:08 -07:00