Jason Monk
cd2d94b2d1
Merge \"Fix tethering re-enable after edit.\" into nyc-dev
...
am: dbb5a0b918
2016-06-22 15:36:36 +00:00
Jason Monk
dbb5a0b918
Merge "Fix tethering re-enable after edit." into nyc-dev
2016-06-22 15:22:10 +00:00
Jason Monk
29e4b2bc30
Merge \"Update battery content descriptions with labels\" into nyc-dev
...
am: 2a6b3d4db1
2016-06-22 13:32:23 +00:00
Jason Monk
2a6b3d4db1
Merge "Update battery content descriptions with labels" into nyc-dev
2016-06-22 13:22:45 +00:00
Dan Sandler
698fe0a9b0
Merge \"Show \"0\" instead of \"0 B\" in storage settings.\" into nyc-dev
...
am: 87fcf9e95f
2016-06-21 18:18:21 +00:00
Daniel Sandler
87fcf9e95f
Merge "Show "0" instead of "0 B" in storage settings." into nyc-dev
2016-06-21 18:11:11 +00:00
Jason Monk
cf7c2374a9
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
2016-06-21 14:06:48 -04:00
Jason Monk
d589bafc4a
Update battery content descriptions with labels
...
Change-Id: I0ad4ca753f8f5e1a01e2e21181526ddb921d487a
Fixes: 28301362
2016-06-21 13:36:57 -04: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
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
Dan Sandler
89d5659643
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
2016-06-21 00:33:16 -04:00
Julia Reynolds
07e85aa5c0
Merge \"Fix NPE printing notification actions.\" into nyc-dev
...
am: 43b04bcc7d
2016-06-20 18:58:07 +00:00
Julia Reynolds
9bcc04c5db
Fix NPE printing notification actions.
...
Change-Id: Icb52e7bc632bf7109a75a7695fb253b2183e7360
Fixes: 29017025
2016-06-20 10:23:44 -04: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
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
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
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
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
20d6b425c5
BidiFormat adapter name for bluetooth_is_visible_message
...
am: 77893a4c4b
2016-06-16 01:59:22 +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
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
Jason Monk
e3eaa08742
Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
...
am: b53117f55c
2016-06-15 16:53:55 +00:00
TreeHugger Robot
b53117f55c
Merge "Fix SimStatus updatePhoneInfos" into nyc-dev
2016-06-15 16:48:45 +00:00
Chris Wren
1753dfd5cd
log as counters instead of histograms
...
this will interoperate better with UMA
Bug: 26687914
Change-Id: Ie63b2be2d457054c96b070ada3bb92141ab1fb5a
2016-06-15 12:36:38 -04:00
Ricky Wai
0f747c979d
Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev
...
am: 42cbbc3052
2016-06-15 16:04:41 +00:00
Ricky Wai
42cbbc3052
Merge "Remove work fingerprints when primary profile lock is removed" into nyc-dev
2016-06-15 16:02:18 +00:00
Jason Monk
4904ba543e
Merge \"Make linkify handle emptys urls better DO NOT MERGE\" into nyc-dev
...
am: f4ad4434f1
2016-06-15 15:03:26 +00:00
Jason Monk
c7959f91d5
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
2016-06-15 10:54:33 -04:00
Jason Monk
f4ad4434f1
Merge "Make linkify handle emptys urls better DO NOT MERGE" into nyc-dev
2016-06-15 14:53:43 +00:00
Julia Reynolds
7803e3f76b
Merge \"Prevent users from blocking system notifications.\" into nyc-dev
...
am: b2301cb4c2
2016-06-14 22:30:33 +00:00
TreeHugger Robot
b2301cb4c2
Merge "Prevent users from blocking system notifications." into nyc-dev
2016-06-14 22:25:26 +00:00
Sanket Padawe
be5fbd9954
Fix bug in Sim Status Settings.
...
am: fb87919fde
2016-06-14 18:04:52 +00:00
Sanket Padawe
fb87919fde
Fix bug in Sim Status Settings.
...
Bug: 29332493
Change-Id: Idd519e704ce6fdd0b92319948bdf02c0fa45ff34
2016-06-14 10:12:39 -07:00
Ricky Wai
dae1ac5cb0
Remove work fingerprints when primary profile lock is removed
...
Bug: 29264034
Change-Id: Ia4043e8a4f4481ff72b8d7069fd139a381158083
2016-06-14 14:43:00 +01:00
Robert Greenwalt
89b8babe6a
resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp
...
Change-Id: Ie6a95224a62023a2a19054aa95382d24365124f5
2016-06-13 13:01:36 -07:00
Robert Greenwalt
03393c4109
Merge "Fix the memory leak in TetherSettings"
2016-06-13 18:35:32 +00:00
Jason Monk
f01d1d5dcb
Make linkify handle emptys urls better DO NOT MERGE
...
Change-Id: I60029b02e6cda334a8c66ba8453be28b35a818a3
Fixes: 29045818
2016-06-13 13:08:32 -04:00
Julia Reynolds
cdd1a26465
Prevent users from blocking system notifications.
...
Change-Id: I1864d54b01e4db03393078504b8f592ee41ed1c2
Fixes: 29191134
2016-06-13 12:49:45 -04:00
Robin Lee
c7f0f2338a
Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev
...
am: cab4f9dc39
2016-06-13 16:15:19 +00:00
Robin Lee
cab4f9dc39
Merge "Respect DISALLOW_CONFIG_VPN for disconnect dialog" into nyc-dev
2016-06-13 16:03:54 +00:00
Robin Lee
49be1c1b06
Respect DISALLOW_CONFIG_VPN for disconnect dialog
...
Change-Id: Idfe3899e81eec5efdbd5700bdc65921de6853898
Fix: 29265163
2016-06-13 15:08:32 +00:00
Nicolas Prevot
341b21d2f8
Merge \"Fix rendering of policy transparency activity.\" into nyc-dev
...
am: 98704bc495
2016-06-13 12:50:16 +00:00
Nicolas Prévot
98704bc495
Merge "Fix rendering of policy transparency activity." into nyc-dev
2016-06-13 12:37:05 +00:00
