Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,025 Commits 1 Branch 0 Tags
be5fbd99541c0662794056edd171644a76ddb112
Commit Graph

11911 Commits

Author SHA1 Message Date
Sanket Padawe
be5fbd9954 Fix bug in Sim Status Settings. 
am: fb87919fde

Change-Id: I696fa92d6ae21a9df386c60287da0ed298f3615d
 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
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
Robin Lee
c7f0f2338a Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev 
am: cab4f9dc39

Change-Id: Ic81454dfe7e6d7d7d0586e2b5eb38770d93e9377
 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

Change-Id: I0b66044361c76629f20d2bb56ebb0779885a5781
 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

Change-Id: I8c4a6902f6fcf0510b2a307ca3fe7e918f9702f9
 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

Change-Id: Id61473c100565d9d795bf314ccff6723bdd0c64c
 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

Change-Id: If18910dba402d98ffc115af8c87b836fca50ec0f
 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

Change-Id: I6060ae5a113025b0cfbbd8ff1f58599cb8f4cf7e
 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

Change-Id: I1d7431bd7bf4654f2fbfe8c43344e22d28b5b2f7
 2016-06-08 19:15:42 +00:00
Jason Monk
2c7e1d844f Merge \"Fix data usage format strings\" into nyc-dev 
am: cb1972b908

Change-Id: I42ae51bb815f24b026ff0c25759634b23d13355c
 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

Change-Id: I778f8f766ace689b1bd4174000daaafb13253516
 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

Change-Id: I40ee4bef616c6dbff872f5bb106b3195a9e5be07
 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
Jim Miller
6233c1d0bc Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev 
am: f8c64089b1

Change-Id: Idf719bc91baba5fe18c044183794da4a74251bdd
 2016-06-08 00:38:35 +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
Robin Lee
cff703e68a Merge "Restrict Settings always-on to NYC+" into nyc-dev 
am: 8f2c17e12c

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

Change-Id: Icdd13f90ce7c38b8d3fdc4f5b5247f97f6a21127
 2016-06-06 21:09:29 +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
Sudheer Shanka
7469d799a8 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: Ica84a34db826fa02130aa85efff40544b246c3ef
 2016-06-03 17:13:09 +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
Sanket Agarwal
3d06893ba6 Handle return value when Bluetooth is enabled 
If the Bluetooth enable(true) returns false currently we are waiting for
a broadcast (which may not happen if enable returns false). We mark the
toggle to have failed (i.e. it is clickable and in OFF state) and the
switch bar text is appropriately shown.

Bug: b/28318203
Change-Id: I09ba46d2e102e7f2c4ef9a72bf38dedc1346364f
 2016-06-03 01:07:24 +00:00
Fyodor Kupolov
06a9c98bb8 Merge "Make prefs without an action unselectable" into nyc-dev 
am: 9121169dca

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

Change-Id: I214ef870006bf5257ac3b51354ce20c429db3ea5
 2016-06-02 22:44:44 +00:00
Fyodor Kupolov
9121169dca Merge "Make prefs without an action unselectable" into nyc-dev 2016-06-02 22:30:22 +00: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