Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,666 Commits 1 Branch 0 Tags
cd593615d4e658bbe5a337bafca445a3416bb7fe
Commit Graph

1623 Commits

Author SHA1 Message Date
Wei Wang
aa6e665a02 Fix misspell of "otherdevices" 
Bug: 12569650

Change-Id: I2c75ddfed22ded6a15291956c0c167acf6d67b0b
 2014-01-16 22:13:38 +00:00
Wei Wang
ab4029665b Merge commit 'f4f8d9f3' into manualmerge 
Conflicts:
	res/values/strings.xml

Change-Id: Ifbcd6ef2447dbb95aab0ed1971f63a16ecf8035c
 2014-01-14 23:42:41 -08:00
Wei Wang
eeb60f9473 Merge commit 'fc8d2556' into manualmerge 
Conflicts:
	res/values/strings.xml

Change-Id: Ia2a4480d13f5afae7ecef321dadf5c4686907d99
 2014-01-14 22:33:21 -08: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
Wei Wang
c0af0c4633 Merge "BLE peripheral mode (4/4): Settings change for advertising preference." 2014-01-15 01:43:37 +00:00
Wei Wang
eb56b9ccb8 BLE peripheral mode (4/4): Settings change for advertising preference. 
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
 2014-01-13 17:41:02 -08:00
Dianne Hackborn
5b6f59a072 Add "unaccounted" item to battery use UI. 
Kind-of informative.

Change-Id: I10d2ee1ad8fe598a1ce1989df6628da11b82d906
 2014-01-13 17:40:50 -08:00
Alan Viverette
dd6513d969 Merge "Additional captioning fonts" 2013-12-20 00:41:02 +00:00
Alan Viverette
7f9781b559 Merge "Additional caption settings for edge styles and window color" 2013-12-20 00:40:53 +00:00
Dianne Hackborn
fb03058dc9 Update to follow BatteryStats. 
Change data use to be based on packets instead of bytes.

Change-Id: I536dd2c2fc3fbeb12689e793f79e5fac984fe3af
 2013-12-19 13:10:25 -08:00
Alan Viverette
d07c16107d Additional caption settings for edge styles and window color 
Change-Id: Ib967bc566a7b8f7674c696fc05d799e12269ec42
 2013-12-19 11:31:36 -08:00
Alan Viverette
65a6ef6f34 Additional captioning fonts 
Change-Id: Ib3298f65b602d581fa031576c3b9026bfd6a8672
 2013-12-19 11:30:48 -08:00
Andres Morales
ef693b5707 Merge "Settings for NFC Unlock" 2013-12-12 17:38:26 +00:00
Alan Viverette
24ef59737b Remove dialog offering to download TalkBack 
GMS devices are required to have at least one accessibility service
installed, and AOSP devices will not have Play Store, so this dialog
is obsolete.

BUG: 10429642
Change-Id: I08db466b305a4a73c35325656d143afdfcecf061
 2013-12-10 13:19:13 -08:00
Andres Morales
fd2b629335 Settings for NFC Unlock 
Change-Id: Ifaa2717da6c364daa7af073e42fc8f6a097c14bb
 2013-12-06 13:50:26 -08:00
Alan Viverette
205cee4c1c Add preference for caption text opacity 
BUG: 11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
 2013-12-05 11:27:40 -08:00
Jeff Brown
8dd9b71f7c am 169e8a0c: am 017d2a18: am 130118d4: Add help url for remote display. 
* commit '169e8a0c2aee26731a847a46954d95a78161ecd8':
  Add help url for remote display.
 2013-11-18 19:13:24 -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
9bac99e9c4 am 5569a8f4: am 9c8a463c: am beb9a03b: Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev 
* commit '5569a8f48c742aa2aded408d0b3e8de7a0cba172':
  Remove hardcoded msgid.  We have already leveraged in TC.
 2013-11-15 12:03:39 -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
7662c1f21f am 03360cd2: am 196bc5c6: am e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev 
* commit '03360cd23910c73c78a822c559acb3eb66a8e07b':
  Show correct message for a print job that is being canceled.
 2013-11-14 22:34:13 -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
e58dda114c am be6858e8: am 8174aad5: am 36f98428: Merge "Update cast screen strings." into klp-dev 
* commit 'be6858e86f2bf89832e63a7a51663ac6cd13aab0':
  Update cast screen strings.
 2013-11-14 17:37:31 -08:00
Jeff Brown
b960c74673 Update cast screen strings. 
Bug: 11257292
Change-Id: I280f99bb91ebd0badd06b7fdca25aa3f2e96d201
 2013-11-14 16:04:13 -08:00
Jeff Brown
57cf0e6671 am bf2f9612: am 3aedfdfd: am 81ed0438: Finalize assets for screen cast. 
* commit 'bf2f96123fde3d1433ac18a072832b5f0f6a604f':
  Finalize assets for screen cast.
 2013-11-13 09:05:55 -08:00
Jeff Brown
81ed043857 Finalize assets for screen cast. 
Bug: 11257292
Change-Id: I483496b4fc92bcf8e2c4f080a5a5d5bf97318b5d
 2013-11-13 00:43:30 -08:00
Wei Wang
5cc44ae3d0 Add ble settings strings. 
Change-Id: If8685aac2f36f56a534f3ba47b1cc60fed88a8a3
 2013-11-12 17:29:32 -08:00
Jeff Brown
71504b1f71 am 0df39f39: am 2fba8be9: am 4e54c2a1: Integrate remote display routes into screen cast settings UI. 
* commit '0df39f39fcc45ff3efe92740ee46d7a762410b86':
  Integrate remote display routes into screen cast settings UI.
 2013-11-11 20:51:05 -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
f2f1ad9cdd am 12a2c408: am 36ddea8c: am 5b7111d0: Merge "Remove line break." into klp-dev 
* commit '12a2c40871e2c9d965b0e9e1dbde5e00709f7b0a':
  Remove line break.
 2013-11-05 18:59:12 -08:00
Jason Monk
492c8ef15e am 58f53f9c: am c85359ef: am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev 
* commit '58f53f9c351329bf51bb548409c047e024d94fc4':
  Add PAC UI to Wi-Fi Settings
 2013-11-05 18:59:11 -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
Amith Yamasani
6882329f96 am e34608d4: am f7f6e4bf: am 060d5fd1: Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev 
* commit 'e34608d4603dfe18b189fae8806f8d22aa9ae84b':
  Adjust power control widget minWidth to occupy 4 cells.
 2013-11-05 15:53:29 -08: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
64217355be am b557b89c: am 01b7ae29: am 83671ff8: Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev 
* commit 'b557b89c4dde4c760b1ce7c6317d3077378692e0':
  Display remaining attempts when using or changing SIM PIN
 2013-10-25 09:54:35 -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
Vineeta Srivastava
7531e1b153 am 4a66909a: am 7a40def1: am 47963424: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev 
* commit '4a66909a6aae9d35ebc13fb377a41e525bd0f6c9':
  Remove Manage Mobile Plan when config_show_mobile_plan is set to false
 2013-10-23 16:17:13 -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
f31559601c am 7077e646: am 75099b67: am cace3d8d: Modified the strings according to the specs 
* commit '7077e6460e393e567d3b80da6190ff1ebe7d834a':
  Modified the strings according to the specs
 2013-10-21 16:06:09 -07: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)
deb0a156bb Resolved conflicts for merge of 67e72aa4 to master 
Change-Id: Ib3904427c8f6bcc19895b39e4ce65eaa626e8396
 2013-10-15 13:37:35 +01: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
Alan Viverette
7ec57940c0 Update color blindness descriptions for translation 
BUG: 11079175
Change-Id: I4498613c4ce796c2b86de714aebcf7397dffc7c8
 2013-10-10 17:34:08 -07:00
Nick Kralevich
a5418e33e3 Fix build. 
I have no idea if this is an appropriate change, but it's the
smallest patch I could come up with that lets the code compile.

Change-Id: I363386a23cd70f7a1207c5711d2e4b92e8e23937
 2013-10-09 08:57:19 -07:00