Commit Graph

6509 Commits

Author SHA1 Message Date
Dianne Hackborn
f09fd458c4 Merge "Fix issues in Settings: 16660423, 13172381, 16868094" into lmp-dev 2014-08-11 16:46:29 +00:00
Dianne Hackborn
1cf2077c37 Fix issues in Settings: 16660423, 13172381, 16868094
Issue #16660423: Stability: ArrayIndexOutOfBoundsException in settings:
at com.android.settings.fuelgauge.BatteryHistoryChart$ChartData.draw(
BatteryHistoryChart.java:109)

Issue #13172381: No content description in Battery charging section

Issue #16868094: Settings crash on switching to landscape mode with
"Google Text-to-speech" settings icon selected

Change-Id: I94d0e83f72d571eb90aad6742acabce56c0298ec
2014-08-10 16:32:08 -07:00
Barnaby James
092c62f1f3 Add voice-only settings activities for airplane mode.
This activity can only be triggered through the Voice Interaction API - e.g. from calling VoiceInterationSession.startVoiceActivity()

Change-Id: I39ac409824693bc82e53d707a1ece2b23a89f3a3
2014-08-08 21:01:01 -07:00
Alexandra Gherghina
ad54ba7030 Merge "Show managed profile under accounts rather than users" into lmp-dev 2014-08-08 20:34:05 +00:00
Alexandra Gherghina
83adb564de Show managed profile under accounts rather than users
Also fixes overflow menu to update on remove/add managed profile.

Bug: 16234745
Bug: 16727076
Change-Id: I3283a8fa0096edfce5aad633e09ba3eed6d2174c
2014-08-11 10:02:13 +01:00
Alexandra Gherghina
59f01b9b58 Merge "Fix updating view flow of Account Sync Settings" into lmp-dev 2014-08-08 18:15:47 +00:00
Alexandra Gherghina
d4353db21c Fix updating view flow of Account Sync Settings
Bug: 16785070 Account sync settings page doesn't refresh after removing account
Change-Id: Iddbe9d73f4d6fcb55829f8bb6ab2fe6ffa147cf3
2014-08-08 18:14:34 +01:00
Adam Lesinski
ff72b3ee55 Merge "Update to use new UsageStats API" into lmp-dev 2014-08-08 18:15:47 +00:00
Fabrice Di Meglio
4fbe967e0f Merge "Fix bug #16578018 Wi-Fi network list items should be centered with icons" into lmp-dev 2014-08-08 20:31:22 +00:00
Fabrice Di Meglio
cba834dedf Fix bug #16578018 Wi-Fi network list items should be centered with icons
- force correct refresh of the Preference summary
- put some non used code into comment ...

Change-Id: I17fc6fe2cf0717bae613d78cfac2c88d3e160ef4
2014-08-08 13:55:58 -07:00
Adam Lesinski
1789f7d236 Update to use new UsageStats API
Change-Id: Ic6f9523c4c70f8b832d8f57551417f4f19ea144f
2014-08-07 21:30:52 -07:00
Fabrice Di Meglio
09076e5f3c Merge "Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots" into lmp-dev 2014-08-08 17:26:08 +00:00
Fabrice Di Meglio
22a2a49b44 Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots
- add the proper SearchIndexProvider to SimSettings
- allow indexing only an only if showSimCardTile() is true
- add Utils.showSimCardTile()

Change-Id: I5df2284d32f91fa454e1edebf1139d00593138a0
2014-08-08 12:33:21 -07:00
Jeff Sharkey
dc16286ff3 Merge "Avoid NPE when template rapidly switched." into lmp-dev 2014-08-07 18:39:40 +00:00
Jeff Sharkey
d0a5531576 Avoid NPE when template rapidly switched.
Monkeys can race and end up swapping template before the dialog
is shown.

Bug: 16660160
Change-Id: I301784d707ee3998c38cf2874f7016a5c5350825
2014-08-08 10:26:24 -07:00
PauloftheWest
14f6029657 Merge "Fixed Bluetooth renaming bug." into lmp-dev 2014-08-07 17:50:16 +00:00
PauloftheWest
ed7b44d83d Fixed Bluetooth renaming bug.
+ After renaming your Bluetooth device, the title of the Bluetooth
    Activity stays "Bluetooth" instead of changing to the new name.
+ After renaming the device, the status at the bottom Bluetooth Settings
    is correctly displayed.

Bug: 16463239
Change-Id: Ifb12df2004fe1f89bd6f918e23c2c64ae08a0191
2014-08-08 09:34:15 -07:00
Alexandra Gherghina
f276e75f2d Open the same tab when switching profiles in apps settings
Bug: 16369104
Change-Id: Ibd23824a120541b17a5255952b7cf02d07b62c7b
2014-08-08 11:45:31 +01:00
Jim Miller
6cd90f45b7 Merge "Don't show TrustAgent entries when no security is enabled." into lmp-dev 2014-08-06 23:49:20 +00:00
Jim Miller
fe7655914d Don't show TrustAgent entries when no security is enabled.
Fixes bug 16383666

Change-Id: Ia6c3d7563c384269d1e53ef5e2e07099432c8a13
2014-08-07 15:16:51 -07:00
PauloftheWest
b0a97a52df Merge "Removed infinite loop in Multi-Sim Settings." into lmp-dev 2014-08-07 18:53:12 +00:00
PauloftheWest
97535e83a9 Removed infinite loop in Multi-Sim Settings.
Change-Id: I1d5e78abcd9b93d8fb4e1b6c14d73f9d23dce38d
2014-08-07 11:58:02 -07:00
Kenny Guy
39a3716313 Merge "Move over to CharSequence version of badging method." into lmp-dev 2014-08-07 18:53:12 +00:00
Kenny Guy
cc2cbaf421 Move over to CharSequence version of badging method.
Bug: 16484455
Change-Id: Ie5ee010efc439219cb71fd4241fdb798a5f4ea12
2014-08-07 22:01:22 +01:00
Dianne Hackborn
537a0a8235 Fix issue #16555033: Battery history overflowing too much
Use new mechanism to retrieve battery stats, now that they
can be much larger.

Make sure these will ever end up going through an IPC.

Change-Id: Ic582a61d736e24bddc905082c1565ece00fcbb29
2014-08-07 12:19:48 -07:00
PauloftheWest
689d2ce29b Changed a Bluetooth device's settings from an activity to a dialog.
+ Replace the “Paired bluetooth device” screen with a “Pair device” dialog
+ Add device name text field at the top
+ Replace “Unpair” list item with a “Forget" button at bottom of dialog
+ Change “Profiles” section header to “Use for”
+ Remove status under profile titles
+ Move checkboxes to left side of labels

Bug: 15719219
Change-Id: I3b0e8c82c761fae98f16508b9fd9c58aff651f80
2014-08-07 11:31:25 -07:00
Andres Morales
ff150032e3 Merge "Don't wipe PST partition if OEM unlock is enabled" into lmp-dev 2014-08-06 23:49:20 +00:00
Andres Morales
ae58323a6b Don't wipe PST partition if OEM unlock is enabled
This will be wiped by the recovery system and the OEM
unlock bit will be retained.

Bug: 16631974
Change-Id: I65522dd93c8465ff7f7ecbcef404bff6e9c864d6
2014-08-07 00:03:31 +00:00
Andres Morales
b1e7688aef Merge "Prevent newlines and long captions selecting default payment app" into lmp-dev 2014-08-06 23:49:20 +00:00
Andres Morales
78ce5e8c9f Prevent newlines and long captions selecting default payment app
This would allow attackers to spoof the default selection
dialog causing the user to unkowingly change their default
payment handler.

Bug: 15906632
Change-Id: I49ad2a7351bd6d2c1f9a79ad9be0cbc9787ca6c3
2014-08-07 00:45:03 +00:00
Adrian Roos
1f4049edfe Merge "Ask about redacted notifications after setting up a secure lock" into lmp-dev 2014-08-05 00:35:13 +00:00
Adrian Roos
6f60f7ed22 Ask about redacted notifications after setting up a secure lock
Bug: 14437890
Change-Id: I54cf355242375e8c7968c7d27c441fbd0a54cef2
2014-08-05 20:54:47 +02:00
John Spurlock
802ddf99f5 Settings: New application-level notification settings.
- Convert the old application-level dialog to an activity.
 - Move the settings icon to the new activity (out of the list).
 - Add a custom application header, similar to the switch bar style.
 - Use the ubiquitous vector gear for the settings icon.
 - Migrate old checkboxes to switch prefs, add new summaries.
 - Remove obsolete artifacts.

Bug:16396715
Change-Id: I857e3cf448b79f44fe1c242e6020f5214434c00c
2014-08-05 11:08:03 -04:00
Amith Yamasani
f34c350194 Merge "Fix removal of optional settings tiles" into lmp-dev 2014-08-05 00:19:02 +00:00
Amith Yamasani
57fd5fd84b Fix removal of optional settings tiles
Bug: 16654819

Fix the way the tiles get removed so the index is not out of sync
and there's no double deletion of entries.

Change-Id: I18da6b633884f51418c11afb0e177b49ca085fd0
2014-08-06 15:48:10 -07:00
Dan Sandler
3e2afb6ef7 Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS.
Bug: 15331132
Change-Id: Ia80ccb2cfdf60116bd50601e60ff131619eafcc5
2014-08-06 13:53:25 -04:00
Zoltan Szatmary-Ban
ec08228ea9 Merge "Badge texts correctly for accessibility in Settings" into lmp-dev 2014-08-05 00:19:02 +00:00
Zoltan Szatmary-Ban
ebb36ec920 Badge texts correctly for accessibility in Settings
If an app is a managed profile's app then its label should read correctly by TalkBack.
Affected screens: Data Usage, Location, Battery.

Bug:16053981
Change-Id: I393c0ebf56917032d619b1e39b4bf141ee236981
2014-08-07 14:15:14 +01:00
Sander Alewijnse
6a39bc68ae Merge "Prevent launcher switching in Settings app." into lmp-dev 2014-08-05 00:19:02 +00:00
Sander Alewijnse
cd40220372 Prevent launcher switching in Settings app.
User won't be able to switch to launchers that do not support
managed profiles.
Additional explanation is shown in text under the name of the
launcher.

Bug:15099904

Change-Id: I12470bf396d41ef47d463ef42835964aacda9719
2014-08-07 12:48:22 +01:00
Alexandra Gherghina
1fcd7faad6 Merge "Clears previously added cross-profile-intents" into lmp-dev 2014-08-05 00:15:52 +00:00
Svet Ganov
c15c0c078e Add support for widgets in user profiles
bug:14991269

Change-Id: I7f71787bf5e5278230063b9d3bafac96a0680682
2014-08-05 15:21:25 -07:00
Etan Cohen
572d253982 Radio Information UI for enabling/disabling debug settings of MO over VoLTE
Change-Id: Ib05ff460ac6001c511113e80a63707a073908637
2014-08-04 22:57:15 +00:00
John Spurlock
911de7fa85 Settings: Wire up new doze opt-out setting.
Add an item in Display settings for enabling or disabling
dozing.  The setting will only appear on devices that have
configured a doze component.

Bug:16703536
Change-Id: Iba5f0a25cef68924f5be5f858b4c396234a7a355
2014-08-04 14:53:28 -04:00
Matthew Xie
8c89e69b53 Merge "Bluetooth: Multi HF support" into lmp-dev 2014-08-01 01:46:21 +00:00
Nitin Srivastava
b0b9855e80 Bluetooth: Multi HF support
1. The connected sinks are not disconnected from
HeadsetProfile when new sink is connecting.
2. Also return correct connection status for
specific HS.
3. Sets priority for specific HS while disconnecting.
bug 16519158

Change-Id: I62c6629cf11129733aab8a835adcd51e014b3860
2014-08-03 17:12:50 -07:00
John Spurlock
249cf50b19 Settings: Battery saver updates.
- Fewer trigger level options, new default of 0 (never)
 - Use new shared feature description text (in framework)
 - Remove "always on", add new top-level switch bar.

Depends on the framework changes in I3d1ded1eec9e63e7d97469486f6a320e1bebbccd

Bug:16214395
Change-Id: Ia01186cfeb19d00672f62cc84787584b4dcc1143
2014-08-02 17:23:46 -04:00
Zoltan Szatmary-Ban
ca90af1064 Toggle between profiles in VPN Settings
This adds a spinner to the VPN settings screen which can be used to toggle
between the Settings app in the primary and managed profile so that the user
can edit settings belonging to both profiles.

Bug:16030111
Change-Id: I3b800264c634900412e8eebdbcf43a2b6913c2be
2014-08-01 14:41:57 +00:00
Zoltan Szatmary-Ban
f3d72098b0 Update Device Admins Settings screen
The MDM is a Device Admin for the managed profile. The users should be able to see that it exists
and it is controlling the device, but they should not be able to change it.

Bug: 15558397

Change-Id: Ief372b606f1085f73c98ace97f2c1d9ac5fe3257
2014-08-01 09:29:33 +00:00
vandwalle
5cd9063df2 Merge "The Settings app is listening to wpa_supplicant state change so as to update the state of the AccessPoint objects and present Wifi state to the user." into lmp-dev 2014-07-31 21:50:52 +00:00