OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoMerge \"Workaround to avoid crash in user photo selection\" into nyc-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

8 years agoMerge "Workaround to avoid crash in user photo selection" into nyc-dev
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

8 years agoMerge \"Protect against crash in font size\" 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

8 years agoMerge "Protect against crash in font size" into nyc-dev
Jason Monk [Wed, 22 Jun 2016 19:04:16 +0000 (19:04 +0000)]
Merge "Protect against crash in font size" into nyc-dev

8 years agoWorkaround to avoid crash in user photo selection
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

8 years agoMerge "Remove summary text for Backup & reset." into nyc-mr1-dev
Doris Ling [Wed, 22 Jun 2016 17:27:24 +0000 (17:27 +0000)]
Merge "Remove summary text for Backup & reset." into nyc-mr1-dev

8 years agoProtect against crash in font size
Jason Monk [Wed, 22 Jun 2016 17:10:25 +0000 (13:10 -0400)]
Protect against crash in font size

Change-Id: Ib3578e0e82388a4f6aa3eeade0d990fc107b9c14
Fixes: 29438848

8 years agoMerge \"Fix tethering re-enable after edit.\" into nyc-dev
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

8 years agoMerge "Fix tethering re-enable after edit." into nyc-dev
Jason Monk [Wed, 22 Jun 2016 15:22:10 +0000 (15:22 +0000)]
Merge "Fix tethering re-enable after edit." into nyc-dev

8 years agoMerge \"Update battery content descriptions with labels\" 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

8 years agoMerge "Update battery content descriptions with labels" into nyc-dev
Jason Monk [Wed, 22 Jun 2016 13:22:45 +0000 (13:22 +0000)]
Merge "Update battery content descriptions with labels" into nyc-dev

8 years agoMerge "Update Settings to use DeviceDefault.Settings." into nyc-mr1-dev
Andrew Sapperstein [Tue, 21 Jun 2016 23:02:12 +0000 (23:02 +0000)]
Merge "Update Settings to use DeviceDefault.Settings." into nyc-mr1-dev

8 years agoRemove summary text for Backup & reset.
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

8 years agoMerge "Add play icon to the gesture settings videos." into nyc-mr1-dev
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

8 years agoUpdate Settings to use DeviceDefault.Settings.
Andrew Sapperstein [Sat, 11 Jun 2016 19:12:44 +0000 (12:12 -0700)]
Update Settings to use DeviceDefault.Settings.

BUG: 28625050

Change-Id: Id283703a309cf27bb284147421614196e903c660

8 years agoMerge \"Show \"0\" instead of \"0 B\" in storage settings.\" into nyc-dev
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

8 years agoMerge "Show "0" instead of "0 B" in storage settings." into nyc-dev
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

8 years agoFix tethering re-enable after edit.
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

8 years agoMerge "Hide WFC settings if WFC is not provisioned (and provisioning is required...
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

8 years agoUpdate battery content descriptions with labels
Jason Monk [Tue, 21 Jun 2016 17:36:57 +0000 (13:36 -0400)]
Update battery content descriptions with labels

Change-Id: I0ad4ca753f8f5e1a01e2e21181526ddb921d487a
Fixes: 28301362

8 years agoMerge "Enable/disable support buttons based on operation hours." into nyc-mr1-dev
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

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
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

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 21 Jun 2016 16:53:39 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 16:53:25 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Adding custom manifest shortcuts in Settings app" into nyc-mr1-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

8 years agoFix non-app non-user preferences in Settings > Data usage
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

8 years agoMerge "Log button taps in support tab." into nyc-mr1-dev
Fan Zhang [Tue, 21 Jun 2016 15:28:29 +0000 (15:28 +0000)]
Merge "Log button taps in support tab." into nyc-mr1-dev

8 years agoFix non-app non-user preferences in Settings > Data usage
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoShow "0" instead of "0 B" in storage settings.
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

8 years agoHide WFC settings if WFC is not provisioned (and provisioning is required)
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

8 years agoAdding custom manifest shortcuts in Settings app
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

8 years agoMerge \"Fix NPE printing notification actions.\" into nyc-dev
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

8 years agoMerge "Fix NPE printing notification actions." into nyc-dev
Julia Reynolds [Mon, 20 Jun 2016 18:43:04 +0000 (18:43 +0000)]
Merge "Fix NPE printing notification actions." into nyc-dev

8 years agoEnable/disable support buttons based on operation hours.
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

8 years agoFix focusability of battery history chart
Jason Monk [Mon, 20 Jun 2016 17:29:24 +0000 (17:29 +0000)]
Fix focusability of battery history chart
am: 9c6ab88bd7

Change-Id: I8239280074c191c98414e57c0c915463ade9ec9c

8 years agoLog button taps in support tab.
Fan Zhang [Fri, 17 Jun 2016 00:28:27 +0000 (17:28 -0700)]
Log button taps in support tab.

Bug: 29282762
Change-Id: I7d573f95450292840413cb5e266915f64f6d667d

8 years agoMerge "Add a "Do not show" checkbox in support disclaimer dialog." into nyc-mr1-dev
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

8 years agoFix focusability of battery history chart
Jason Monk [Mon, 20 Jun 2016 15:04:43 +0000 (11:04 -0400)]
Fix focusability of battery history chart

Change-Id: I0bd0da84a08ed6e3c51da3dc6a68e878c5c0d3cd
Fixes: 29453492

8 years agoFix NPE printing notification actions.
Julia Reynolds [Mon, 20 Jun 2016 14:23:44 +0000 (10:23 -0400)]
Fix NPE printing notification actions.

Change-Id: Icb52e7bc632bf7109a75a7695fb253b2183e7360
Fixes: 29017025

8 years agoMerge "Hide 'Update Emergecy Address' preference w/o carrier support" into nyc-mr1-dev
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

8 years agoAdd play icon to the gesture settings videos.
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

8 years agoMerge "Use metrics defined by proto in new Settings tabs." into nyc-mr1-dev
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

8 years agoAdd a "Do not show" checkbox in support disclaimer dialog.
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

8 years agoMerge "Add handling for fingerprint swipe in gesture settings." into nyc-mr1-dev
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

8 years agoMerge \"Protect against crash in memory details\" into nyc-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

8 years agoMake sure screen pinning desc is part of view hierarchy
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

8 years agoMerge "Protect against crash in memory details" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 17:22:03 +0000 (17:22 +0000)]
Merge "Protect against crash in memory details" into nyc-dev

8 years agoProtect against crash in memory details
Jason Monk [Fri, 17 Jun 2016 14:12:37 +0000 (10:12 -0400)]
Protect against crash in memory details

Change-Id: Ie80efa04d0c6bc9c117802e5a7018d448f4dc7b8
Fixes: 29308942

8 years agoMake sure screen pinning desc is part of view hierarchy
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

8 years agoresolve merge conflicts of 333ba2d to nyc-mr1-dev
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

8 years agoMerge "[SetupWizard] Fix talkback on lock screen." into nyc-mr1-dev
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

8 years agoHide 'Update Emergecy Address' preference w/o carrier support
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

8 years agoMerge "Remove RemoteInput on lockscreen setting" into nyc-dev
Adrian Roos [Thu, 16 Jun 2016 23:33:55 +0000 (23:33 +0000)]
Merge "Remove RemoteInput on lockscreen setting" into nyc-dev

8 years agoUse metrics defined by proto in new Settings tabs.
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

8 years agoCenter pattern lock screen vertically
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

8 years agoMerge "Use GLIF theme for Settings > Security > Screen lock" into nyc-mr1-dev
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

8 years ago[SetupWizard] Fix talkback on lock screen.
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

8 years agoMerge \"Teach hard keyboard settings about correct user ID\" into nyc-dev
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

8 years agoMerge "Teach hard keyboard settings about correct user ID" into nyc-dev
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

8 years agoRemove RemoteInput on lockscreen setting
Adrian Roos [Thu, 16 Jun 2016 20:28:44 +0000 (13:28 -0700)]
Remove RemoteInput on lockscreen setting

Bug: 29370898
Change-Id: I6fef3deb55357e8569e023968967663582974f79

8 years agoAdd handling for fingerprint swipe in gesture settings.
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

8 years agoUse GLIF theme for Settings > Security > Screen lock
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

8 years agoMerge "Update gesture related settings in Display." into nyc-mr1-dev
Doris Ling [Thu, 16 Jun 2016 18:52:30 +0000 (18:52 +0000)]
Merge "Update gesture related settings in Display." into nyc-mr1-dev

8 years agoUpdate gesture related settings in Display.
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

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 16 Jun 2016 10:35:08 +0000 (10:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-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

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 16 Jun 2016 10:25:12 +0000 (10:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoTeach hard keyboard settings about correct user ID
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

8 years agoBidiFormat adapter name for bluetooth_is_visible_message
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

8 years agoMerge "Show storage manager settings using a system property." into nyc-mr1-dev
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

8 years agoBidiFormat adapter name for bluetooth_is_visible_message
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

8 years agoMerge \"log as counters instead of histograms\" into nyc-dev
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

8 years agoMerge "log as counters instead of histograms" into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 18:13:52 +0000 (18:13 +0000)]
Merge "log as counters instead of histograms" into nyc-dev

8 years agoShow storage manager settings using a system property.
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

8 years agoMerge "Update UI style for GLIF buttons" into nyc-mr1-dev
Maurice Lam [Wed, 15 Jun 2016 17:07:54 +0000 (17:07 +0000)]
Merge "Update UI style for GLIF buttons" into nyc-mr1-dev

8 years agoMerge "Fingerprint string updates" 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

8 years agoMerge \"Fix SimStatus updatePhoneInfos\" into nyc-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

8 years agoMerge "Fix SimStatus updatePhoneInfos" into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 16:48:45 +0000 (16:48 +0000)]
Merge "Fix SimStatus updatePhoneInfos" into nyc-dev

8 years agoMerge \"Remove work fingerprints when primary profile lock is removed\" 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

8 years agoMerge "resolve merge conflicts of f4ad443 to nyc-mr1-dev" into nyc-mr1-dev
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

8 years agolog as counters instead of histograms
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

8 years agoMerge "Remove forum link from support tab." into nyc-mr1-dev
Fan Zhang [Wed, 15 Jun 2016 16:15:53 +0000 (16:15 +0000)]
Merge "Remove forum link from support tab." into nyc-mr1-dev

8 years agoMerge "Remove work fingerprints when primary profile lock is removed" into nyc-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

8 years agoresolve merge conflicts of f4ad443 to nyc-mr1-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

8 years agoFix SimStatus updatePhoneInfos
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

8 years agoMerge "Make linkify handle emptys urls better DO NOT MERGE" into nyc-dev
Jason Monk [Wed, 15 Jun 2016 14:53:43 +0000 (14:53 +0000)]
Merge "Make linkify handle emptys urls better DO NOT MERGE" into nyc-dev

8 years agoFingerprint string updates
Maurice Lam [Wed, 15 Jun 2016 02:14:37 +0000 (19:14 -0700)]
Fingerprint string updates

Bug: 29119674
Change-Id: I22489507b3c215bac6cf1b3d4e201448be1dc999

8 years agoUpdate UI style for GLIF buttons
Maurice Lam [Wed, 15 Jun 2016 01:35:37 +0000 (18:35 -0700)]
Update UI style for GLIF buttons

Bug: 29105355
Change-Id: I9dfb8b6fb40242298bf1d7caa18cd7fbd2f62725

8 years agoMerge \"Prevent users from blocking system notifications.\" into nyc-dev
Julia Reynolds [Tue, 14 Jun 2016 22:30:19 +0000 (22:30 +0000)]
Merge \"Prevent users from blocking system notifications.\" into nyc-dev
am: b2301cb4c2

Change-Id: I9d5f2f4957bdc86ab25e0436100f5b126cb97bb7

8 years agoMerge "Prevent users from blocking system notifications." into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 22:25:25 +0000 (22:25 +0000)]
Merge "Prevent users from blocking system notifications." into nyc-dev

8 years agoRemove forum link from support tab.
Fan Zhang [Tue, 14 Jun 2016 20:01:45 +0000 (13:01 -0700)]
Remove forum link from support tab.

Bug: 29356288
Change-Id: I95c737d8249eb5689f09e037016832e25bbf9244

8 years agoAlign text for conditions with text for other tiles.
Fan Zhang [Tue, 14 Jun 2016 19:44:48 +0000 (12:44 -0700)]
Align text for conditions with text for other tiles.

Bug: 29107343

Text should be 72dp from left of screen, not 76dp.

Change-Id: I86cb015ed2e574c3f16fb642d7c3653a6f2a017f

8 years agoMerge "Support tab UI polish." into nyc-mr1-dev
Fan Zhang [Tue, 14 Jun 2016 19:26:28 +0000 (19:26 +0000)]
Merge "Support tab UI polish." into nyc-mr1-dev

8 years agoFix bug in Sim Status Settings.
Sanket Padawe [Tue, 14 Jun 2016 18:04:52 +0000 (18:04 +0000)]
Fix bug in Sim Status Settings.
am: fb87919fde

Change-Id: I4bc932a15028e6e24bc62e21f7f5149ce7355899

8 years agoSupport tab UI polish.
Fan Zhang [Mon, 13 Jun 2016 20:50:13 +0000 (13:50 -0700)]
Support tab UI polish.

Bug: 29107343
Bug: 29101595

1) Changing the font weight of the tabs to Medium
2) Changing the tab indicator color
3) Increasing the padding on the top and bottom of the entire suggestion
space (from 6dp to 8dp)
4) Balancing the space of list components within their perspective list
heights
5) Adjusting the padding on the right side to improve alignment
6) Changing "Suggestions" and suggestions counter font weight and size
7) Removing the drop shadow on the bottom of the suggestion space
8) "More help" subheader has been removed
9) Use 54% #000000 as tint color for more help icons.

Change-Id: If3e1c5ce2701422fba6185e7fa340abccc9bd30c

8 years agoFix bug in Sim Status Settings.
Sanket Padawe [Tue, 14 Jun 2016 17:12:39 +0000 (10:12 -0700)]
Fix bug in Sim Status Settings.

Bug: 29332493
Change-Id: Idd519e704ce6fdd0b92319948bdf02c0fa45ff34