Commit Graph

2868 Commits

Author SHA1 Message Date
Jason Monk
e74ae23269 resolve merge conflicts of 65b5952 to master
Change-Id: I0adc036416f21dfa7dd671d4920bce5c26fe7cb6
2016-04-08 13:34:47 -04:00
Jason Monk
ea35f87377 Restore the premiume SMS Preference.
Fixes: 27657256
Change-Id: I396eb9ba71f51fed517d7f958873369bc0ab011e
2016-04-08 13:02:48 -04:00
Fan Zhang
d42e233bf0 Dashboard status cards UI.
Bug: 27907841

This adds a card view type to display status in Settings dashboard. Also
added necessary pieces to layout status and condition views properly.

The data for status is not wired up yet.

Change-Id: I8ed624177645f389ec0bb71420f073c6dbc03ccb
2016-04-07 13:23:37 -07:00
Maurice Lam
87da294262 Merge "Update fingerprint strings during setup" into nyc-dev am: a01e2b9
am: f312bd6

* commit 'f312bd68dadd6404c3cd86c614b6e08be7d25797':
  Update fingerprint strings during setup

Change-Id: Ieb0f1fd7529754ca0a346cb0cb805fb73d0e2996
2016-04-06 21:41:44 +00:00
Maurice Lam
a01e2b96f6 Merge "Update fingerprint strings during setup" into nyc-dev 2016-04-06 21:34:34 +00:00
Maurice Lam
1a2c6f464a Update fingerprint strings during setup
Bug: 28004437
Change-Id: I317437ddaf66158e0d30da6d411d9aa7f498688c
2016-04-06 12:25:39 -07:00
Jason Monk
9964504e51 Merge "Add dev options to set swXdp" into nyc-dev am: b22dd20
am: 51970c8

* commit '51970c855812232a9514958dd67959f18749fbe1':
  Add dev options to set swXdp

Change-Id: Id25b198c9af3e7b6eca478c3936341096d5edd2e
2016-04-06 13:31:44 +00:00
Jason Monk
b22dd2071f Merge "Add dev options to set swXdp" into nyc-dev 2016-04-06 13:20:07 +00:00
Victor Chang
67691696f2 Merge "Add button to trust a CA cert" into nyc-dev am: b49c901
am: 2bd4e16

* commit '2bd4e1689f1e154a9a4a1d47ccbe13c6e8f08dea':
  Add button to trust a CA cert

Change-Id: If836edae5e6cf7b4759ac6874cef4d324af91f16
2016-04-06 11:07:55 +00:00
Victor Chang
a390d63682 Add button to trust a CA cert
- Put Disable button for system cert and Remove button for user cert as action button in cert dialog
- OK (dismiss) button is displayed when trust button is not shown
- Showing chain of cert dialot will be in a later CL

Bug: 18224038
Change-Id: Ieef70e12fd8bdf711be48dc0488f03dbe143d3c5
2016-04-05 22:22:41 +01:00
Jason Monk
449f97204a Add dev options to set swXdp
Change-Id: Ibe88e2b1a2e818838baf452b6da204fc9e004a42
Fixes: 27734698
2016-04-05 16:47:44 -04:00
Julia Reynolds
5360308d18 Merge "Lowercase s." into nyc-dev am: b24cfaf
am: cf61f2e

* commit 'cf61f2e160b8463474f6978e8a0bcf2b53bd8e13':
  Lowercase s.

Change-Id: I6e3efc44b140b2a5828bdb1dd0bdf2fd0af7f8e7
2016-04-04 14:00:23 +00:00
Julia Reynolds
b24cfafd1d Merge "Lowercase s." into nyc-dev 2016-04-04 13:52:27 +00:00
Clara Bayarri
234f737610 Merge "Remove fullstop at end of phrases" into nyc-dev am: bd5eb13
am: 4b91148

* commit '4b91148b3d2d3126cb5463f4401d651af7f0206f':
  Remove fullstop at end of phrases

Change-Id: I22eb5096a610569007e09fe5b7f3e96fdfe5c2af
2016-04-04 12:28:06 +00:00
Clara Bayarri
bd5eb1331e Merge "Remove fullstop at end of phrases" into nyc-dev 2016-04-04 12:17:00 +00:00
Fan Zhang
e5287f10ce Merge "Add an empty status fragment for status and suggestions." 2016-04-01 16:08:48 +00:00
Fan Zhang
3feafd22ed Add an empty status fragment for status and suggestions.
Bug: 27927402

Also add a TabLayout to show title for these fragments, inspired by
http://goo.gl/aOt51Q

Change-Id: I40bab3075480670558ac9a896337109f10e8c90c
2016-04-01 09:07:31 -07:00
Tyler Gunn
00c334ccba Merge "Adding "wifi only" option for wifi calling." into nyc-dev 2016-04-01 15:43:08 +00:00
Tyler Gunn
2013ba8ed1 Adding "wifi only" option for wifi calling.
- Added "wifi-only" option to the list of wifi calling modes.
- Added code in settings initialization to check whether the carrier
supports including the wifi-only option.  If it does not, changes the
entries/values to a ser which does not include the wifi-only option.

Bug: 27858149
Change-Id: Ib02a97afcf6f2722c28b7a4d9c241774944c52d0
2016-04-01 08:41:18 -07:00
Julia Reynolds
96ddca3519 Lowercase s.
Bug: 27853578
Change-Id: I1c0b3a7fc00ba4f5e8330885213d641aec9518f7
2016-04-01 10:53:10 -04:00
Clara Bayarri
3cb2511166 Remove fullstop at end of phrases
Requested by UX

Bug: 27913794
Change-Id: Ieb6ace1236787128825e39c310331603f574a32b
2016-04-01 12:39:35 +01:00
Victor Chang
b1d7142cb2 Merge "Show notification when failing to turn on always-on vpn" into nyc-dev 2016-03-31 17:04:53 +00:00
Victor Chang
1b8855b211 Show notification when failing to turn on always-on vpn
- Notification icon is Settings icon
- VpnName is obtained as the same way as AppPreference
- Post notification as the current user with PendingIntent to VpnSettings to parent user
- Auto-cancel when user taps on the notification
- This implementation posts notification only when the failure happens sychronously
  (Assume ConnectivityService only unset always-on package immediately after calling setAlwaysOnVpnPackageForUser)

Bug:27374485
Change-Id: I0aee38498c8cc300dd8eb9687adcae5f9dc4f8af
2016-03-31 16:40:22 +01:00
Yohei Yukawa
5ffbf2e39d Merge changes Ieea9a13a,Id2ae6151 into nyc-dev
* changes:
  Remove gear icon from InputMethodPreference.
  Update title to "Add or edit virtual keyboards".
2016-03-31 06:13:54 +00:00
Daichi Hirono
9856531b45 Merge "Change the dialog text in USB device tyep chooser." into nyc-dev 2016-03-30 23:59:05 +00:00
Mihai Niță
627d0af541 Merge "Fix missing dot in the remove language confirmation message" into nyc-dev 2016-03-30 22:37:53 +00:00
Mihai Nita
632a311c35 Fix missing dot in the remove language confirmation message
Bug: 27709559
Change-Id: Ie0f4ecf01578a1f6317b058dfed288dcbfa28d92
2016-03-30 14:55:30 -07:00
Amith Yamasani
8df04151d0 Merge "Don't prompt twice to uninstall updates" into nyc-dev 2016-03-30 20:43:03 +00:00
Noah Wang
1308bd8bb1 Merge "Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035" into nyc-dev 2016-03-30 20:03:38 +00:00
Yohei Yukawa
611410a8c4 Update title to "Add or edit virtual keyboards".
Per comment from UX, we replace "Add virtual keyboard" with
"Add or edit virtual keyboards" because the user is able to not only
enable but also disable virtual keyboards.

Bug: 27543291
Change-Id: Id2ae61519152bbe622aa5915f728a4cbbc49e078
2016-03-30 11:40:30 -07:00
Amith Yamasani
bacc708f96 Don't prompt twice to uninstall updates
PackageInstaller is going to ask again, so skip
asking in Settings when user wants to uninstall
updates to a system app.

Bug: 26694521
Change-Id: I4335a4e9bfe54985eb58ba19a890caba06705bef
2016-03-30 09:52:33 -07:00
Jason Monk
fd91887311 Merge "Revert "Rename more to other networks"" into nyc-dev 2016-03-30 16:31:34 +00:00
Yohei Yukawa
d719ae8e37 Merge "Use word "languages" in favor of multi-locale support." into nyc-dev 2016-03-30 06:00:24 +00:00
Noah Wang
a8ef32b969 Adding contentDescription to ViewPager in font/display size settings.
Bug: 27326035

Change-Id: I416c05f2fc7c9238a61b8d512f09cb834f8ec537
2016-03-29 21:32:18 -07:00
Yohei Yukawa
c4204c3ba6 Use word "languages" in favor of multi-locale support.
In Android N, the user is able to select multiple languages.  Hence
in the IME subtype enabler "Use system language" should be updated to
"Use system languages".

Bug: 27722513
Change-Id: Idcc2fa7eecd1316feac04774ff18c42614a0dc9a
2016-03-29 20:44:01 -07:00
Daichi Hirono
70cfa7d8fe Change the dialog text in USB device tyep chooser.
Updates the texts to the new ones from UX.

Change-Id: Id741a9685c230e005019fe4b57933617fa67d257
Fixed: 27843605
2016-03-30 09:38:52 +09:00
Christopher Tate
1e230cb1b8 Improve notes on "Opening links" and related strings
Bug 27857777

Change-Id: Ie4c70bca29c7b93c6bb9989b3bb3dc80bae6d805
2016-03-29 17:09:41 -07:00
Jason Monk
4a0575081c Revert "Rename more to other networks"
Bug: 27638488
This reverts commit 34ed8a243b.

Change-Id: I5e10e11d40d24ae26c8605f832c43bd41c62c1dc
2016-03-29 17:12:56 +00:00
Udam Saini
7e7f82acf5 Merge "Changes SetupRedactionInterstitial to be an optional step" into nyc-dev 2016-03-28 22:06:59 +00:00
Christopher Tate
13d79b2a25 Call it "Opening links" now
Better labels are better.

Bug 27834016

Change-Id: I3f5a8088234db7790ac8baded0547f415d7e2c4c
2016-03-25 15:06:25 -07:00
Alan Viverette
6b0b73fdc4 Move DensityUtils into SettingsLib
Bug: 27644685
Change-Id: Ie493bd7b07700c2df1221a4257c0487db2a14ff7
2016-03-25 14:56:25 -04:00
Udam Saini
dd05ab7600 Changes SetupRedactionInterstitial to be an optional step
We no longer need this to be in inside the setup flow when setting up
the lock screen. Move this class to be used as an optional step if a
lock screen is added.

bug:23893721
Change-Id: I15478e0f0d8d8771cbdce6ccf0f508cbd5dd4f36
2016-03-24 15:08:19 -07:00
Hall Liu
f3dc18b65b Merge "Add indicator for system dialer in Settings" into nyc-dev 2016-03-24 17:29:39 +00:00
Sudheer Shanka
ed0d4dd463 Merge "Add more policy transparency for wifi settings." into nyc-dev 2016-03-23 17:53:19 +00:00
Sudheer Shanka
561a88cfcd Merge "Add disabled by policy empty views to more screens." into nyc-dev 2016-03-23 17:53:15 +00:00
Abodunrinwa Toki
14df560744 Merge "InputSettings: Physical keyboard settings activity." into nyc-dev 2016-03-23 16:03:24 +00:00
Abodunrinwa Toki
b28b2cc68f InputSettings: Physical keyboard settings activity.
This CL adds functionality to trigger the "Physical keyboard"
settings screen via an intent.

Bug: 26943892
Change-Id: Ib4a0be38f94f83672501d5312079d132b2ab717d
2016-03-22 17:17:41 +00:00
Tony Mantler
50124b5fee Move hint strings to SettingsLib
b/18246360

Change-Id: I7b8f6badde4e0a4d47c408e2acb70ae3fe8557a9
2016-03-21 14:51:55 -07:00
Victor Chang
32da1ecdca Merge "Per vpn setting change in VPN list" into nyc-dev 2016-03-21 15:20:14 +00:00
Victor Chang
df21cc7de9 Merge "Vpn settings per vpn" into nyc-dev 2016-03-21 13:09:07 +00:00