Commit Graph

1596 Commits

Author SHA1 Message Date
Wei Wang
41f5437def DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
This is cherry pick from master/klp-dev changes.
This reverts commit eb56b9ccb8.

Conflicts:
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java

Change-Id: I2ce6b9eb0e335ba1b9aa4e1cb61a041f00d9aa87

Conflicts:
	src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java
2014-03-19 22:37:27 -07:00
David Braun
c07376380f am 63ac6a06: am edcb923d: Add string parameter order to default SMS dialog text
* commit '63ac6a06efd39078b3fc066896fc7ea003ab34ce':
  Add string parameter order to default SMS dialog text
2014-03-14 16:28:00 +00:00
David Braun
edcb923df6 Add string parameter order to default SMS dialog text
Bug: 13433191 cs - Android - Other: Swapped placeholders in Hangouts confirmation message, reverse m
Change-Id: I8d00c58e5000b3851304d48c4681f9ebe2eebec8
2014-03-13 11:20:48 -07:00
Alan Viverette
429720754d am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '0100a310d8184baf9576925d160f8af09aa93b10':
  DO NOT MERGE Add preference for caption text opacity
2014-03-13 10:01:45 +00:00
Alan Viverette
8840aa4c40 Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev 2014-03-11 02:11:52 +00:00
Alan Viverette
00f221dc9e DO NOT MERGE Add preference for caption text opacity
BUG: 11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
2014-03-07 14:06:29 -08:00
Wei Wang
1a188f4075 DO NOT MERGE Change bluetooth off display message.
Cherry picking ble advertising changes from master to KLP MR2.
b/13137996

Change-Id: I71ef30fbb005c60efe1497a33d1758be07c7f1a8
2014-03-06 18:45:35 +00:00
Wei Wang
f4f8d9f346 BLE peripheral mode (4/4): Settings change for advertising preference.
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
2014-01-14 18:06:42 -08:00
Wei Wang
fc8d255671 Add ble settings strings.
Change-Id: If8685aac2f36f56a534f3ba47b1cc60fed88a8a3
2014-01-14 18:06:32 -08:00
Jeff Brown
130118d436 Add help url for remote display.
Bug: 11736504
Change-Id: I83d278731cf853ff911ff1a8b82a942881cb4727
2013-11-18 17:58:08 -08:00
Baligh Uddin
e62490c3be Remove hardcoded msgid. We have already leveraged in TC.
bug:11696928
Change-Id: I71beb961ff73902cf5a67c5de1175db30eaa0871
2013-11-15 11:21:11 -08:00
Svetoslav
e7b781f574 Merge "Show correct message for a print job that is being canceled." into klp-dev 2013-11-15 06:23:54 +00:00
Svetoslav
97e962cd36 Show correct message for a print job that is being canceled.
1. If a print job is being canceled we now show appropriate
   message that matches what the notification shows.

2. If a print job is being canceled we do not show the cancel
   button.

bug:11696928

Change-Id: I0fc4f8226c4aa9acd6a4b65811f4228e56018315
2013-11-14 18:15:19 -08:00
Jeff Brown
b960c74673 Update cast screen strings.
Bug: 11257292
Change-Id: I280f99bb91ebd0badd06b7fdca25aa3f2e96d201
2013-11-14 16:04:13 -08:00
Jeff Brown
81ed043857 Finalize assets for screen cast.
Bug: 11257292
Change-Id: I483496b4fc92bcf8e2c4f080a5a5d5bf97318b5d
2013-11-13 00:43:30 -08:00
Jeff Brown
4e54c2a177 Integrate remote display routes into screen cast settings UI.
Merged remote display route selection into the existing wifi
display preference UI.  Moved the on/off toggle over to a menu item.

The preference page is now mainly implemented in terms of the
media router.  It only interacts with the display manager for the purpose
of pairing with new devices or making wifi display certification
controls available.

This means that the observed state is now completely consistent across
the system ui, settings, and applications that use the media router.

Bug: 11257292
Change-Id: I3705570812384fef4bfffeccaaccf7895d370d12
2013-11-10 21:20:16 -08:00
Geoffrey Borggaard
5b7111d05d Merge "Remove line break." into klp-dev 2013-11-06 02:37:48 +00:00
Jason Monk
4e42c80872 Merge "Add PAC UI to Wi-Fi Settings" into klp-dev 2013-11-06 02:20:50 +00:00
Jason Monk
070f3560d5 Add PAC UI to Wi-Fi Settings
Now when a PAC URL is set it shows it in settings rather than the proxy
spinner set to None.  This should only be visible in EDU users as only EDU
has PAC.

Bug: 11528608
Change-Id: Ie4bad8ea935f0a8f1bb7877eb2be146e06d71c2d
2013-11-05 14:39:44 -05:00
Geoffrey Borggaard
03c56a95d3 Remove line break.
The "network may be monitored" message had an extra line break.
Bug: 11534572

Change-Id: I7a0e9845413f2e5787ca60ad9e2f8988eed207a6
2013-11-05 13:10:49 -05:00
Amith Yamasani
49f9a444f3 Adjust power control widget minWidth to occupy 4 cells.
Bug: 10561000
Change-Id: I9a4312d956581059ea43077c5228e43e2bd1c7a5
2013-11-01 17:17:08 -07:00
Wink Saville
83671ff815 Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev 2013-10-25 16:41:09 +00:00
Wink Saville
8246579fa1 Display remaining attempts when using or changing SIM PIN
Bug: 9928717
Change-Id: I73718c9e6a8aa7244097e0dd4593a6226ff0ac08
2013-10-23 17:07:10 -07:00
Sungmin Choi
2490315e49 Remove Manage Mobile Plan when config_show_mobile_plan is set to false
config_show_mobile_plan is set to true by default.
When you don't want to show "Manage mobile plan" set config_show_mobile_plan to false in overlay.

Bug: 10819853
Change-Id: Ic3c69fb4246cc0de38518ef6c9950cee7fa4d987
2013-10-23 21:29:14 +00:00
Lifu Tang
cace3d8d28 Modified the strings according to the specs
- Fix b/11290711

Change-Id: I23827ad5bef4cf4bda14bb08f0e502cc4e9d2727
2013-10-18 17:49:47 -07:00
Torne (Richard Coles)
0bf324c628 Remove experimental WebView setting.
The experimental WebView is no longer experimental; remove the setting
from the settings app.

Bug: 10427705
Change-Id: Iaad17b132f21cad3d32ee5800a9274863962cc87
2013-10-14 17:35:43 +01:00
David Braun
1c17255d5e Block "SMS Default Dialog" on non-phone devices
This change also handles the case where getDefaultSmsApplication returns
null more elegantly, though this is only really possible on a device that
is a tablet (blocked earlier in the method) or a phone device that had no
SMS apps at boot (when we force the setting of an SMS app.)

Bug: 11072894 People app should not launch into default SMS app on tablets
Change-Id: I1e253873e053c21bc1652bd03d7b486aaf9be5e1
2013-10-07 09:35:52 -07:00
Svetoslav
672b845eec Merge "Polish print settings accessibility." into klp-dev 2013-10-02 23:48:07 +00:00
Svetoslav
24e49f0613 Polish print settings accessibility.
bug:10983508

Change-Id: I986e28a2cd8e52b7c8422e825de9174d6e2377c3
2013-10-02 15:16:16 -07:00
Christopher Tate
e7358028d1 Merge "Back out of Home settings when penultimate home app is uninstalled" into klp-dev 2013-10-02 22:11:50 +00:00
Lifu Tang
b581a08f9f Modified suggestion string for battery-saving mode
- Fix b/11009797

Change-Id: I55a890348ec2d3ec79956306b65e58449d88dbd3
2013-10-02 13:56:06 -07:00
Christopher Tate
e0d934fcb1 Back out of Home settings when penultimate home app is uninstalled
When the user deletes the last-but-one, there's nothing more that
they can do in Home settings (and we'll be suppressing it from the
top level of the Settings UI as well), so we now back out with
a dialog explaining the situation.

Bug 10918801

Change-Id: Id03169dace976f7de639e3b3ab3d50ed161258d8
2013-10-02 13:26:36 -07:00
Lifu Tang
5ab9fa432d Renamed "App settings" back to "Location services"
- Fix b/10610559

Change-Id: Id98a1b4e8d04238f371322fe6232647fa13b5c4a
2013-10-01 12:29:17 -07:00
Maggie Benthall
490e072c84 Merge "UX tweaks for CA cert monitoring" into klp-dev 2013-10-01 15:45:25 +00:00
Svetoslav
1b881bcc41 Merge "Show appropriate empty state if not printers are found." into klp-dev 2013-10-01 00:25:35 +00:00
Svetoslav
033b5739ba Merge "Remove Google Play specific search URIs from Settings." into klp-dev 2013-09-30 23:41:08 +00:00
Svetoslav
9a2ace9587 Show appropriate empty state if not printers are found.
One can search for printers in the print service settings
and we need to show appropriate empty state if none is found.

bug:11009053

Change-Id: If3ed6aa3a5e2eb4d7f7bae37f885e4b8eb0909b4
2013-09-30 16:22:33 -07:00
Svetoslav
5c30529368 Remove Google Play specific search URIs from Settings.
1. If there are no installed print services or NFC payment services,
   we would like to allow the user to search for one in Play. However,
   Play is Google specific and we should not have hard coded URI that
   rely on it in settings. Declare secure settings for each of these
   URI and check at runtime if the URI is non-empty, then show the
   add menu item.

bug:11011519

Change-Id: I2c5cb172015bbecd7d2f8ffd3cb7fd790b01dab8
2013-09-30 15:59:46 -07:00
David Christie
07301cf157 Change location settings "Device sensors" to "Device only" (b/10992469).
Note this is the minimum change for things visible to the user.
I double checked the accessibility string description and it is still
valid as is (it says "Use GPS to pinpoint your location").
We can also change the internal code variable names to not say "sensors"
but I would suggest doing this after KLP as is a noop in UI.

Change-Id: I2f747a42388a82e30c59b4b6e91849c5d590e1af
2013-09-30 12:33:09 -07:00
Russell Brenner
93e6a023c5 Merge "Set divider color for light theme" into klp-dev 2013-09-27 22:41:33 +00:00
Martijn Coenen
86f74d2ad4 Merge "Tap & pay: change empty state UX and strings." into klp-dev 2013-09-27 22:37:37 +00:00
Martijn Coenen
b412e18296 Tap & pay: change empty state UX and strings.
Bug: 10965661
Change-Id: Iee0b8bf111ef2105babb0912942f5c764b75ac59
2013-09-27 14:51:46 -07:00
Russell Brenner
2ef377d47d Set divider color for light theme
Bug: 10928581
Change-Id: I5586cae0ef2c49f5297f94bb7fb6ddede9d64b76
2013-09-26 16:07:52 -07:00
Svetoslav Ganov
bc2c3db8f9 Add print job settings screen.
Added a list of active print jobs to the main print settings
screen. Selecting a print job from there leads to a print job
settings screen with more information about the print job and
actions to change the prit job state such as cancel and restart.

bug:10935736

Change-Id: Idd6826a998309941c3d8478dafe4b039c8ca4f45
2013-09-26 13:58:59 -07:00
Martijn Coenen
0e940d6c00 Latest UX for Tap & pay.
Bug: 10862185
Change-Id: I4344f70533a69d422159547c58bbc981f4d889ca
2013-09-25 15:01:24 -07:00
Dianne Hackborn
88cf7709cb Implement issue #10895990: Better durations for proc stats
Add new option to select data duration to show, with the default
being 3 hours.

Reworked how menus are updated to remove redundant code.

Switch to using new proc stats service API for retrieving stats,
which is more efficient and won't hit IPC limits.

Fixed layout for details items to ellipsize long items.

Change-Id: I1a0f8a4adf8fc330c2639077323c6379d23ad987
2013-09-23 15:02:13 -07:00
Lifu Tang
c9ebf9bbad Merge "Change "Device sensors only" to "Device sensors"" into klp-dev 2013-09-21 00:10:11 +00:00
Lifu Tang
db4ee54975 Change "Device sensors only" to "Device sensors"
- Fix b/10856635

Change-Id: I52ef1daacc205c50056fcead0e6b07c8674275f0
2013-09-20 16:57:18 -07:00
Jim Miller
de105da550 Merge "Change string documentation for widget setting to be more clear." into klp-dev 2013-09-20 20:03:52 +00:00
Jim Miller
7c41e5ec10 Change string documentation for widget setting to be more clear.
Fixes bug 10505288

Change-Id: I6a375c710b77db845073fffa6ebf15c1cd262900
2013-09-20 13:01:20 -07:00