Commit Graph

2041 Commits

Author SHA1 Message Date
Chris Wren
402152d673 Merge "Reveal notification listener settings APIs." into lmp-mr1-dev 2014-10-29 14:54:18 +00:00
Chris Wren
8326a8a945 Reveal notification listener settings APIs.
Fix the value of the ACTION_NOTIFICATION_LISTENER_SETTINGS constant
to be the actual value to which the settings app responds.

Bug: 10023397
Change-Id: I80a0ff76406a3b0b893793f9a63ffa563dae103b
2014-10-28 15:54:53 -04:00
Shishir Agrawal
1ae88e3420 Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37
The change above deleted these lines by mistake.

Bug: 18153840
Change-Id: I010c36f227e313cdf00a363f1f851e61a4db1af4
2014-10-28 11:19:14 -07:00
Jeff Sharkey
5274dcc85d Drop DEV network stats to save RAM.
We migrated to pure XT stats a long time ago, so we no longer need
to keep the DEV stats cached in RAM.  This saves ~250KB on a typical
device.

Bug: 18118003
Change-Id: I3d84ba47073fa3500454784afc956c8e53404492
2014-10-24 13:15:15 -07:00
Etan Cohen
e41a9cf9f7 Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT.
Change-Id: I233b003af57a550f2f51b12213700ab0451039e5
2014-10-23 19:15:13 +00:00
Bryce Lee
fb1cf36aa7 resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev
Change-Id: I9e4cabd2d8a34a348ae888f096c8d3c35226e960
2014-10-22 16:56:08 -07:00
Bryce Lee
584a445179 [Theater Mode] framework implementation through global setting
Bug: 17684570
Change-Id: I64a9c9c0620049cdfcca0150648fa201281f7178
2014-10-21 15:55:55 -07:00
Libin.Tang@motorola.com
0499bb5de4 IMS:change enhanced 4g setting to store in setting db.
Change-Id: I2ec37478e2bef5b15b157e490f75d5dda5f97117
2014-10-15 16:12:39 -07:00
Jim Miller
ce711c6d57 am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev
* commit '09ba0da87fa56eac91da5eb2d0a20b7799df66d5':
  Add a checkbox option to 'require password to decrypt'
2014-10-15 18:31:32 +00:00
Jim Miller
09ba0da87f am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev
* commit 'e7c325559d961f13c6df96803bca4747f41b27a4':
  Add a checkbox option to 'require password to decrypt'
2014-10-15 18:26:59 +00:00
Jim Miller
6848dc8e3b Add a checkbox option to 'require password to decrypt'
Fixes bug 17881324

Change-Id: Id94e593a172d686339c736473226fece1bb749ee
2014-10-14 16:26:11 -07:00
Tom O'Neill
7731a99807 Fix a race where NLP consent dialog can be shown unnecessarily
- Bug: 17908111

Change-Id: If94570861f38b922478d490599ab02cfb86adea6
2014-10-09 11:30:49 -07:00
Dianne Hackborn
0761b1b5eb am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit '89b196958fee07475765bd3c458098464ba16f2e':
  Put in real "code" (aka marketing) name.
2014-10-09 00:14:54 +00:00
Dianne Hackborn
955d8d69ea Put in real "code" (aka marketing) name.
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
2014-10-07 20:17:19 -07:00
Erik Pasternak
739bf81dd1 am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev
* commit '4d82c46ef5df06e1b92f3574e41b38a62ec0e607':
  Implement auto-sleep functionality.
2014-10-02 00:04:01 +00:00
Hui Shu
888fd710cd am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev
* commit '4e0ad44fcac48b2be77bd116ffdb696cb6490829':
  Revert "Remove WebView DRP Setting from Developer Settings"
2014-10-01 22:15:20 +00:00
Jeff Brown
05af6adb8d Implement auto-sleep functionality.
Added a new SLEEP_TIMEOUT setting which governs how long the device will
remain awake or dreaming without user activity.  By default this
value is set to -1 which maintains today's existing behavior.

We basically represent the time we are allowed to be dreaming as a new
kind of user activity summary state called DREAM, similar to BRIGHT
and DIM.  When the sleep timeout expires, the state is cleared and
the dream ends.

Bug: 17665809
Change-Id: I59aa7648dcec215f1285464fc1134934a09230e5
2014-10-01 15:01:10 -07:00
Hui Shu
2267177279 Revert "Remove WebView DRP Setting from Developer Settings"
This reverts commit eb487c6301.

Change-Id: Ie38a24efe2ea015b971cb0a05eca321299898538
2014-10-01 21:41:07 +00:00
Hui Shu
9cd616e067 am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit 'aee5c9e7c1f61126c61722a957daedf57cf26e7e':
  Remove WebView DRP Setting from Developer Settings
2014-10-01 18:35:49 +00:00
Hui Shu
eb487c6301 Remove WebView DRP Setting from Developer Settings
BUG: 17730990
Change-Id: Ic4fde9affb2f887329d6b3d2dbe8945959c016d8
2014-09-30 16:52:41 -07:00
Michael Wright
e27380ac46 am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
* commit '233bbabfe10bbf7190cdf3a6bb44f081a1fa91c7':
  Specify a device identifier for keyboard layout notification.
2014-09-25 22:27:05 +00:00
Michael Wright
c93fbd1fae Specify a device identifier for keyboard layout notification.
Bug: 17614683
Change-Id: If53489b09212bfa487d7dc3a7f9b000731d949ac
2014-09-23 14:59:23 -07:00
Tyler Gunn
6c8d6d74c0 resolved conflicts for merge of 66c16547 to lmp-sprout-dev
Also fixed issue in TelephonyManager.

Change-Id: I4dde45e638c2bcf32f8f929d34d0083966f6761f
2014-09-13 20:10:08 +00:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom.
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
2014-09-12 22:16:17 -07:00
Julia Reynolds
c889315c66 am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev
* commit '086bf8e1ef3beac49adea005a1e3275605cd4a41':
  Allow device owners to update LOCATION_MODE.
2014-09-11 16:02:45 +00:00
Julia Reynolds
d86734b469 Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 2014-09-11 15:46:07 +00:00
Adrian Roos
f1fe1a3ac4 am be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev
* commit 'be12538056cf441f441d42d2bf7d430ecdc3fd4f':
  Add system trust agents on first boot or when adding user
2014-09-10 11:32:07 +00:00
Adrian Roos
3870d451f7 Add system trust agents on first boot or when adding user
While we're in there also call listeners when they're added
so they know the state immediately.

Bug: 17258031
Change-Id: I5f1186314795f3fafd78e1b3e2d5102cdaec65d6
2014-09-10 00:02:38 +02:00
Yorke Lee
8dc2c62821 am af99dec4: Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev
* commit 'af99dec488b5eae712253d24ce9f1e85ccfefdeb':
  Replace Calls.FEATURES_NONE with 0 (1/4)
2014-09-08 21:50:35 +00:00
Yorke Lee
e3198b719f Replace Calls.FEATURES_NONE with 0 (1/4)
Bug: 17253963
Change-Id: I9e9e56cdf4c9a60ac1e047bef0eba2ba0c8f10fb
2014-09-08 13:33:51 -07:00
Yorke Lee
d500584234 am 52cd366d: Merge "ContactsContract API changes per API review" into lmp-dev
* commit '52cd366d9d094af6b8c3b4e91e54d00a88f50cb8':
  ContactsContract API changes per API review
2014-09-05 00:29:17 +00:00
Yorke Lee
78814623e0 ContactsContract API changes per API review
Bug: 17390425
Change-Id: Ia88fb0235a56becc3ec5a770067856311769a68c
2014-09-04 16:51:53 -07:00
Julia Reynolds
82735bcb14 Allow device owners to update LOCATION_MODE.
Bug: 17388933
Change-Id: If3267aa52c2611cf764a19bee019c312f6ebf5d1
2014-09-04 16:43:30 -04:00
Tyler Gunn
bd4ca2b4b4 am 78c0d4ab: Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev
* commit '78c0d4ab75c61efc48af1a698fd7d36620523866':
  Remove "ask each time" SIP call setting. (1/2)
2014-09-02 17:42:11 +00:00
Dianne Hackborn
8bce896373 am 4b9a934c: Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev
* commit '4b9a934cef4de4985c0e316ef89ca41b3e720135':
  Hide the interaction part of VoiceInteractionService.
2014-09-02 17:42:08 +00:00
Tyler Gunn
4b7498d81f Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev 2014-09-02 17:31:39 +00:00
Dianne Hackborn
76a65d5f00 Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev 2014-09-02 17:30:49 +00:00
Dianne Hackborn
d7c0395d26 Hide the interaction part of VoiceInteractionService.
Also the ability to start voice activities is turned off,
though for testing purposes it can be turned back on with a system
property.

Change-Id: I867704d32c53beeb851ceea9b45c28bf5c01ef61
2014-09-02 10:29:28 -07:00
Tyler Gunn
2c830a2905 Remove "ask each time" SIP call setting. (1/2)
1. Removed setting from Settings.System class.
2. Added settings database migration step to change "SIP_ASK_ME_EACH_TIME"
to "SIP_ADDRESS_ONLY" as the "ask me each time" option no longer makes
sense given the new phone accounts settings.

Bug: 17321422
Change-Id: I3df1be4fcda44f2097c49af44508ac1fce72a24b
2014-09-02 08:39:35 -07:00
Wink Saville
05e6dde3a0 ksd to lmp-sprout-dev
Change-Id: I94eb65c62231b5831570bb0cbbbd9c916bee0a37
2014-09-01 05:38:31 +00:00
Chris Wren
4775109ec1 Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev 2014-08-29 21:25:43 +00:00
Chris Wren
cd8f4f71fc Disable lockscreen notifications for secure users on upgrade.
Add a notification for those users that teaches them how to re-enable
the notifications.

Bug: 15934899
Depends-On: Ie0bcc207c4f331def207e588bbad36b8986fe114
Change-Id: I4a169e268042cfcaa4ad80cdf205904f9c90e76d
2014-08-29 20:49:36 +00:00
Julia Reynolds
a8528c6420 Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 2014-08-28 19:41:42 +00:00
Nancy Chen
d1a5a46368 Merge "Add field for sub_id in call log for sprout database." into lmp-dev 2014-08-28 17:55:50 +00:00
Jeff Sharkey
ca5186e9d5 Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev 2014-08-28 16:12:47 +00:00
Nancy Chen
3a78092127 Add field for sub_id in call log for sprout database.
Adding sub_id as a column in the calls table to make the sprout and
non-sprout contacts databases consistent.

Bug: 14990572
Change-Id: I82d9fe65e6cdf4e10b6115a8565c2be3a6f93562
2014-08-28 08:47:27 -07:00
Yorke Lee
52e7750184 Update value of EXTRA_CALL_TYPE_FILTER
Bug: 17253963
Change-Id: I1e98fc2a25b0bc807b0b4d1af2941da6660e09e0
2014-08-27 16:28:12 -07:00
Jeff Sharkey
5b836f29a3 Define EXTRA_SIZE for ContentProviders.
Also make Size and SizeF parcelable.

Bug: 17205016
Change-Id: Ide397b84864f6cad7f8d89e66b6c8697a3ad335b
2014-08-27 15:13:57 -07:00
Julia Reynolds
b53453fae0 Audio/Micrphone user restriction/multiuser updates.
1. Persist microphone mute state.
2. Set mute state for correct user.
3. Check for settings restrictions as the correct user.

Bug: 17177502
Bug: 16701642
Change-Id: Id8b6cd90c5caceb67fbec862f90aac7ec7a00b3c
2014-08-27 16:25:00 -04: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