Zoltan Szatmary-Ban
3b629c6918
Fix non-app non-user preferences in Settings > Data usage am: afea1cae25
...
am: 63170fbf7a
2016-06-21 15:55:07 +00:00
Zoltan Szatmary-Ban
63170fbf7a
Fix non-app non-user preferences in Settings > Data usage
...
am: afea1cae25
2016-06-21 15:52:33 +00:00
Fan Zhang
1b6d911793
Merge \"Log button taps in support tab.\" into nyc-mr1-dev
...
am: a2fe136837
2016-06-21 15:35:07 +00:00
Fan Zhang
a2fe136837
Merge "Log button taps in support tab." into nyc-mr1-dev
2016-06-21 15:28:31 +00:00
Zoltan Szatmary-Ban
afea1cae25
Fix non-app non-user preferences in Settings > Data usage
...
Bug:29466113
Change-Id: Ib7a6d477146a856c0cb9c49143ffbf4fb99e38ed
2016-06-21 12:57:30 +01:00
Julia Reynolds
4606b359e9
Merge \\"Fix NPE printing notification actions.\\" into nyc-dev am: 43b04bcc7d
...
am: 018444ab61
2016-06-20 19:12:14 +00:00
Julia Reynolds
018444ab61
Merge \"Fix NPE printing notification actions.\" into nyc-dev
...
am: 43b04bcc7d
2016-06-20 19:08:43 +00:00
Julia Reynolds
07e85aa5c0
Merge \"Fix NPE printing notification actions.\" into nyc-dev
...
am: 43b04bcc7d
2016-06-20 18:58:07 +00:00
Fan Zhang
ab2e0390a0
Log button taps in support tab.
...
Bug: 29282762
Change-Id: I7d573f95450292840413cb5e266915f64f6d667d
2016-06-20 10:26:20 -07:00
Fan Zhang
461b286de7
Merge \"Add a \"Do not show\" checkbox in support disclaimer dialog.\" into nyc-mr1-dev
...
am: d04b49649e
2016-06-20 17:25:45 +00:00
Fan Zhang
d04b49649e
Merge "Add a "Do not show" checkbox in support disclaimer dialog." into nyc-mr1-dev
2016-06-20 16:35:52 +00:00
Julia Reynolds
9bcc04c5db
Fix NPE printing notification actions.
...
Change-Id: Icb52e7bc632bf7109a75a7695fb253b2183e7360
Fixes: 29017025
2016-06-20 10:23:44 -04:00
Meng Wang
8008dee36c
Merge \"Hide \'Update Emergecy Address\' preference w/o carrier support\" into nyc-mr1-dev
...
am: 2a817d97fe
2016-06-18 04:12:40 +00:00
TreeHugger Robot
2a817d97fe
Merge "Hide 'Update Emergecy Address' preference w/o carrier support" into nyc-mr1-dev
2016-06-18 04:02:49 +00:00
Fan Zhang
057f4ae6cc
Merge \"Use metrics defined by proto in new Settings tabs.\" into nyc-mr1-dev
...
am: b2728f51fb
2016-06-17 20:20:54 +00:00
Fan Zhang
b2728f51fb
Merge "Use metrics defined by proto in new Settings tabs." into nyc-mr1-dev
2016-06-17 20:15:48 +00:00
Fan Zhang
0beb695999
Add a "Do not show" checkbox in support disclaimer dialog.
...
Bug: 28762823
Change-Id: I8fe0a82efbb47c8b2f9e34480005fa108583b203
2016-06-17 12:56:35 -07:00
Doris Ling
6bf5f1e84a
Merge \"Add handling for fingerprint swipe in gesture settings.\" into nyc-mr1-dev
...
am: b458f46438
2016-06-17 18:20:38 +00:00
Doris Ling
b458f46438
Merge "Add handling for fingerprint swipe in gesture settings." into nyc-mr1-dev
2016-06-17 18:15:58 +00:00
Jason Monk
ca26435ca0
Merge \"Protect against crash in memory details\" into nyc-dev
...
am: c3ec1ab889
2016-06-17 17:52:01 +00:00
Jason Monk
2ca05240fd
Make sure screen pinning desc is part of view hierarchy
...
am: 0c2ccba2f9
2016-06-17 17:52:01 +00:00
Jason Monk
07e52aeb1c
Merge \\"Protect against crash in memory details\\" into nyc-dev am: c3ec1ab889
...
am: 989a52dc8d
2016-06-17 17:47:25 +00:00
Jason Monk
ac0b7dd4e7
Make sure screen pinning desc is part of view hierarchy am: 0c2ccba2f9
...
am: 11bad8d93e
2016-06-17 17:47:25 +00:00
Jason Monk
989a52dc8d
Merge \"Protect against crash in memory details\" into nyc-dev
...
am: c3ec1ab889
2016-06-17 17:44:25 +00:00
Jason Monk
11bad8d93e
Make sure screen pinning desc is part of view hierarchy
...
am: 0c2ccba2f9
2016-06-17 17:44:25 +00:00
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
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
