OSDN Git Service
Daniel Nishi [Thu, 23 Jun 2016 01:41:04 +0000 (18:41 -0700)]
Re-add a string to fix a build breakage.
Change-Id: I079a5643634ffbf68f9414c639a9aba4a8a67d75
Andrew Sapperstein [Thu, 23 Jun 2016 00:29:25 +0000 (00:29 +0000)]
Merge "Flip default values of two gesture settings." into nyc-mr1-dev
TreeHugger Robot [Thu, 23 Jun 2016 00:04:41 +0000 (00:04 +0000)]
Merge "WifiCallingSettings: UI improvement" into nyc-mr1-dev
Daniel Nishi [Wed, 22 Jun 2016 23:52:22 +0000 (23:52 +0000)]
Merge "Remove the Deletion Helper and Automatic Storage Management jobs." into nyc-mr1-dev
Nathan Harold [Wed, 22 Jun 2016 23:20:08 +0000 (23:20 +0000)]
Merge "Add Debug Toggles for Video and WiFI Calling Provisioning" into nyc-mr1-dev
Doris Ling [Wed, 22 Jun 2016 20:29:15 +0000 (20:29 +0000)]
Merge "Make MasterClear a valid entry fragment." into nyc-mr1-dev
Jason Monk [Wed, 22 Jun 2016 19:50:01 +0000 (19:50 +0000)]
Merge \"Workaround to avoid crash in user photo selection\" into nyc-dev
am:
8f75abf92f
Change-Id: Id340d94a65ed656ad003ea310d2c5c476a840999
Meng Wang [Wed, 22 Jun 2016 17:26:40 +0000 (10:26 -0700)]
WifiCallingSettings: UI improvement
Hide 'Update Emergency Address' on resume w/o carrier support
Bug:
29256401
Change-Id: I69f1d533c49614401767832bd502a732699aef22
Jason Monk [Wed, 22 Jun 2016 19:45:07 +0000 (19:45 +0000)]
Merge "Workaround to avoid crash in user photo selection" into nyc-dev
Jason Monk [Wed, 22 Jun 2016 19:09:28 +0000 (19:09 +0000)]
Merge \"Protect against crash in font size\" into nyc-dev
am:
4b336099f1
Change-Id: Ia77306b83425ab46a33c6d8aa386adb5c52f3da5
Jason Monk [Wed, 22 Jun 2016 19:04:16 +0000 (19:04 +0000)]
Merge "Protect against crash in font size" into nyc-dev
Doris Ling [Wed, 22 Jun 2016 01:08:22 +0000 (18:08 -0700)]
Make MasterClear a valid entry fragment.
Add FactoryResetActivity that maps to MasterClear fragment, and add
MasterClear to SettingsActivity's ENTRY_FRAGMENTS so that the
factory data reset fragment can be launched from activity alias.
Bug:
29405129
Change-Id: I8eca6b857987792da8d8678d33e6ab9d4e10793a
Jason Monk [Wed, 22 Jun 2016 18:46:56 +0000 (14:46 -0400)]
Workaround to avoid crash in user photo selection
Bug:
29556966
Change-Id: I0715dee2a4cef2252b4ed1cc4d242b8b3d0ab45c
Doris Ling [Wed, 22 Jun 2016 17:27:24 +0000 (17:27 +0000)]
Merge "Remove summary text for Backup & reset." into nyc-mr1-dev
Jason Monk [Wed, 22 Jun 2016 17:10:25 +0000 (13:10 -0400)]
Protect against crash in font size
Change-Id: Ib3578e0e82388a4f6aa3eeade0d990fc107b9c14
Fixes:
29438848
Jason Monk [Wed, 22 Jun 2016 15:26:29 +0000 (15:26 +0000)]
Merge \"Fix tethering re-enable after edit.\" into nyc-dev
am:
dbb5a0b918
Change-Id: Ib8547ccf2a169c16b6bb0785e7094edbee123af0
Jason Monk [Wed, 22 Jun 2016 15:22:10 +0000 (15:22 +0000)]
Merge "Fix tethering re-enable after edit." into nyc-dev
Jason Monk [Wed, 22 Jun 2016 13:32:21 +0000 (13:32 +0000)]
Merge \"Update battery content descriptions with labels\" into nyc-dev
am:
2a6b3d4db1
Change-Id: Id0d36f67615bd319351ba2bdc3c2993a3162e665
Jason Monk [Wed, 22 Jun 2016 13:22:45 +0000 (13:22 +0000)]
Merge "Update battery content descriptions with labels" into nyc-dev
Andrew Sapperstein [Wed, 22 Jun 2016 00:48:22 +0000 (17:48 -0700)]
Flip default values of two gesture settings.
The settings are enabled by default but the UI wasn't reflecting
that.
Change-Id: Ia321d12bcced4a7e2aa8c4a9fc0a0b7b3f5dad4a
FIXES:
29550614
Andrew Sapperstein [Tue, 21 Jun 2016 23:02:12 +0000 (23:02 +0000)]
Merge "Update Settings to use DeviceDefault.Settings." into nyc-mr1-dev
Doris Ling [Tue, 21 Jun 2016 20:23:26 +0000 (13:23 -0700)]
Remove summary text for Backup & reset.
Remove the SummaryProvider from PrivacySettings so that it will not show
the summary for the Backup & reset settings.
Bug:
29519430
Change-Id: Idf41c2f794391f81bf864ade0db9087c2e3e1c0e
Doris Ling [Tue, 21 Jun 2016 18:55:54 +0000 (18:55 +0000)]
Merge "Add play icon to the gesture settings videos." into nyc-mr1-dev
Andrew Sapperstein [Sat, 11 Jun 2016 19:12:44 +0000 (12:12 -0700)]
Update Settings to use DeviceDefault.Settings.
BUG:
28625050
Change-Id: Id283703a309cf27bb284147421614196e903c660
Dan Sandler [Tue, 21 Jun 2016 18:17:08 +0000 (18:17 +0000)]
Merge \"Show \"0\" instead of \"0 B\" in storage settings.\" into nyc-dev
am:
87fcf9e95f
Change-Id: I40778ba470d12dd6f5b924ddcf650f27459faab6
Daniel Sandler [Tue, 21 Jun 2016 18:11:11 +0000 (18:11 +0000)]
Merge "Show "0" instead of "0 B" in storage settings." into nyc-dev
Jason Monk [Tue, 21 Jun 2016 18:04:39 +0000 (14:04 -0400)]
Fix tethering re-enable after edit.
Sometimes the tether state change comes in late (or seemingly not
at all). Also listen for wifi ap state changes as a fallback for
this case.
Change-Id: I6677c4277453be881967a3cf2234de11cd0237b8
Fixes:
28851179
TreeHugger Robot [Tue, 21 Jun 2016 17:58:25 +0000 (17:58 +0000)]
Merge "Hide WFC settings if WFC is not provisioned (and provisioning is required)" into nyc-mr1-dev
Jason Monk [Tue, 21 Jun 2016 17:36:57 +0000 (13:36 -0400)]
Update battery content descriptions with labels
Change-Id: I0ad4ca753f8f5e1a01e2e21181526ddb921d487a
Fixes:
28301362
Fan Zhang [Tue, 21 Jun 2016 17:21:07 +0000 (17:21 +0000)]
Merge "Enable/disable support buttons based on operation hours." into nyc-mr1-dev
Daniel Nishi [Thu, 9 Jun 2016 17:52:35 +0000 (10:52 -0700)]
Remove the Deletion Helper and Automatic Storage Management jobs.
The automatic storage management settings have been left in place
and updated to use the intent to get into the deletion helper.
Bug:
28965462
Change-Id: I736c8e741b519eceb89075b74d42b38c3aa5d0f4
Bill Yi [Tue, 21 Jun 2016 16:56:44 +0000 (16:56 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
f315e2e6f0 -s ours
Change-Id: I8216d1ead0653fff4d1a335f11ff92879d587fcc
TreeHugger Robot [Tue, 21 Jun 2016 16:53:39 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 21 Jun 2016 16:53:25 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Sunny Goyal [Tue, 21 Jun 2016 16:39:33 +0000 (16:39 +0000)]
Merge "Adding custom manifest shortcuts in Settings app" into nyc-mr1-dev
Zoltan Szatmary-Ban [Tue, 21 Jun 2016 15:57:08 +0000 (15:57 +0000)]
Fix non-app non-user preferences in Settings > Data usage
am:
afea1cae25
Change-Id: I55e991f5cd9c39a740dd62945fe113ee59ea18a9
Fan Zhang [Tue, 21 Jun 2016 15:28:29 +0000 (15:28 +0000)]
Merge "Log button taps in support tab." into nyc-mr1-dev
Zoltan Szatmary-Ban [Tue, 21 Jun 2016 11:57:30 +0000 (12:57 +0100)]
Fix non-app non-user preferences in Settings > Data usage
Bug:
29466113
Change-Id: Ib7a6d477146a856c0cb9c49143ffbf4fb99e38ed
Bill Yi [Tue, 21 Jun 2016 11:40:02 +0000 (04:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia258f44583c5690bd396d20517e1309807c659ad
Auto-generated-cl: translation import
Bill Yi [Tue, 21 Jun 2016 11:28:46 +0000 (04:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebfc06a928c222879aceec01c3aaf35f2cf78561
Auto-generated-cl: translation import
Dan Sandler [Tue, 21 Jun 2016 03:53:34 +0000 (23:53 -0400)]
Show "0" instead of "0 B" in storage settings.
Two benefits:
- "0 B" might be a little confusing for sighted users
- "zero bee" is definitely confusing for TalkBack users
Nonzero storage items will still read as "640 KB" which
should be enough for anyone.
Change-Id: I5c89f7c6382ca14fb91d7d1dd145977f855618ae
Fixes:
27973778
Pavel Zhamaitsiak [Tue, 21 Jun 2016 00:52:48 +0000 (17:52 -0700)]
Hide WFC settings if WFC is not provisioned (and provisioning is required)
Bug:
29223318
Change-Id: Ic927e742d84f55ea411a0d034fc1caac72ee58e7
Sunny Goyal [Wed, 15 Jun 2016 19:36:50 +0000 (12:36 -0700)]
Adding custom manifest shortcuts in Settings app
Bug:
28298258
Change-Id: Ie7fd86a999fa2abe2522adfb29573b86f36db3a5
Julia Reynolds [Mon, 20 Jun 2016 19:08:43 +0000 (19:08 +0000)]
Merge \"Fix NPE printing notification actions.\" into nyc-dev
am:
43b04bcc7d
Change-Id: I427adea08ff2a9f50c0d54329ae1b5adcca508c8
Julia Reynolds [Mon, 20 Jun 2016 18:43:04 +0000 (18:43 +0000)]
Merge "Fix NPE printing notification actions." into nyc-dev
Fan Zhang [Thu, 16 Jun 2016 20:40:20 +0000 (13:40 -0700)]
Enable/disable support buttons based on operation hours.
Also update support title based on whether support operation is
available.
Bug:
28827790
Change-Id: I65eb70d18ba16ccc263bce019fcbbe5e10ffa596
Jason Monk [Mon, 20 Jun 2016 17:29:24 +0000 (17:29 +0000)]
Fix focusability of battery history chart
am:
9c6ab88bd7
Change-Id: I8239280074c191c98414e57c0c915463ade9ec9c
Fan Zhang [Fri, 17 Jun 2016 00:28:27 +0000 (17:28 -0700)]
Log button taps in support tab.
Bug:
29282762
Change-Id: I7d573f95450292840413cb5e266915f64f6d667d
Fan Zhang [Mon, 20 Jun 2016 16:35:51 +0000 (16:35 +0000)]
Merge "Add a "Do not show" checkbox in support disclaimer dialog." into nyc-mr1-dev
Jason Monk [Mon, 20 Jun 2016 15:04:43 +0000 (11:04 -0400)]
Fix focusability of battery history chart
Change-Id: I0bd0da84a08ed6e3c51da3dc6a68e878c5c0d3cd
Fixes:
29453492
Julia Reynolds [Mon, 20 Jun 2016 14:23:44 +0000 (10:23 -0400)]
Fix NPE printing notification actions.
Change-Id: Icb52e7bc632bf7109a75a7695fb253b2183e7360
Fixes:
29017025
TreeHugger Robot [Sat, 18 Jun 2016 04:02:49 +0000 (04:02 +0000)]
Merge "Hide 'Update Emergecy Address' preference w/o carrier support" into nyc-mr1-dev
Nathan Harold [Fri, 17 Jun 2016 20:55:38 +0000 (13:55 -0700)]
Add Debug Toggles for Video and WiFI Calling Provisioning
-Add a debug toggle for Video Calling Provisioning
-Add a debug toggle for WiFi Calling Provisioning
Change-Id: I0cf3861ceabda48295181347b8997a2c8212de27
Doris Ling [Fri, 17 Jun 2016 18:22:59 +0000 (11:22 -0700)]
Add play icon to the gesture settings videos.
1. Add a play button icon to show on top of the gesture videos when the
video is not playing.
2. Dynamically split the gesture video and description text in half
instead of using the hard coded value.
3. Hide the video view if animation is not available.
4. Delay removing the animation preview till the video starts drawing on
the surface texture.
Bug:
28565958
Change-Id: I8b954828d16286014404172d29efa4d2e00432b3
Fan Zhang [Fri, 17 Jun 2016 20:15:46 +0000 (20:15 +0000)]
Merge "Use metrics defined by proto in new Settings tabs." into nyc-mr1-dev
Fan Zhang [Fri, 17 Jun 2016 18:20:52 +0000 (11:20 -0700)]
Add a "Do not show" checkbox in support disclaimer dialog.
Bug:
28762823
Change-Id: I8fe0a82efbb47c8b2f9e34480005fa108583b203
Doris Ling [Fri, 17 Jun 2016 18:15:57 +0000 (18:15 +0000)]
Merge "Add handling for fingerprint swipe in gesture settings." into nyc-mr1-dev
Jason Monk [Fri, 17 Jun 2016 17:52:01 +0000 (17:52 +0000)]
Merge \"Protect against crash in memory details\" into nyc-dev
am:
c3ec1ab889
Change-Id: If36b3350e0694ffae3086be9307295c4516828dd
Jason Monk [Fri, 17 Jun 2016 17:52:01 +0000 (17:52 +0000)]
Make sure screen pinning desc is part of view hierarchy
am:
0c2ccba2f9
Change-Id: Iac6d8d4df22fb8e32e61ad25aed06e079d1fa348
Jason Monk [Fri, 17 Jun 2016 17:22:03 +0000 (17:22 +0000)]
Merge "Protect against crash in memory details" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 14:12:37 +0000 (10:12 -0400)]
Protect against crash in memory details
Change-Id: Ie80efa04d0c6bc9c117802e5a7018d448f4dc7b8
Fixes:
29308942
Jason Monk [Fri, 17 Jun 2016 14:05:06 +0000 (10:05 -0400)]
Make sure screen pinning desc is part of view hierarchy
Change-Id: I2c2e25e129d8530512e1a1f4ee6a7483b5322286
Fixes:
29243233
Adrian Roos [Fri, 17 Jun 2016 01:54:50 +0000 (18:54 -0700)]
resolve merge conflicts of
333ba2d to nyc-mr1-dev
Change-Id: I32f284bb2216755ae0ddbea4b7fc76a38c7aa7e2
Ajay Kumar Nadathur Sreenivasan [Fri, 17 Jun 2016 01:18:00 +0000 (01:18 +0000)]
Merge "[SetupWizard] Fix talkback on lock screen." into nyc-mr1-dev
Meng Wang [Thu, 16 Jun 2016 01:17:06 +0000 (18:17 -0700)]
Hide 'Update Emergecy Address' preference w/o carrier support
Bug:
29256401
Change-Id: I59f9d6192d39e2a259e3f2cbee641335d5b8b8d7
Adrian Roos [Thu, 16 Jun 2016 23:33:55 +0000 (23:33 +0000)]
Merge "Remove RemoteInput on lockscreen setting" into nyc-dev
Fan Zhang [Fri, 6 May 2016 17:52:26 +0000 (10:52 -0700)]
Use metrics defined by proto in new Settings tabs.
Bug:
28141203
Change-Id: Ia0c566f873f93e46203d19f35161bb98acc60a38
Maurice Lam [Thu, 16 Jun 2016 23:15:44 +0000 (16:15 -0700)]
Center pattern lock screen vertically
Pull the header into the content area, so that the pattern view on
the right side can be centered overall, rather than centered starting
below the title.
Bug:
24405946
Change-Id: I6c9cfe8175014e40c9e1fc78d4c15e027860d8fe
Maurice Lam [Thu, 16 Jun 2016 22:00:20 +0000 (22:00 +0000)]
Merge "Use GLIF theme for Settings > Security > Screen lock" into nyc-mr1-dev
Ajay Nadathur [Thu, 16 Jun 2016 21:07:27 +0000 (14:07 -0700)]
[SetupWizard] Fix talkback on lock screen.
- On volantis, talkback will now speak 'Protect your tablet' instead of
'Choose screen lock'
Testing:
-------
- Tested and verified on volantis
Change-Id: If010ab8f3fcd107b99294081765a52e98ed8cc1f
Yohei Yukawa [Thu, 16 Jun 2016 21:40:53 +0000 (21:40 +0000)]
Merge \"Teach hard keyboard settings about correct user ID\" into nyc-dev
am:
db6f1f2cb5
Change-Id: Ie47fd6128435c75cc08d3d478a23c442f44a514c
Yohei Yukawa [Thu, 16 Jun 2016 21:24:04 +0000 (21:24 +0000)]
Merge "Teach hard keyboard settings about correct user ID" into nyc-dev
Adrian Roos [Thu, 16 Jun 2016 20:28:44 +0000 (13:28 -0700)]
Remove RemoteInput on lockscreen setting
Bug:
29370898
Change-Id: I6fef3deb55357e8569e023968967663582974f79
Doris Ling [Thu, 16 Jun 2016 19:30:53 +0000 (12:30 -0700)]
Add handling for fingerprint swipe in gesture settings.
Hide fingerprint swipe setting if it is not supported, and update the
corresponding config when user enable/disable the fingerprint gesture.
Bug:
28565958
Change-Id: I5a124d3b6933ea6d3aadceaa0eecaa4bee2ccd9d
Maurice Lam [Wed, 15 Jun 2016 20:39:34 +0000 (13:39 -0700)]
Use GLIF theme for Settings > Security > Screen lock
Bug:
24405946
Change-Id: I1fed96cbc228b6bb367637f83f9cd3bac2761417
Doris Ling [Thu, 16 Jun 2016 18:52:30 +0000 (18:52 +0000)]
Merge "Update gesture related settings in Display." into nyc-mr1-dev
Doris Ling [Tue, 14 Jun 2016 18:21:57 +0000 (11:21 -0700)]
Update gesture related settings in Display.
1. Remove "Press power button twice for camera. Toggle is now available
in Settings->Gestures.
2. Remove toggle from "Ambient Display" and make it point to
Settings->Gestures->Quick screen check.
Bug:
28565958
Change-Id: I32fd2253a40be76ac9843a627df153eb4f1307d8
TreeHugger Robot [Thu, 16 Jun 2016 10:35:08 +0000 (10:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 16 Jun 2016 10:28:56 +0000 (10:28 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
32b427b137 -s ours
Change-Id: I829656295916ec3bbd89ff9ca71dad569beca264
TreeHugger Robot [Thu, 16 Jun 2016 10:25:12 +0000 (10:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Thu, 16 Jun 2016 09:03:59 +0000 (02:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib6520ea1418dac76ad17a77c0ddd393cc7a41938
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Jun 2016 08:52:41 +0000 (01:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9909b1c75f95258630ca3b014768b5a7afcd8411
Auto-generated-cl: translation import
Yohei Yukawa [Thu, 16 Jun 2016 07:02:01 +0000 (00:02 -0700)]
Teach hard keyboard settings about correct user ID
Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD is a per-user settings.
PhysicalKeyboardFragment needs to use the current user's ID rather than
hard-coded user ID 0.
Bug:
29406181
Change-Id: Ie40f729f3c85e9ce9ad8f957caba338786b119d9
Roozbeh Pournader [Thu, 16 Jun 2016 01:59:37 +0000 (01:59 +0000)]
BidiFormat adapter name for bluetooth_is_visible_message
am:
77893a4c4b
Change-Id: I2df1050e9b9cb20e369fca56e3e457a3cf2a0397
Daniel Nishi [Wed, 15 Jun 2016 22:14:08 +0000 (22:14 +0000)]
Merge "Show storage manager settings using a system property." into nyc-mr1-dev
Roozbeh Pournader [Wed, 15 Jun 2016 21:37:30 +0000 (14:37 -0700)]
BidiFormat adapter name for bluetooth_is_visible_message
Previously, adapter names which tend to be LTR and may appear at the
beginning of the string could cause the detected bidi direction of the whole
string (which would be RTL in RTL locales) to get miscalculated as LTR.
With this fix, not only the detected bidi direction would be correct,
but also odd adapter names would not impact the bidi layout of the
whole string.
Bug:
28816891
Change-Id: I1d25edbeeff7e9c013bb6c741e7f706431e721dc
Chris Wren [Wed, 15 Jun 2016 18:17:52 +0000 (18:17 +0000)]
Merge \"log as counters instead of histograms\" into nyc-dev
am:
6913b6118f
Change-Id: Ic3178f2514097df73527f446a5daf11fc6c25acc
TreeHugger Robot [Wed, 15 Jun 2016 18:13:52 +0000 (18:13 +0000)]
Merge "log as counters instead of histograms" into nyc-dev
Daniel Nishi [Tue, 14 Jun 2016 00:37:06 +0000 (17:37 -0700)]
Show storage manager settings using a system property.
This removes a Settings-only configuration on whether or not the
storage manager is enabled and replaced it with a system property.
Bug:
29336081
Change-Id: I2328c213f5f11f89bf0fe61e77d3062459036fc3
Maurice Lam [Wed, 15 Jun 2016 17:07:54 +0000 (17:07 +0000)]
Merge "Update UI style for GLIF buttons" into nyc-mr1-dev
Maurice Lam [Wed, 15 Jun 2016 17:07:27 +0000 (17:07 +0000)]
Merge "Fingerprint string updates" into nyc-mr1-dev
Jason Monk [Wed, 15 Jun 2016 16:59:09 +0000 (16:59 +0000)]
Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
am:
b53117f55c
Change-Id: I49ceb02471844e719da35f1939c329f317b6953b
TreeHugger Robot [Wed, 15 Jun 2016 16:48:45 +0000 (16:48 +0000)]
Merge "Fix SimStatus updatePhoneInfos" into nyc-dev
Ricky Wai [Wed, 15 Jun 2016 16:38:28 +0000 (16:38 +0000)]
Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev
am:
42cbbc3052
Change-Id: Ia46cdcee9c65d7394896e34e216f19dc1e7a5d31
Jason Monk [Wed, 15 Jun 2016 16:37:16 +0000 (16:37 +0000)]
Merge "resolve merge conflicts of
f4ad443 to nyc-mr1-dev" into nyc-mr1-dev
Chris Wren [Wed, 15 Jun 2016 15:44:16 +0000 (11:44 -0400)]
log as counters instead of histograms
this will interoperate better with UMA
Bug:
26687914
Change-Id: Ie63b2be2d457054c96b070ada3bb92141ab1fb5a
Fan Zhang [Wed, 15 Jun 2016 16:15:53 +0000 (16:15 +0000)]
Merge "Remove forum link from support tab." into nyc-mr1-dev
Ricky Wai [Wed, 15 Jun 2016 16:02:18 +0000 (16:02 +0000)]
Merge "Remove work fingerprints when primary profile lock is removed" into nyc-dev
Jason Monk [Wed, 15 Jun 2016 15:31:14 +0000 (11:31 -0400)]
resolve merge conflicts of
f4ad443 to nyc-mr1-dev
Change-Id: I1d8a3f1cb62ee7d5f39e120c613ae45d495f0fb7
Jason Monk [Wed, 15 Jun 2016 14:23:18 +0000 (10:23 -0400)]
Fix SimStatus updatePhoneInfos
Looks like we got updatePhoneInfos in the right place for IccLockSettings
but not SimStatus.
Also return the right view in onCreateView
Change-Id: Ifd4cbd93351bb05571ed5a9873e9352c7c3a2357
Fixes:
29335528