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
Ruchi Kandoi
f8c135a986
resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp
...
Change-Id: If75736f8e36e2a8e13fe9740f89f632ee6bedd49
2016-06-10 22:04:52 -07:00
Mark Salyzyn
03af2286ee
Settings: add logpersist selection (actions)
...
- Only add logpersist menu if debuggable.
- Only enable logpersist menu if Logging is On.
- Add selection for Off, All and All minus radio.
- Pop up warning box that persistent storage is to be cleared when
selecting Off (but not if turned off by Logging Size Off or
Disabling Debugger Options).
Bug: 28936216
Change-Id: Ic0a58abdcd6ca41069efb818d1dcef4e3927d2de
2016-06-10 21:44:32 +00:00
Jason Monk
3078e76284
Merge \"Fix crash in finish from onCreate.\" into nyc-dev
...
am: 1a1f6b0b1b
2016-06-10 15:11:24 +00:00
TreeHugger Robot
1a1f6b0b1b
Merge "Fix crash in finish from onCreate." into nyc-dev
2016-06-10 15:06:34 +00:00
Jason Monk
656bc6004f
Fix crash in finish from onCreate.
...
Change-Id: Ia4937fecdc93e30a468b8fefd2f8776186c8e151
Fixes: 29245324
2016-06-10 09:49:12 -04:00
Yohei Yukawa
74358619a0
Merge \"Fix sentence capitalization of locale names.\" into nyc-dev
...
am: 294b1586ed
2016-06-09 23:57:58 +00:00
Yohei Yukawa
294b1586ed
Merge "Fix sentence capitalization of locale names." into nyc-dev
2016-06-09 23:47:31 +00:00
Roozbeh Pournader
241f8e6e9c
Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev
...
am: 5eddc4bde9
2016-06-09 23:06:55 +00:00
Roozbeh Pournader
5eddc4bde9
Merge "Use existing localizations for formatting data usage [DO NOT MERGE]" into nyc-dev
2016-06-09 23:04:22 +00:00
Svet Ganov
0984141943
Merge \"Don\'t send user to permissions screen if none requested\" into nyc-dev
...
am: 3e5318496e
2016-06-09 22:53:07 +00:00
Svetoslav Ganov
3e5318496e
Merge "Don't send user to permissions screen if none requested" into nyc-dev
2016-06-09 22:45:49 +00:00
Yohei Yukawa
91c23ca03f
Fix sentence capitalization of locale names.
...
It turns out that out previous CL [1] is not sufficient to address all
the requests regarding capitalization.
With [1], now InputMethodSubtype#getLocaleDisplayName() returns a locale
name whose capitalization is basically optimized to be used as a list
item. It works well for list UI, but on a UI element that looks like a
sentence text, we still need to capitalize the first character.
This CL takes care of those UI elements in the Settings app. This CL
also addresses a remaining TODO about locale-unaware text formatting by
using about android.icu.text.ListFormatter.
[1]: If105082ce703db7a86738455db7e9fb37f3c6fe8
e489baf96df2837a3a63b626d9023a4a8b322c28
Bug: 29035638
Change-Id: I59f93f0bc067cdd87c6065c972a7da3cde1128f9
2016-06-09 15:01:52 -07:00
Roozbeh Pournader
3697dbeaa3
Use existing localizations for formatting data usage [DO NOT MERGE]
...
This partially reverts I5be9bb7ce3b11709117da698d6c03610f4e5e40e in
order to use existing localizations and also avoid hard to localize
strings.
Also, we now bidi wrap the usage value, since it may break in the RTL
locales otherwise.
Bug: 28747101
Change-Id: Ibc03632cccfe671164cfbb670a423ada1177db65
2016-06-09 13:25:56 -07:00
Nicolas Prevot
637d24c8b9
Fix rendering of policy transparency activity.
...
Use the dialog's context instead of the activity
context to inflate the view.
BUG:29172155
Change-Id: I0fb32e3d4bfc522a4c8b6d7a6ed55acd01f97446
2016-06-09 20:59:20 +01:00
Svet Ganov
30ee6ab320
Don't send user to permissions screen if none requested
...
bug:29105157
Change-Id: I90ef18f41deae9a7cf28192bd47f16c3af262c29
2016-06-09 12:28:10 -07:00
Jason Monk
feee247e0c
Fix build
...
Change-Id: I264b0d9507e62ad5a2debad663faedd549414012
(cherry picked from commit e3ce6713d3
2016-06-08 21:29:48 +00:00
Jason Monk
167f6cc87c
Merge \"Remove PreferenceActivity\" into nyc-dev
...
am: 7f7092c705
2016-06-08 19:15:42 +00:00
Jason Monk
2c7e1d844f
Merge \"Fix data usage format strings\" into nyc-dev
...
am: cb1972b908
2016-06-08 19:15:42 +00:00
Jason Monk
4db5484a9d
Merge \"Fix disabling of tiles that are not relevant\" into nyc-dev
...
am: 9c5d3164f5
2016-06-08 19:15:41 +00:00
Jason Monk
7f7092c705
Merge "Remove PreferenceActivity" into nyc-dev
2016-06-08 19:13:05 +00:00
Jason Monk
cb1972b908
Merge "Fix data usage format strings" into nyc-dev
2016-06-08 19:11:51 +00:00
Jason Monk
9c5d3164f5
Merge "Fix disabling of tiles that are not relevant" into nyc-dev
2016-06-08 19:10:09 +00:00
Ricky Wai
263b210c16
Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev
...
am: 68c263cf2e
2016-06-08 14:47:43 +00:00
Ricky Wai
68c263cf2e
Merge "Make work challenge settings work even work profile is not enabled yet" into nyc-dev
2016-06-08 14:34:02 +00:00
Jason Monk
b7e4380cd2
Remove PreferenceActivity
...
Its broken and isn't worth maintaining, instead port the few things
using it over to SettingsPreferenceActivity with wrapping blank
Activities like the rest of Settings.
Change-Id: Ic82f0dcb63ed9b4078f7da6a79c0c52f0130e8d1
Fixes: 28779941
2016-06-08 09:48:58 -04:00
Ricky Wai
7250016447
Make work challenge settings work even work profile is not enabled yet
...
Bug: 29090660
Change-Id: I21996700f1ee451e8420f3f257c6ed51feea4ecb
2016-06-08 13:33:57 +00:00
