Jason Monk
c3ec1ab889
Merge "Protect against crash in memory details" into nyc-dev
2016-06-17 17:22:03 +00:00
Jason Monk
7a19965c9f
Protect against crash in memory details
...
Change-Id: Ie80efa04d0c6bc9c117802e5a7018d448f4dc7b8
Fixes: 29308942
2016-06-17 10:12:37 -04:00
Jason Monk
0c2ccba2f9
Make sure screen pinning desc is part of view hierarchy
...
Change-Id: I2c2e25e129d8530512e1a1f4ee6a7483b5322286
Fixes: 29243233
2016-06-17 10:05:06 -04:00
Adrian Roos
fa2bbcc288
resolve merge conflicts of 380b01a to nyc-mr1-dev-plus-aosp
...
Change-Id: If97f5d5b4d67177b8160b96894a35d685573c46a
2016-06-16 18:58:04 -07:00
Adrian Roos
bd470255d0
resolve merge conflicts of 333ba2d to nyc-mr1-dev
...
Change-Id: I32f284bb2216755ae0ddbea4b7fc76a38c7aa7e2
2016-06-16 18:54:50 -07:00
Ajay Nadathur
10c74d81df
Merge \"[SetupWizard] Fix talkback on lock screen.\" into nyc-mr1-dev
...
am: eddcd7d085
2016-06-17 01:45:44 +00:00
Ajay Kumar Nadathur Sreenivasan
eddcd7d085
Merge "[SetupWizard] Fix talkback on lock screen." into nyc-mr1-dev
2016-06-17 01:18:00 +00:00
Meng Wang
184753f64f
Hide 'Update Emergecy Address' preference w/o carrier support
...
Bug: 29256401
Change-Id: I59f9d6192d39e2a259e3f2cbee641335d5b8b8d7
2016-06-16 17:32:20 -07:00
Adrian Roos
380b01a00e
Merge \"Remove RemoteInput on lockscreen setting\" into nyc-dev
...
am: 333ba2df01
2016-06-16 23:41:25 +00:00
Adrian Roos
333ba2df01
Merge "Remove RemoteInput on lockscreen setting" into nyc-dev
2016-06-16 23:33:56 +00:00
Fan Zhang
37d4d0c80e
Use metrics defined by proto in new Settings tabs.
...
Bug: 28141203
Change-Id: Ia0c566f873f93e46203d19f35161bb98acc60a38
2016-06-16 16:24:20 -07:00
Maurice Lam
47e38646ed
Merge \"Use GLIF theme for Settings > Security > Screen lock\" into nyc-mr1-dev
...
am: 223d45ea0e
2016-06-16 22:10:10 +00:00
Maurice Lam
223d45ea0e
Merge "Use GLIF theme for Settings > Security > Screen lock" into nyc-mr1-dev
2016-06-16 22:00:20 +00:00
Yohei Yukawa
a95348d6c1
Merge \\"Teach hard keyboard settings about correct user ID\\" into nyc-dev am: db6f1f2cb5
...
am: 75778049ba
2016-06-16 21:46:49 +00:00
Ajay Nadathur
7dfa323c81
[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
2016-06-16 14:42:22 -07:00
Yohei Yukawa
cfe0f07499
Merge \"Teach hard keyboard settings about correct user ID\" into nyc-dev
...
am: db6f1f2cb5
2016-06-16 21:40:53 +00:00
Yohei Yukawa
75778049ba
Merge \"Teach hard keyboard settings about correct user ID\" into nyc-dev
...
am: db6f1f2cb5
2016-06-16 21:40:53 +00:00
Yohei Yukawa
db6f1f2cb5
Merge "Teach hard keyboard settings about correct user ID" into nyc-dev
2016-06-16 21:24:05 +00:00
Adrian Roos
38e4e5dca6
Remove RemoteInput on lockscreen setting
...
Bug: 29370898
Change-Id: I6fef3deb55357e8569e023968967663582974f79
2016-06-16 13:29:11 -07:00
Doris Ling
b1eadb11b4
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
2016-06-16 12:30:53 -07:00
Doris Ling
32d530d6cd
Merge \\"Update gesture related settings in Display.\\" into nyc-mr1-dev am: 600a1eeec5
...
am: 6dc50f9de6
2016-06-16 19:17:44 +00:00
Maurice Lam
d189ac52a4
Use GLIF theme for Settings > Security > Screen lock
...
Bug: 24405946
Change-Id: I1fed96cbc228b6bb367637f83f9cd3bac2761417
2016-06-16 12:13:11 -07:00
Doris Ling
6dc50f9de6
Merge \"Update gesture related settings in Display.\" into nyc-mr1-dev
...
am: 600a1eeec5
2016-06-16 19:07:03 +00:00
Doris Ling
600a1eeec5
Merge "Update gesture related settings in Display." into nyc-mr1-dev
2016-06-16 18:52:31 +00:00
Doris Ling
d0c8fd724d
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
2016-06-16 10:23:49 -07:00
Yohei Yukawa
966476b7dc
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
2016-06-16 00:02:01 -07:00
Roozbeh Pournader
bb162e7970
BidiFormat adapter name for bluetooth_is_visible_message am: 77893a4c4b am: 7d9cdfd4b6
...
am: 4d70d4ffa1
2016-06-16 02:17:38 +00:00
Roozbeh Pournader
4d70d4ffa1
BidiFormat adapter name for bluetooth_is_visible_message am: 77893a4c4b
...
am: 7d9cdfd4b6
2016-06-16 02:01:55 +00:00
Roozbeh Pournader
7d9cdfd4b6
BidiFormat adapter name for bluetooth_is_visible_message
...
am: 77893a4c4b
2016-06-16 01:59:37 +00:00
Roozbeh Pournader
20d6b425c5
BidiFormat adapter name for bluetooth_is_visible_message
...
am: 77893a4c4b
2016-06-16 01:59:22 +00:00
Daniel Nishi
79b0925231
Merge \\"Show storage manager settings using a system property.\\" into nyc-mr1-dev am: 3d040e55d9
...
am: 4765fd9a4b
2016-06-15 23:22:35 +00:00
Daniel Nishi
4765fd9a4b
Merge \"Show storage manager settings using a system property.\" into nyc-mr1-dev
...
am: 3d040e55d9
2016-06-15 22:19:34 +00:00
Daniel Nishi
3d040e55d9
Merge "Show storage manager settings using a system property." into nyc-mr1-dev
2016-06-15 22:14:09 +00:00
Roozbeh Pournader
77893a4c4b
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
2016-06-15 14:46:11 -07:00
Chris Wren
1f19c4cddf
Merge \\\"log as counters instead of histograms\\\" into nyc-dev am: 6913b6118f am: 0a13cfbf8e
...
am: a0e9f47a69
2016-06-15 19:12:43 +00:00
Chris Wren
a0e9f47a69
Merge \\"log as counters instead of histograms\\" into nyc-dev am: 6913b6118f
...
am: 0a13cfbf8e
2016-06-15 18:22:17 +00:00
Chris Wren
0a13cfbf8e
Merge \"log as counters instead of histograms\" into nyc-dev
...
am: 6913b6118f
2016-06-15 18:17:52 +00:00
Chris Wren
420d46ee68
Merge \"log as counters instead of histograms\" into nyc-dev
...
am: 6913b6118f
2016-06-15 18:17:52 +00:00
TreeHugger Robot
6913b6118f
Merge "log as counters instead of histograms" into nyc-dev
2016-06-15 18:13:53 +00:00
Daniel Nishi
0074855229
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
2016-06-15 11:01:58 -07:00
Sudheer Shanka
d98cba58c8
Merge "Make guest field unselectable only if it is not disabled by admin."
2016-06-15 17:58:10 +00:00
Jason Monk
16da0e3c98
Merge \\\"Fix SimStatus updatePhoneInfos\\\" into nyc-dev am: b53117f55c am: e3eaa08742
...
am: 4edb76127c
2016-06-15 17:32:32 +00:00
Jason Monk
2f4c80f3c7
Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
...
am: b53117f55c
2016-06-15 16:59:09 +00:00
Jason Monk
4edb76127c
Merge \\"Fix SimStatus updatePhoneInfos\\" into nyc-dev am: b53117f55c
...
am: e3eaa08742
2016-06-15 16:58:59 +00:00
Jason Monk
e3eaa08742
Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
...
am: b53117f55c
2016-06-15 16:53:55 +00:00
Ricky Wai
c40c60841c
Merge \\\"Remove work fingerprints when primary profile lock is removed\\\" into nyc-dev am: 42cbbc3052 am: 5ec65517a6
...
am: ea25035866
2016-06-15 16:52:50 +00:00
Jason Monk
9e560413c6
Merge \\"resolve merge conflicts of f4ad443 to nyc-mr1-dev\\" into nyc-mr1-dev am: b2e2007766
...
am: 359c8343dd
2016-06-15 16:52:48 +00:00
TreeHugger Robot
b53117f55c
Merge "Fix SimStatus updatePhoneInfos" into nyc-dev
2016-06-15 16:48:45 +00:00
Ricky Wai
ea25035866
Merge \\"Remove work fingerprints when primary profile lock is removed\\" into nyc-dev am: 42cbbc3052
...
am: 5ec65517a6
2016-06-15 16:42:05 +00:00
Jason Monk
359c8343dd
Merge \"resolve merge conflicts of f4ad443 to nyc-mr1-dev\" into nyc-mr1-dev
...
am: b2e2007766
2016-06-15 16:42:04 +00:00
