Jason Monk
4b32de0d35
Fix localization issues with disabled am: 9e9ba0d
...
am: 22b5064
2016-04-11 14:20:17 +00:00
Jason Monk
9e9ba0d751
Fix localization issues with disabled
...
Change-Id: Iba63b50000f546a1e323c855462841e82fce4df8
Fixes: 27948378
2016-04-11 09:58:55 -04:00
Jason Monk
19fad2550e
Merge "Settings tweaks"
2016-04-11 13:24:38 +00:00
Jason Monk
c19eb986f3
Settings tweaks
...
Change-Id: I68829fa8e49534d4635a008c94dced3c7ab6f4b1
Fixes: 27834471
Fixes: 27834626
Fixes: 27567838
Fixes: 27834676
2016-04-11 09:21:24 -04:00
Clara Bayarri
99ea9716d5
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev am: 6599660
...
am: 232302e
2016-04-11 10:05:55 +00:00
Clara Bayarri
6599660196
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev
2016-04-11 09:44:20 +00:00
Yohei Yukawa
efa5468c0e
Shorten title name so as not to hit char limit. am: cf87fd5
...
am: 5eff28a
2016-04-10 06:40:36 +00:00
Yohei Yukawa
cf87fd5bed
Shorten title name so as not to hit char limit.
...
This is a follow up CL to my previous CL [1], which tried to rename a
settings item "Add virtual keyboard" but ended up with hitting char
limit in many languages. We decided to use "Manage keyboards" instead
so as not to hit char limit.
[1]: Id2ae61519152bbe622aa5915f728a4cbbc49e078
611410a8c4
2016-04-10 06:30:38 +00:00
Jason Monk
db3fcfb7cb
Merge "Settings tweaks" into nyc-dev
2016-04-08 20:46:49 +00:00
Jason Monk
be8d5aa2b9
Settings tweaks
...
Change-Id: I68829fa8e49534d4635a008c94dced3c7ab6f4b1
Fixes: 27834471
Fixes: 27834626
Fixes: 27567838
Fixes: 27834676
2016-04-08 16:44:31 -04:00
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
1d090c798f
Merge "Dashboard status cards UI."
2016-04-07 23:10:07 +00: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
Winston Man
6f250236dc
Amend icon size for delete work profile dialog am: 90aec18
...
am: bea2dd7
2016-04-07 09:51:20 +00:00
Winston Man
90aec184b4
Amend icon size for delete work profile dialog
...
Changes are referenced from
https://cs.corp.google.com/android/packages/apps/ManagedProvisioning/res/layout/device_manager_icon_label.xml
Fixed screenshot:
https://screenshot.googleplex.com/01qOjUp0rp8
Bug:27636781
Change-Id: Ib6cf303caa388a8b0d2b7664fd9828a8d2f67098
2016-04-07 09:42:11 +00:00
Maurice Lam
87da294262
Merge "Update fingerprint strings during setup" into nyc-dev am: a01e2b9
...
am: f312bd6
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
Clara Bayarri
ea8772a9c3
Add Keyboard Shortcuts Helper entry in Settings
...
Bug: 27811273
Change-Id: Ic4a97c869d6476bf427e41023dc595b39589e6ce
2016-04-06 14:55:49 +01:00
Jason Monk
9964504e51
Merge "Add dev options to set swXdp" into nyc-dev am: b22dd20
...
am: 51970c8
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
2016-04-06 11:07:55 +00:00
Victor Chang
b49c901f8e
Merge "Add button to trust a CA cert" into nyc-dev
2016-04-06 10:59:20 +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
Jason Monk
9300f59223
Merge "Add moar dividers" into nyc-dev am: da6ae85
...
am: ed84c11
2016-04-04 19:41:05 +00:00
Jason Monk
da6ae856a9
Merge "Add moar dividers" into nyc-dev
2016-04-04 19:29:55 +00:00
Jason Monk
3676b931d9
Add moar dividers
...
Bug: 27834471
Change-Id: I575040edcdf76124f21a667e64762acb86a65cb2
2016-04-04 13:20:59 -04:00
Julia Reynolds
5360308d18
Merge "Lowercase s." into nyc-dev am: b24cfaf
...
am: cf61f2e
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
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
Jeff Sharkey
a6ea5a4bdc
Merge "Mark UI components for tests to find." into nyc-dev am: 9069181
...
am: 6cd645a
2016-04-03 04:14:27 +00:00
Jeff Sharkey
9069181c84
Merge "Mark UI components for tests to find." into nyc-dev
2016-04-03 03:59:21 +00:00
Jeff Sharkey
a77652fea9
Mark UI components for tests to find.
...
Bug: 26498834
Change-Id: Id8ade0b9230a946c7facf8ebaf9700c196b31ee3
2016-04-01 23:18:11 -06: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
