Commit Graph

1067 Commits

Author SHA1 Message Date
Dianne Hackborn
ea0565cc25 am 80859c27: am 821a4d8c: Merge "Settings to control traces." into jb-dev
* commit '80859c2792eb537cdcbf4be50d5cc11bb9166ccf':
  Settings to control traces.
2012-05-09 01:54:41 -07:00
Kenny Root
406ada6f06 am b9b2655f: am 267d43e6: Merge "Revert "Make verifier device id information visible"" into jb-dev
* commit 'b9b2655f14db5acd7e28a378e948a9424a21f2f9':
  Revert "Make verifier device id information visible"
2012-05-09 01:54:39 -07:00
Jean Chalard
819a65968f am 1d9e8f88: am be07e49a: Implement the "add word" screen according to new spec
* commit '1d9e8f88b587770fd405a62268a4cfb8322927b6':
  Implement the "add word" screen according to new spec
2012-05-09 01:54:34 -07:00
Dianne Hackborn
821a4d8c34 Merge "Settings to control traces." into jb-dev 2012-05-08 18:55:30 -07:00
Kenny Root
2f926bbb00 Revert "Make verifier device id information visible"
This reverts commit 498fbe470e.

Conflicts:

	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java

Bug: 6438155
Change-Id: I3ab866d0a269e355388bb3ef41737a7d097df8f6
2012-05-08 16:25:49 -07:00
Dianne Hackborn
34481b9cd4 Settings to control traces.
Also some re-organization of the debug options, and check for
the case where the global debug setting is turned off but there
are some debug options turned on (in which case we just switch
to the global option being on).

Change-Id: I710e3a009e2be9c7c1a1879a853ac736abf1d8d8
2012-05-08 15:42:53 -07:00
Jean Chalard
be07e49a92 Implement the "add word" screen according to new spec
This is only the interface. It doesn't do anything yet, so as to
avoid a too large change.

Bug: 6026080
Change-Id: I0c7f0c09f71e01b18fcb3566a3c6c4b0f0b2a0fc
2012-05-08 20:10:51 +09:00
Isaac Levy
e7c0d66e26 Fixed 'upto' spelling in WPS messages
Change-Id: Ib8c627235de0455c6f239bff77e70080e3080d3d
2012-05-07 16:41:47 -07:00
Jeff Sharkey
37c222fdf0 Better messaging when Wi-Fi disabled.
Bug: 6443166
Change-Id: I262e559e5c209d3f1959d5d2ab9a2aebb8180c59
2012-05-04 10:26:58 -07:00
Brian Carlstrom
81d7a806a6 Do not reuse master_clear_gesture_* strings for credential installation confirmation
Bug: http://code.google.com/p/android/issues/detail?id=29367
Change-Id: I3b651bc84f22b48d651802115600ab4e256bb3a6
2012-05-01 11:18:12 -07:00
Amith Yamasani
4cc1c7a234 Merge "Move tether settings help to menu and remove local assets." into jb-dev 2012-04-30 13:37:32 -07:00
Irfan Sheriff
d6d65741f9 Merge "Fix WPS string" into jb-dev 2012-04-28 10:51:18 -07:00
Irfan Sheriff
f911f8fc06 Fix WPS string
Change-Id: I5d45863c868c627fc48eefe1e15cb737b694d8ac
2012-04-27 20:30:24 -07:00
Amith Yamasani
d3fed687e7 Move tether settings help to menu and remove local assets.
Bug: 5270092

Using web help instead of local assets.

Change-Id: Ib93e72443b30367521febc43279422ec130efbd5
2012-04-27 17:38:40 -07:00
Romain Guy
4c428f9e83 Merge "Add three new developer settings" into jb-dev 2012-04-27 15:29:59 -07:00
Romain Guy
c1fa3e64b8 Add three new developer settings
- Show hw screen updates: show where apps udpate the screen when running with
  hw acceleration
- Profile hw rendering: add extra profiling info to dumpsys gfxinfo for
  performance tracking
- Debug layout: show layout info on screen

Change-Id: I6f7cad762d65ec3be2debfb4a88c25d35bf11079
2012-04-27 15:27:54 -07:00
Irfan Sheriff
68389e75a5 Merge "Allow p2p device rename" into jb-dev 2012-04-27 09:55:45 -07:00
Irfan Sheriff
97617ce89e Allow p2p device rename
Change-Id: Ib61425da344f955b0a583716516181bdfbd4b504
2012-04-26 16:39:10 -07:00
Russell Brenner
fc5dd2cbf0 Restore look of Wi-Fi panel for Setup Wizard
As part of the Wi-Fi refresh, this CL hides the action bar, menu, and
Settings icon in the context of the Setup Wizard. Dead code related
to WifiSettingsForSetupWizardXL has also been removed.

Bug: 5364589
Change-Id: Ib6716500153879b939a18a7007f1f6521b73890b
2012-04-25 16:31:23 -07:00
Michael Jurka
c9029d99a3 New API to allow third-party apps to bind widgets
Change-Id: Ieec9f247fdbfc02c2ad8f5bb7f6b9efe0669af84
2012-04-24 18:52:53 -07:00
Amith Yamasani
b0b37ae21c Help menus for several screens.
Bug: 5144896
Change-Id: Ib2f5146f6f62f2a33261bb165c3bf1bf13b22f38
2012-04-23 15:35:36 -07:00
Daniel Sandler
4a824be44c Add notification shutoff switch to app details page.
Requires change Ieccac574.

Bug: 5547401
Change-Id: I9856658cc638723414a5c2c3c6807241c3ce6166
2012-04-23 04:53:14 -07:00
Jeff Sharkey
d4260682b7 Fix menu string lengths.
Bug: 5497620
Change-Id: I0b4c2cbae8a5cc83ba67355c465c30e5177e8a01
2012-04-22 16:06:22 -07:00
Jeff Sharkey
34e964dcff Hide tab when disabled, metered strings, fixes.
Hide "Data usage" item when kernel support isn't available and
enabled.  Change "restrict background" strings to reflect metered
status.  Hide app settings button when no package found.  Always
start limit sweep above any warning.  Imply metered state for
networks with limits.

Bug: 6303364, 5465643, 5379686, 6376276, 6368329, 6376276
Change-Id: I4faccc9a50f2f741fd937bb8c361a3ca055135e2
2012-04-21 15:41:48 -07:00
Irfan Sheriff
8addf86c3c Merge "Add Nsd settings checkbox" 2012-04-19 09:57:33 -07:00
Irfan Sheriff
536c3d7651 Add Nsd settings checkbox
Change-Id: I58e54a8bed02ed7bd99b0f284279b6c799e3369f
2012-04-18 16:14:20 -07:00
Eric Fischer
b11b9abf95 Restore deleted string still referenced from XML.
Change-Id: I2a1384db53b5670815503076f28b89712b8c9c00
2012-04-18 15:26:18 -07:00
Jeff Brown
aae7f693ea Merge "Add label for default keyboard layout." 2012-04-17 14:29:29 -07:00
Jeff Brown
512d0cb3eb Add label for default keyboard layout.
Bug: 6110399
Change-Id: I2431b99884cbd01de32f8cd6c14a3afbd18b5020
2012-04-17 13:55:15 -07:00
Jake Hamby
494f646a30 Remove "Searching/Tap To Pair" text from Bluetooth Settings.
The second text field next to "Available devices" in the Bluetooth
Settings device list creates a cluttered heading that wraps to multiple
lines in some locales. It's unnecessary because there's a graphical
progress spinner when searching for devices, and "Touch to pair" is
easily discoverable. Remove the second text field and the "Searching"
and "Touch to pair" string resources.

Bug: 5496221
Change-Id: I7b71222415152014426cf54fc112fe5379d350dc
2012-04-16 16:34:01 -07:00
Irfan Sheriff
afdadec674 Merge "Wifi: Update message when scan result is empty" 2012-04-13 22:12:57 -07:00
Vishal Mahaveer
6243e8e466 Wifi: Update message when scan result is empty
Handle case when Wi-Fi scan result is empty

Change-Id: I03ccbf2603367efa3c6dfe20514e8c7c5a68b5d9
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
2012-04-13 21:45:38 -07:00
Jeff Brown
08c9dcc083 Merge "Add setting to redirect vibrator to game controller." 2012-04-13 20:40:06 -07:00
Jeff Brown
f8fb0e5b24 Add setting to redirect vibrator to game controller.
Bug: 6334179
Change-Id: I62c9c163aa4ee2c88286daee77641418869a1dab
2012-04-13 20:27:45 -07:00
Jeff Sharkey
e557c3349e Show data restricted apps, unify strings.
Always show apps with background data restricted, even when not
used in selected time period.  Combine measurement disclaimer into
single string, and only show for mobile networks.  Unify limit
dialog string.

Bug: 6007276, 5505010, 5495020, 5456087
Change-Id: I0ec307b330838dc9528d7e63e0ac1edd14ba122c
2012-04-13 19:45:02 -07:00
Irfan Sheriff
d723367a6b Merge "Add support for cancelling connection" 2012-04-09 14:29:14 -07:00
Irfan Sheriff
c08caf7a33 Add support for cancelling connection
Change-Id: Iba4a002ab86e62d87ae1175b75c203d3a86ad7c6
2012-04-06 15:28:57 -07:00
Amith Yamasani
96b5ce8419 Merge "Update strings and character limits for some new strings" 2012-04-06 12:00:01 -07:00
Amith Yamasani
86ad15e741 Update strings and character limits for some new strings
Bug: 6243599
Bug: 6247318
Change-Id: Iaab4f6a2b55b7ee18804a3dcf8a0d00e67627e57
2012-04-06 11:59:02 -07:00
Jeff Sharkey
f35dd41da2 Merge "Controls to set expensive (metered) networks." 2012-04-05 16:18:00 -07:00
Jeff Brown
e46c5f30ca Add new settings UI to select keyboard layout.
Bug: 6110399
Change-Id: Ib2758bdcdd6b271be402f46c56d41619dc7aecb9
2012-04-05 14:41:41 -07:00
Jeff Sharkey
313f7d8c57 Controls to set expensive (metered) networks.
Add UI to change metered flag on NetworkPolicy, and support Wi-Fi
policies per-SSID.  Create Wi-Fi policies as needed, but leave cycle
undefined.

Only show and mutate mobile policies when SIM state is ready.

Bug: 3001465, 3291052
Change-Id: I481a202fe0e68fc2f5adfd3b3a6f40347d2b168c
2012-04-05 14:31:43 -07:00
alanv
9d085307bb Changed text for "accessibility script injection" preference.
Change-Id: I8afc786f47b88bde3212f38683c813771e70af6b
2012-03-30 13:42:37 -07:00
Amith Yamasani
b810a0ddf9 User management screens
Customized Settings for restricted users
- Only some top-level settings panels available

User management
- Primary user can add and remove users
- User details screen to change name and list of enabled apps

Change-Id: Ia6beb991b427197a4ec2724ca3c9222073f6cf7d
2012-03-27 12:06:29 -07:00
Danielle Millett
e610246c21 Fixed the build: Put tablet version of string before default.
Change-Id: I96d48bc82c5e61a6ac7ec04374caf58042fd49c0
2012-03-22 11:46:19 -04:00
Danielle Millett
a87a25bdec Added a liveliness check box preference for Face Unlock.
This will be used to enable or disable liveliness detection.

Change-Id: I0be735724aed4cadbd5c37d895a7f80ad4f4ee09
2012-03-21 13:32:56 -04:00
Jason Chen
36f00b36c6 am bb4133b1: am dd6c0d61: am 23d0b528: Update string in Settings
* commit 'bb4133b1f6c88cb5cf0232ef5febe470f2665257':
  Update string in Settings
2012-03-20 17:55:07 -07:00
Irfan Sheriff
5fe6069399 Merge "Add static ip/proxy support for hidden networks" 2012-03-20 14:42:03 -07:00
Jeff Sharkey
11d3012c78 Enforcement control for READ_EXTERNAL permission.
Surface enforcement controls for READ_EXTERNAL_STORAGE permission
using new PackageManager API.

Bug: 6131916
Change-Id: I0ece4742666fda58e41410cb4b0b7175f280fa31
2012-03-19 17:23:01 -07:00
Irfan Sheriff
d61f7cd3aa Add static ip/proxy support for hidden networks
Add support for static ip and proxy. In the process, clean up the issues
that showed up during testing.

Bug: 5459872
Change-Id: I96c8fff816b6cbb485d2bb215349193e49f3d0b2
2012-03-19 16:05:49 -07:00