Commit Graph

12480 Commits

Author SHA1 Message Date
Robin Lee
442498681d Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev
am: cab4f9dc39

Change-Id: Iaab70bd402967dd628958abbbc06a469cea01b49
2016-06-13 16:15:20 +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
1ba2cbbfc2 Merge \"Fix rendering of policy transparency activity.\" into nyc-dev
am: 98704bc495

Change-Id: I42bba7f5351b214b45255d9e48c3c6802b306b14
2016-06-13 12:50:11 +00:00
Nicolas Prévot
98704bc495 Merge "Fix rendering of policy transparency activity." into nyc-dev 2016-06-13 12:37:05 +00:00
Anna Galusza
db0dbef52b Remove "Help & feedback" from toggle screen for accessibility services to
prevent confusion when users are trying to submit feedback for a specific
accessibility service (accessibility services can place their own "Help &
feedabck" in their apks and route it appropriately).
Bug: 29278252

Change-Id: Ie6f0d92a9ded82eaf3a0ac1122861f26639bc58a
2016-06-10 23:40:11 +00:00
Meng Wang
7648de1ec6 Merge "Wi-Fi Calling settings UI update" into nyc-mr1-dev 2016-06-10 16:36:46 +00:00
Jason Monk
0fa8dc1b55 Merge \"Fix crash in finish from onCreate.\" into nyc-dev
am: 1a1f6b0b1b

Change-Id: Ibd2e867077c2906310dd3b37afe1b9c1ab02de72
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
2d1d002eea Merge \"Fix sentence capitalization of locale names.\" into nyc-dev
am: 294b1586ed

Change-Id: I66b2876c923eed55804e14edc9f73ad619157336
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
0e3b675446 Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev
am: 5eddc4bde9

Change-Id: Ia2aee9b0d3ce92b1ceece65d081389a3386c88e7
2016-06-09 23:07:09 +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
650cc723d1 Merge \"Don\'t send user to permissions screen if none requested\" into nyc-dev
am: 3e5318496e

Change-Id: I9f04ac2bda5816997e86aa6aee683df3bbfcb74d
2016-06-09 22:53:40 +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
Doris Ling
ab595b8a98 Merge "Moved network settings reset away from Backup & reset." into nyc-mr1-dev 2016-06-08 21:35:20 +00:00
Jason Monk
aaaa236cec resolve merge conflicts of 7f7092c to nyc-mr1-dev
Change-Id: I27b058bd0cbbc2e253337cc56a1a032df96046de
2016-06-08 16:19:35 -04: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
Doris Ling
e6f635ff82 Moved network settings reset away from Backup & reset.
Moved Settings -> Backup & reset -> Network setting reset to
Settings -> Wireless & networks -> More.

Bug: 28683031
Change-Id: I52385ec862789985ccb8647398950605955569f7
2016-06-08 11:49:47 -07:00
TreeHugger Robot
d4e31320c1 Merge "Display total storage for Internal shared storage." into nyc-mr1-dev 2016-06-08 16:08:11 +00:00
Felipe Leme
ff162a3c23 Display total storage for Internal shared storage.
Prior to this change, Settings was using
volume.getPath().getTotalBytes() to calculate the total, which includes
the user-accessible storage, but not the internal partitions. As such,
the total displayed was often missing many GBs (for example, in a 32GB
device, it could display "12.09GB of 25.01GB used".

This change fix this problem by using the total size and creating a
"System" section containing the "missing" storage.

BUG: 24128505

Change-Id: Ic35cd7c8406eff16ac1d97c4b4c233ecde64a6e1

** Cherrypicked from master - DO NOT MERGE **
2016-06-08 14:49:32 +00:00
Ricky Wai
5f0e81222a Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev
am: 68c263cf2e

Change-Id: I091c7a1173b468c9887d247efa517696cbd50da2
2016-06-08 14:49:06 +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
Jim Miller
5b9fab40a0 Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am: f8c64089b1

Change-Id: Ib227856dd007197a22b8ef2f27881dddd992b3b8
2016-06-08 00:38:29 +00:00
TreeHugger Robot
f8c64089b1 Merge "Move legacy full disk encryption code to Settings." into nyc-dev 2016-06-08 00:31:30 +00:00
Jim Miller
358ff29f38 Move legacy full disk encryption code to Settings.
Fixes bug 27617297

Change-Id: Ib975cf8d4f2e1e7fa8a77550ca4ee8233647e9db
2016-06-07 15:44:46 -07:00
Jason Monk
5862c1ef02 Fix disabling of tiles that are not relevant
- Fix restricted user tiles being disabled
 - Call new better method in SettingsDrawerActivity for disabling

Change-Id: I2fb6ddd3d505189d2b6d96c0a1039291b80a2f70
Fixes: 29080209
2016-06-07 14:02:33 -04:00
Meng Wang
0dc4311333 Wi-Fi Calling settings UI update
Bug: 28404126
Change-Id: Id9c44c0b97d2ef81502a65e9238e47656068db50
2016-06-06 16:49:02 -07:00
Robin Lee
e8fce6d433 Merge "Restrict Settings always-on to NYC+" into nyc-dev
am: 8f2c17e12c

* commit '8f2c17e12c7cd7c293257c74ac32ab435f58eefe':
  Restrict Settings always-on to NYC+

Change-Id: Ic79b72b61a763ab7746c1fa07e705e5e2e410bbf
2016-06-06 21:09:30 +00:00
Robin Lee
8f2c17e12c Merge "Restrict Settings always-on to NYC+" into nyc-dev 2016-06-06 20:59:01 +00:00
Jason Monk
aa5a8a6a4c Fix data usage format strings
Bug: 28747101
Change-Id: I5be9bb7ce3b11709117da698d6c03610f4e5e40e
2016-06-06 16:39:55 -04:00
Robin Lee
cfc0fb02c1 Restrict Settings always-on to NYC+
Bug: 28413917
Change-Id: I1c40bdc94bb05d21daf589840adbbf04abe6c10f
2016-06-06 17:04:36 +00:00
Andrew Sapperstein
6c52398695 Merge "Add safety & regulatory info to "about device"." into nyc-mr1-dev 2016-06-03 22:22:38 +00:00
Sudheer Shanka
377623b6ee Merge "Avoid triggering device admin settings in non-current user." into nyc-dev
am: a433fd2429

* commit 'a433fd2429dfc37ab60b4dc7a17cb2e714ef6fbd':
  Avoid triggering device admin settings in non-current user.

Change-Id: I0557ea43f891a272f946987197bbb7df0aef9b0e
2016-06-03 17:14:43 +00:00
TreeHugger Robot
a433fd2429 Merge "Avoid triggering device admin settings in non-current user." into nyc-dev 2016-06-03 17:02:51 +00:00
Fyodor Kupolov
a015e6ca16 Merge "Make prefs without an action unselectable" into nyc-dev
am: 9121169dca

* commit '9121169dca4bf3f11908031fd72448025d3933d4':
  Make prefs without an action unselectable

Change-Id: Ia3b0efe9acd7c4ebf9213d141211f23322b8152e
2016-06-02 22:49:07 +00:00
Fyodor Kupolov
9121169dca Merge "Make prefs without an action unselectable" into nyc-dev 2016-06-02 22:30:22 +00:00
Andrew Sapperstein
1fad9af3c7 Add safety & regulatory info to "about device".
Renamed "Regulatory information" to "Regulatory labels"
and added a new option called "Safety & regulatory information".

The new option only shows if an activity exists that can
accept android.settings.SHOW_SAFETY_AND_REGULATORY_INFO intents.

BUG: 27876015
Change-Id: Iaf9588658eb7919b330ac8b3d673b8e81a4f76dc
2016-06-02 14:12:19 -07:00
Sudheer Shanka
8b72e563ec Avoid triggering device admin settings in non-current user.
Bug: 28953755
Change-Id: Ic9f6f57b1ef4cc1de2d1ea227b17faf4334ffec8
2016-06-02 12:40:22 -07:00
Fyodor Kupolov
77865ec827 Make prefs without an action unselectable
Setting selectable=false is required for proper A11y. Otherwise Talkback
will inform the user that the item can be activated.

Bug: 29025567
Change-Id: I2b61c622c2d69fa83640f7822349613f51f849d5
2016-06-02 10:39:33 -07:00
Wei Wang
c687e9bfbd Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev
am: d0d3ca3b7c

* commit 'd0d3ca3b7c64dc30c5262251b5a6f610e2127a69':
  Revert "Add an entry in developer options for location tools."

Change-Id: I66441bf21ddd8f0977bcaec7d92a28406e3bcf0e
2016-06-02 17:22:59 +00:00