Commit Graph

5065 Commits

Author SHA1 Message Date
Dianne Hackborn
ec74da60cd Add wake lock app ops to UI.
Change-Id: Id2f23acee08fa2830d3edc30a70abf06226ae4eb
2013-05-20 16:45:26 -07:00
Amith Yamasani
f88e6e5ae6 Don't mutate all instances of app icons in Settings
When adding color filters to an app icon in User Settings, don't
modify the original drawable state. Get a mutable drawable.

Bug: 9054675
Change-Id: I6ea374cb801abef3f5b597fda2e84b4e67cfa9d0
2013-05-20 16:05:22 -07:00
Eric Laurent
0c38f78040 Merge "Single volume control when config_useMasterVolume is true" 2013-05-20 19:13:46 +00:00
Amith Yamasani
7e8455bc09 am 5675f50c: am b96ebf9e: Merge "Load the avatar icon if it\'s not yet in the activity view" into jb-mr2-dev
* commit '5675f50cede90921c4a73cd94d191e39820a24d5':
  Load the avatar icon if it's not yet in the activity view
2013-05-17 17:41:31 -07:00
Amith Yamasani
5675f50ced am b96ebf9e: Merge "Load the avatar icon if it\'s not yet in the activity view" into jb-mr2-dev
* commit 'b96ebf9eed3df26e523055fde98913507e6b1a8a':
  Load the avatar icon if it's not yet in the activity view
2013-05-17 17:39:19 -07:00
Amith Yamasani
76738fa651 Load the avatar icon if it's not yet in the activity view
Save any changes that weren't committed yet, but don't restore
earlier cancelled changes.

Bug: 9008014
Change-Id: I8faacc42a3600d1338ddedb1b59f7307903743b4
2013-05-17 15:09:47 -07:00
Jaewan Kim
31a0a340b3 Single volume control when config_useMasterVolume is true
If config_useMasterVolume is true, all streams are considered as the
STREAM_MASTER. Hide all volume sections except a stream because they
are actually the same in this case.

Bug: 8505295
Change-Id: I9822feaad2d43468ceb4c7fdb97da4b677995992
2013-05-17 02:43:12 +09:00
John Spurlock
b555cebe63 am cea06adc: am 31ce86d3: Merge "Hide notification listeners setting if no listeners." into jb-mr2-dev
* commit 'cea06adce077d32c0c6dc2abb68cbae8bd1a82a7':
  Hide notification listeners setting if no listeners.
2013-05-16 08:40:05 -07:00
John Spurlock
cea06adce0 am 31ce86d3: Merge "Hide notification listeners setting if no listeners." into jb-mr2-dev
* commit '31ce86d3bd69a2c7e7bdfec3cf9317d53f7ec1df':
  Hide notification listeners setting if no listeners.
2013-05-16 08:38:25 -07:00
John Spurlock
31ce86d3bd Merge "Hide notification listeners setting if no listeners." into jb-mr2-dev 2013-05-16 15:36:27 +00:00
Amith Yamasani
4ebe028d53 am 010ab3bd: am e5fc4071: Merge "Return proper result code after creating pin/password lock" into jb-mr2-dev
* commit '010ab3bd92f17b634e962f4a4ea20f1bcc3490e6':
  Return proper result code after creating pin/password lock
2013-05-15 17:14:07 -07:00
Amith Yamasani
010ab3bd92 am e5fc4071: Merge "Return proper result code after creating pin/password lock" into jb-mr2-dev
* commit 'e5fc407146c3f09e3bcd55d907fdffe2d26f3c6d':
  Return proper result code after creating pin/password lock
2013-05-15 17:12:02 -07:00
Amith Yamasani
8d26ba45e3 Return proper result code after creating pin/password lock
When adding a new restricted profile, user must enter some lockscreen
security. For PIN/password, return the result code (instead of cancelled)
so that UserSettings can proceed with adding the profile.

Bug: 8909229
Change-Id: I3567d7dfac869e38762f9e2a45d8ec83c51fa657
2013-05-15 11:26:19 -07:00
John Spurlock
55dbdf68f9 Hide notification listeners setting if no listeners.
Hide the new notification listeners management setting when
no listeners using this API are available.

Bug: 8454150
Change-Id: Iae9f975e7b5a3cdf55ff7d0c6aea7e84166d53b3
2013-05-15 10:13:34 -04:00
Amith Yamasani
7f7a07d365 Merge "Use circular avatars wherever appropriate" 2013-05-13 23:07:00 +00:00
Amith Yamasani
b0b0b110c0 Use circular avatars wherever appropriate
Battery stats, Data usage and Running apps

Change-Id: Ib7f851e55ef7e44f18d3f8a2cd27f5f2204b0145
2013-05-13 16:01:20 -07:00
Robert Greenwalt
39da2f9129 am b2dccc41: am d5d61a0a: Merge "Remove wifi scan-always dialog." into jb-mr2-dev
* commit 'b2dccc418410cd2c35213fddb5da7dce1d91c47b':
  Remove wifi scan-always dialog.
2013-05-13 14:15:41 -07:00
Robert Greenwalt
b2dccc4184 am d5d61a0a: Merge "Remove wifi scan-always dialog." into jb-mr2-dev
* commit 'd5d61a0ab18c57cf2087d17f10d4d4569d968078':
  Remove wifi scan-always dialog.
2013-05-13 14:13:48 -07:00
Robert Greenwalt
7e59f73e9c Remove wifi scan-always dialog.
When wifi is switched off we no longer want a notification dialog
about scan-always, instead using in-panel text.

bug:8907190
Change-Id: I707f306a056068d92f69070873f1e6330b598b1e
2013-05-13 11:39:08 -07:00
Svetoslav
17c2e0e605 am 6b8c7e7c: am 7e554395: Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev
* commit '6b8c7e7c33fbf7d6425baf7003222b7603ac8ef5':
  Settings crashing if there are no installed accessibility services.
2013-05-08 15:05:28 -07:00
Svetoslav
6b8c7e7c33 am 7e554395: Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev
* commit '7e554395cbf3d3c1043e99fb080bd9148832c225':
  Settings crashing if there are no installed accessibility services.
2013-05-08 14:37:00 -07:00
Svetoslav
084fbc8107 Settings crashing if there are no installed accessibility services.
If there is no installed accessibility services and the user goes into
the accessibility settings section, the app crashes. This is due to a
lacking null pointer check against the list of installed services
returned by the accessibility manager. We should not have returned
null, rather an empty list - too late now, sigh...

bug:8871034

Change-Id: Id3800d398af83868862847fa7ed861a9dee61c8f
2013-05-08 12:14:18 -07:00
Satoshi Kataoka
2cb9f8a62a Merge "Fix the label for the personal dictionary settings" 2013-05-08 09:54:25 +00:00
Satoshi Kataoka
5e86985b3a Fix the label for the personal dictionary settings
Bug: 8859441
Change-Id: I18ae1e1d92e1280e1782685b99307f1e48ce8e66
2013-05-08 16:15:45 +09:00
Dianne Hackborn
6e91babeda Update UI to add new audio app ops.
Change-Id: I307d25bdd6bee2e7d7a9df32849ef206abaf2318
2013-05-06 16:13:34 -07:00
Romain Guy
eb90fc56b2 Add new GPU overdraw setting
Change-Id: I45404b37df382e51eea42de92535f49f870c98b2
2013-05-03 17:38:38 -07:00
Jake Hamby
2b5d30a4cf am 0c3cc878: am 18c4317b: Show correct A2DP connection status in Bluetooth settings.
* commit '0c3cc878586ef1caa3ac5a13a719dd9924cc0d1b':
  Show correct A2DP connection status in Bluetooth settings.
2013-04-30 17:18:08 -07:00
Jake Hamby
0c3cc87858 am 18c4317b: Show correct A2DP connection status in Bluetooth settings.
* commit '18c4317b93fce47109017efdab089dec4b01f790':
  Show correct A2DP connection status in Bluetooth settings.
2013-04-30 17:04:59 -07:00
Svetoslav
e8253dd8b3 Remove Auto-rotate screen setting if a required feature is missing.
It is possible that a device running Android does not support rotation,
for example a Google TV box. The change adds a check to the rotation
policy to take this into account.

bug:8051556

Change-Id: I60a2a35da148271a18873f6c70556dacab29dae9
2013-04-30 16:02:04 -07:00
Jake Hamby
18c4317b93 Show correct A2DP connection status in Bluetooth settings.
When BluetoothSettings is entered via QuickSettings while an A2DP
device is connected, we aren't showing the device connection
status in the UI, because the device list is created before we've
connected to the A2DP and Headset profile services, and we weren't
refreshing the device list UI after getting the callback for
onServiceConnected() and retrieving the list of connected devices.

Add a line to HeadsetServiceListener.onServiceConnected() to call
device.refresh() after we call device.onProfileStateChanged() to
refresh the device list UI. Also copy the logic into A2dpProfile's
onServiceConnected() callback so it will refresh the UI for any
connected A2DP devices.

The reason this bug doesn't show up when entering BT settings
from the main Settings screen is because the onServiceConnected()
callbacks happen before the device list is initialized, so the
UI items are created with the correct connection status. For the
same reason, the bug doesn't occur if the Settings app is already
running and we re-enter it via Bluetooth QuickSettings.

Bug: 8724247
Change-Id: I1a993636ecab18dd6e980e3b4d2485bbed256d74
2013-04-30 13:51:38 -07:00
Svetoslav Ganov
135d692639 Merge "Remove Accessibility shortcut if the shortcut is not available" 2013-04-30 17:17:13 +00:00
Kenny Root
3d9918c2e2 am 64914364: resolved conflicts for merge of 3c10f535 to jb-mr2-dev-plus-aosp
* commit '649143648073116b2ffb6af412b41ecec5280f86':
  Track change to JSSE provider
2013-04-30 09:01:44 -07:00
Irfan Sheriff
40ec92c4e0 am 3b22f4d2: am 3caffdb3: Merge "Add reminder about scan settings on wifi off" into jb-mr2-dev
* commit '3b22f4d2da535cd865e8dfd9f06f3ce273e20c0f':
  Add reminder about scan settings on wifi off
2013-04-30 08:54:23 -07:00
Amith Yamasani
ed03edb69b am 60167266: am f162efee: Prompt to set a screen lock when adding a restricted profile
* commit '60167266877d59407939a83c475e794e050c1e8a':
  Prompt to set a screen lock when adding a restricted profile
2013-04-30 08:54:00 -07:00
Satoshi Kataoka
5df3307309 Fix the title of the fragments of the personal dictionary settings
Bug: 8600958
Change-Id: I9b8bab21b144385bc2386e7fcb67e1c197f84113
2013-04-30 16:08:00 +09:00
Kenny Root
6491436480 resolved conflicts for merge of 3c10f535 to jb-mr2-dev-plus-aosp
Change-Id: Id4ab035f92f2a8bf1b1fefdfd22ba370e33e7829
2013-04-29 23:30:40 -07:00
Irfan Sheriff
3b22f4d2da am 3caffdb3: Merge "Add reminder about scan settings on wifi off" into jb-mr2-dev
* commit '3caffdb343ba0bcb71396c6077355b0606d2f9eb':
  Add reminder about scan settings on wifi off
2013-04-29 16:01:56 -07:00
Irfan Sheriff
3caffdb343 Merge "Add reminder about scan settings on wifi off" into jb-mr2-dev 2013-04-29 22:59:00 +00:00
Amith Yamasani
6016726687 am f162efee: Prompt to set a screen lock when adding a restricted profile
* commit 'f162efee8995c8d7a26992e72fe771c41b790e39':
  Prompt to set a screen lock when adding a restricted profile
2013-04-29 14:15:57 -07:00
Amith Yamasani
f162efee89 Prompt to set a screen lock when adding a restricted profile
Bug: 8735493

If there's no screen lock, prompt to take the user to set a lock.
On return, check if user set the screen lock. If so, add the restricted
profile, otherwise don't add it.

Fix a small layout issue: Bug: 8721209

Change-Id: I2a18fea50a1d810d6a7fa82038b460ca4e03d5a0
2013-04-29 14:10:06 -07:00
Amith Yamasani
5c460bbafe am b4a0838d: am b0171715: Three kinds of owner info - owner, user and profile
* commit 'b4a0838d08198fd93be99ce2907b3f9b70f0d7bc':
  Three kinds of owner info - owner, user and profile
2013-04-29 12:14:41 -07:00
Amith Yamasani
52351051e6 am 9649c3eb: am c5b03657: Merge "Save app toggle state as soon as possible" into jb-mr2-dev
* commit '9649c3ebbe08e310bdc42dbfce48b64d7246a202':
  Save app toggle state as soon as possible
2013-04-29 12:14:37 -07:00
Svetoslav
5334dbf090 am 7c2a89c9: am 4b43e21c: Merge "Scroll if an accessibility setting description does not fit the screen." into jb-mr2-dev
* commit '7c2a89c9f5f4c728b552a6ea64b312c2538854e4':
  Scroll if an accessibility setting description does not fit the screen.
2013-04-29 11:22:03 -07:00
Kenny Root
d76bc2248e Track change to JSSE provider
Change-Id: I25d6612b12ab46b1f5c88c400b95bba1c023398a
2013-04-29 10:43:00 -07:00
Irfan Sheriff
c591a8b95d Add reminder about scan settings on wifi off
Notify the user that scans will be available when
wifi is turned off

Bug: 8732391
Change-Id: If232bfb9f6c3976059bde11280318901c35161e7
2013-04-29 09:42:22 -07:00
Amith Yamasani
b4a0838d08 am b0171715: Three kinds of owner info - owner, user and profile
* commit 'b0171715876b672c94c8a5aaafde95ff47b234b4':
  Three kinds of owner info - owner, user and profile
2013-04-28 22:23:20 -07:00
Amith Yamasani
b017171587 Three kinds of owner info - owner, user and profile
Bug: 8736733

Put the summary "Restricted profile" under the user name in app restrictions panel.
Bug: 8736734

Change-Id: I6b724bd10a9246eb57831bffb737a48c01e0c285
2013-04-28 22:13:22 -07:00
Jaewan Kim
acb7583922 Remove Accessibility shortcut if the shortcut is not available
Bug: 8051556
Change-Id: Ic6b552e818a1bd2fea6fdae2e755f31420abfbe6
2013-04-28 12:09:25 +00:00
Jaewan Kim
2e41e3db43 Remove Airplane Mode setting if it's a stationary device
Bug: 8051556
Change-Id: I3a1d5d58573b8967ce40ccf8b76e24152fff6fb6
2013-04-28 12:09:25 +00:00
Amith Yamasani
9649c3ebbe am c5b03657: Merge "Save app toggle state as soon as possible" into jb-mr2-dev
* commit 'c5b036571ed2eeae73b0551848e7f7efdc016a52':
  Save app toggle state as soon as possible
2013-04-27 22:01:09 -07:00