OSDN Git Service
Maurice Lam [Mon, 4 Aug 2014 22:15:16 +0000 (22:15 +0000)]
am
86163b6b: Merge "[WifiSetup] Fixed setup strings CHAR LIMIT" into lmp-dev
* commit '
86163b6bcd8da9ea77ef6a3f3cf84ab31780246d':
[WifiSetup] Fixed setup strings CHAR LIMIT
John Spurlock [Mon, 4 Aug 2014 19:06:10 +0000 (19:06 +0000)]
am
911de7fa: Settings: Wire up new doze opt-out setting.
* commit '
911de7fa8520f919cda673ae70c25f86ae0edf98':
Settings: Wire up new doze opt-out setting.
John Spurlock [Mon, 4 Aug 2014 18:53:28 +0000 (14:53 -0400)]
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
Matthew Xie [Mon, 4 Aug 2014 00:18:34 +0000 (00:18 +0000)]
am
8c89e69b: Merge "Bluetooth: Multi HF support" into lmp-dev
* commit '
8c89e69b5319fdc78181a9548ad794f2944831e4':
Bluetooth: Multi HF support
PauloftheWest [Sun, 3 Aug 2014 20:39:02 +0000 (20:39 +0000)]
am
386e5ebb: Updated comments in strings.xml for translators.
* commit '
386e5ebbc274ee18e8f4fb00bc51212a0b764ad7':
Updated comments in strings.xml for translators.
PauloftheWest [Sun, 3 Aug 2014 19:45:33 +0000 (12:45 -0700)]
Updated comments in strings.xml for translators.
Bug:
16321904
Bug:
16340357
Change-Id: I5e4a854742a1f4e51c7aed2e786b2436260795ec
John Spurlock [Sun, 3 Aug 2014 01:54:21 +0000 (01:54 +0000)]
am
249cf50b: Settings: Battery saver updates.
* commit '
249cf50b19c5b1d9ddce0667fb9d439fcdb6f033':
Settings: Battery saver updates.
John Spurlock [Sat, 2 Aug 2014 21:23:46 +0000 (17:23 -0400)]
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
Zoltan Szatmary-Ban [Fri, 1 Aug 2014 14:50:00 +0000 (14:50 +0000)]
am
ca90af10: Toggle between profiles in VPN Settings
* commit '
ca90af1064f966c1ef764a3388020c94ba4a1121':
Toggle between profiles in VPN Settings
Zoltan Szatmary-Ban [Thu, 31 Jul 2014 15:49:52 +0000 (16:49 +0100)]
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
Zoltan Szatmary-Ban [Fri, 1 Aug 2014 11:51:26 +0000 (11:51 +0000)]
am
f3d72098: Update Device Admins Settings screen
* commit '
f3d72098b0008a9a8e137985d7fbc0e0470adc9c':
Update Device Admins Settings screen
Zoltan Szatmary-Ban [Wed, 2 Jul 2014 15:48:00 +0000 (16:48 +0100)]
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
Maurice Lam [Mon, 4 Aug 2014 22:12:29 +0000 (22:12 +0000)]
Merge "[WifiSetup] Fixed setup strings CHAR LIMIT" into lmp-dev
Maurice Lam [Sun, 27 Jul 2014 18:53:51 +0000 (11:53 -0700)]
[WifiSetup] Fixed setup strings CHAR LIMIT
Bumped the CHAR LIMIT of "Skip" button to 20, and added the same CHAR
LIMIT to "Next".
Bug:
16116325
Change-Id: Iafdab3712fdbfac0c53d3ef73d1da8910bc9433b
Matthew Xie [Mon, 4 Aug 2014 00:15:13 +0000 (00:15 +0000)]
Merge "Bluetooth: Multi HF support" into lmp-dev
Nitin Srivastava [Wed, 30 Jul 2014 20:21:34 +0000 (01:51 +0530)]
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
vandwalle [Thu, 31 Jul 2014 23:17:45 +0000 (23:17 +0000)]
am
5cd9063d: 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
* commit '
5cd9063df2cb5e578326d7bc94c0487b884ece31':
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.
PauloftheWest [Thu, 31 Jul 2014 22:33:52 +0000 (22:33 +0000)]
am
33734f58: Cheanged Call Manager\'s summary to be parameter.
* commit '
33734f58d5894829c5821c39727f6dae2c951167':
Cheanged Call Manager's summary to be parameter.
PauloftheWest [Thu, 31 Jul 2014 22:21:34 +0000 (15:21 -0700)]
Cheanged Call Manager's summary to be parameter.
Bug:
16300328
Change-Id: I4a3a4a80060ac6d464adc5f666d02dabe635707c
Svetoslav [Thu, 31 Jul 2014 21:55:09 +0000 (21:55 +0000)]
am
0b4cf144: Merge "Removing lock screen app widget code" into lmp-dev
* commit '
0b4cf14400a42a3d0f461386f22d3dd7d69dd88f':
Removing lock screen app widget code
vandwalle [Thu, 31 Jul 2014 23:15:06 +0000 (23:15 +0000)]
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
vandwalle [Thu, 31 Jul 2014 07:06:40 +0000 (00:06 -0700)]
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.
This is not right because wpa_supplicant states are transient (for instance when the WiFi Layer, at Layer 2, is going thru some harmless spurious disconnection cycle due to WiFi signal fluctuation). This cause the state of the WiFi Network to appear to be unstable to the user.
Hence, I removed dependencies on wpa_supplicant internal state.
In addition so as to improve debugging, I added the BSSID to the Wifi Verbose Logging string which is shown in wifi picker alongside the current network. This string only appear when a user goes into Developper Options and enable WiFi Verbose Logging.
The below bug is an example of situation where a spurious disconnect (a coupld seconds) handled by wpa_supplicant can cause the WiFi Settings to indicate that the link is unstable.
Bug:
16140888 Wifi best network selection not smooth
Change-Id: I0e7c6b86262b88ed993c46fcdcdbab4d9b1f5ea1
Amith Yamasani [Thu, 31 Jul 2014 20:52:42 +0000 (20:52 +0000)]
am
9980cf7c: Merge "Dialog on phone shouldn\'t say tablet" into lmp-dev
* commit '
9980cf7c9927451b1370dab8afb8357542c10e8c':
Dialog on phone shouldn't say tablet
Adam Lesinski [Thu, 31 Jul 2014 19:14:54 +0000 (19:14 +0000)]
am
366e7a20: Fix UsageStats permissions in Settings
* commit '
366e7a20c4d716c3d260faef929f0e8d6be267fb':
Fix UsageStats permissions in Settings
Adam Lesinski [Fri, 25 Jul 2014 17:20:26 +0000 (10:20 -0700)]
Fix UsageStats permissions in Settings
AppOpsManager returns all permission for all users. We need
to check that the permission we're getting is actually for
our user.
Change-Id: I8287d2dc1959d4a22c19ebb2d24136324e04cd2b
Alexandra Gherghina [Thu, 31 Jul 2014 18:43:06 +0000 (18:43 +0000)]
am
80e1f1bf: Extract common functionality for profile spinner into Utils
* commit '
80e1f1bfdb814a08fb8b07b2e279285d495042e9':
Extract common functionality for profile spinner into Utils
Alexandra Gherghina [Thu, 31 Jul 2014 18:43:06 +0000 (18:43 +0000)]
am
6bcca8b7: Modify user spinner appearance to match mocks
* commit '
6bcca8b7ae3fab4609f67f32a52a10d4143093a9':
Modify user spinner appearance to match mocks
Alexandra Gherghina [Thu, 31 Jul 2014 13:56:33 +0000 (14:56 +0100)]
Extract common functionality for profile spinner into Utils
Bug:
16645615
Change-Id: Ic8928fff8294cd99eeb86b69b44b8e4128cadf92
Alexandra Gherghina [Thu, 31 Jul 2014 13:07:02 +0000 (13:07 +0000)]
am
6b3b7514: Update icon and text for a managed profile
* commit '
6b3b751492d01b23b87a4ee6b807dc00c3b5770e':
Update icon and text for a managed profile
Alexandra Gherghina [Thu, 31 Jul 2014 10:09:26 +0000 (11:09 +0100)]
Modify user spinner appearance to match mocks
Bug:
16518801
Change-Id: I30aa65251d4a4aaa80dbde5881fc56fffb7d54f7
Alexandra Gherghina [Fri, 25 Jul 2014 20:34:04 +0000 (21:34 +0100)]
Update icon and text for a managed profile
Bug:
16369104
Change-Id: I15d25910332d92e1638cdc63422e7e28c2f07d85
Geoff Mendal [Thu, 31 Jul 2014 01:49:18 +0000 (01:49 +0000)]
am
86bf735a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
86bf735aae6714225a4c12bb032efebebbbfca84':
Import translations. DO NOT MERGE
PauloftheWest [Wed, 30 Jul 2014 22:26:36 +0000 (22:26 +0000)]
am
d94e78b4: Merge "Fixed crash when changing orientation in the Add Networks dialog." into lmp-dev
* commit '
d94e78b4b2434259abb72563ee431b8312210ce0':
Fixed crash when changing orientation in the Add Networks dialog.
Julia Reynolds [Wed, 30 Jul 2014 20:54:56 +0000 (20:54 +0000)]
am
a71d7056: Merge "Fix issue with pin prompt." into lmp-dev
* commit '
a71d7056503121fea26ce58fa8996871b4b10d25':
Fix issue with pin prompt.
Christoph Studer [Wed, 30 Jul 2014 19:36:46 +0000 (19:36 +0000)]
am
fe1b8950: Update NotificationStation after NotificationListenerService API change
* commit '
fe1b8950bc02d96f2675505ee0aa95146831465b':
Update NotificationStation after NotificationListenerService API change
Christoph Studer [Fri, 25 Jul 2014 09:46:45 +0000 (11:46 +0200)]
Update NotificationStation after NotificationListenerService API change
Change-Id: Ia58c18657c44c0dd49b058ce5b581554889b08d5
PauloftheWest [Wed, 30 Jul 2014 22:19:56 +0000 (22:19 +0000)]
Merge "Fixed crash when changing orientation in the Add Networks dialog." into lmp-dev
PauloftheWest [Wed, 30 Jul 2014 22:05:46 +0000 (15:05 -0700)]
Fixed crash when changing orientation in the Add Networks dialog.
Bug:
16479540
Change-Id: Ib42977b72039f49b5d5ae688c0b0ded1094b44e2
Geoff Mendal [Thu, 31 Jul 2014 01:45:42 +0000 (01:45 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Thu, 31 Jul 2014 01:31:14 +0000 (18:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1b93e4357544ff5ce9bf18351ed34009ba06c5f5
Auto-generated-cl: translation import
Elliott Hughes [Wed, 30 Jul 2014 18:55:09 +0000 (18:55 +0000)]
am
3ded7ddb: Merge "Work around an icu4c bug in TimeZoneNames::getDisplayName." into lmp-dev
* commit '
3ded7ddb1f54045842bbea8ea03e939443d17808':
Work around an icu4c bug in TimeZoneNames::getDisplayName.
PauloftheWest [Wed, 30 Jul 2014 18:25:01 +0000 (18:25 +0000)]
am
fc0c3b43: Merge "Set new PBAP connections to always allow." into lmp-dev
* commit '
fc0c3b43dfe420ef29dfa4fc576ffc486bc2266a':
Set new PBAP connections to always allow.
John Spurlock [Wed, 30 Jul 2014 16:38:45 +0000 (16:38 +0000)]
am
d117a96e: Merge "Settings: Fix ordering for interruptions alarm warning." into lmp-dev
* commit '
d117a96e00ab2df2d523e4a62825cf90851dc342':
Settings: Fix ordering for interruptions alarm warning.
PauloftheWest [Wed, 30 Jul 2014 16:19:48 +0000 (16:19 +0000)]
am
361d870e: Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs
* commit '
361d870e5415f8642cb106b4329d194673b4dd02':
Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs
PauloftheWest [Wed, 30 Jul 2014 18:20:05 +0000 (18:20 +0000)]
Merge "Set new PBAP connections to always allow." into lmp-dev
PauloftheWest [Wed, 30 Jul 2014 18:03:49 +0000 (11:03 -0700)]
Set new PBAP connections to always allow.
Bug:
13886947
Change-Id: I6ec612b803433db90992f5e4d1bac26311d90a84
PauloftheWest [Fri, 25 Jul 2014 13:15:10 +0000 (06:15 -0700)]
Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs
Bug:
16040292
Change-Id: Ieeaa014052f53787cf7057578e0b2ac048dc6eb1
Alexandra Gherghina [Wed, 30 Jul 2014 12:58:32 +0000 (12:58 +0000)]
am
c8a1db19: Toggle between primary and managed profile in apps settings
* commit '
c8a1db191207e38b7ad0acdfd276651e4911e812':
Toggle between primary and managed profile in apps settings
Amith Yamasani [Thu, 31 Jul 2014 20:49:03 +0000 (20:49 +0000)]
Merge "Dialog on phone shouldn't say tablet" into lmp-dev
Amith Yamasani [Thu, 31 Jul 2014 20:29:42 +0000 (13:29 -0700)]
Dialog on phone shouldn't say tablet
Bug:
14607100
Change-Id: I5c3e023b94697f58c61122d530abaed406862201
Alexandra Gherghina [Thu, 24 Jul 2014 17:54:31 +0000 (18:54 +0100)]
Toggle between primary and managed profile in apps settings
This adds a spinner to the apps 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:
16369104
Change-Id: I09a94c07597e6509de025dfbbe0e454ae3d9b0aa
Fabrice Di Meglio [Wed, 30 Jul 2014 01:10:20 +0000 (01:10 +0000)]
am
5c14856b: Merge "Fix bug #
16306535 The arrows rotate in the opposite direction... of the direction implied by the iconography (clockwise)" into lmp-dev
* commit '
5c14856ba2cafeb00080355f7613a702779ca530':
Fix bug #
16306535 The arrows rotate in the opposite direction... of the direction implied by the iconography (clockwise)
Fabrice Di Meglio [Wed, 30 Jul 2014 01:10:14 +0000 (01:10 +0000)]
am
6d9a59f0: Merge "Fix bug #
16660819 Switchbar text should be white not grey" into lmp-dev
* commit '
6d9a59f02df1bb9fae5974c510cd3eedf90fa5ce':
Fix bug #
16660819 Switchbar text should be white not grey
Amith Yamasani [Tue, 29 Jul 2014 23:47:00 +0000 (23:47 +0000)]
am
ba9643b9: Merge "Implement SET_PROFILE_OWNER intent" into lmp-dev
* commit '
ba9643b92c6fa481152f55b862442f609c1e7410':
Implement SET_PROFILE_OWNER intent
Fabrice Di Meglio [Tue, 29 Jul 2014 23:40:30 +0000 (23:40 +0000)]
am
9ee40022: Merge "Make Battery History chart non selectable" into lmp-dev
* commit '
9ee4002288cd2bc455a5def8316456fd74c2551c':
Make Battery History chart non selectable
Fabrice Di Meglio [Tue, 29 Jul 2014 23:26:04 +0000 (23:26 +0000)]
am
db7d2d16: Merge "Fix bug #
16623129 Stability: Settings: NPE in RunningProcessesView... startServiceDetailsActivity(RunningProcessesView.java:394)" into lmp-dev
* commit '
db7d2d16b1b3a7fdad8657a57fdcf8801e72a2c4':
Fix bug #
16623129 Stability: Settings: NPE in RunningProcessesView... startServiceDetailsActivity(RunningProcessesView.java:394)
Fabrice Di Meglio [Tue, 29 Jul 2014 23:13:41 +0000 (23:13 +0000)]
am
76307f52: Merge "Fix bug #
16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment@
3c1d9ecb was not registered" into lmp-dev
* commit '
76307f52d0cb097f832aec2a353ee31bfdff78a7':
Fix bug #
16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment$1@
3c1d9ecb was not registered
John Spurlock [Wed, 30 Jul 2014 16:34:50 +0000 (16:34 +0000)]
Merge "Settings: Fix ordering for interruptions alarm warning." into lmp-dev
John Spurlock [Wed, 30 Jul 2014 16:33:04 +0000 (12:33 -0400)]
Settings: Fix ordering for interruptions alarm warning.
And update the string to the latest.
Bug:
16662819
Change-Id: I42b38ab4721180babfd816a34a1fb1c368546cca
Fabrice Di Meglio [Tue, 29 Jul 2014 23:34:26 +0000 (23:34 +0000)]
Merge "Make Battery History chart non selectable" into lmp-dev
Fabrice Di Meglio [Tue, 29 Jul 2014 23:29:00 +0000 (16:29 -0700)]
Make Battery History chart non selectable
- ... because it should not be selectable
See bug: #
13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I625d1533991623f5c3897be15ccfa48fd0fc02f8
Fabrice Di Meglio [Tue, 29 Jul 2014 23:15:27 +0000 (16:15 -0700)]
Fix bug #
16623129 Stability: Settings: NPE in RunningProcessesView...
startServiceDetailsActivity(RunningProcessesView.java:394)
- make the ListView header non selectable
Change-Id: Ic5e888a7d1d3d1df1bcb59f3027e4385d46ba5ca
Fabrice Di Meglio [Tue, 29 Jul 2014 23:02:22 +0000 (16:02 -0700)]
Fix bug #
16660405 Stability: ISE in Settings: Observer ...
com.android.settings.SettingsPreferenceFragment$1@
3c1d9ecb was not registered
- use a monitor to control registering / unregistering
Change-Id: Id66dd698abf92643c97938e2091c3be38e6b78bd
Fabrice Di Meglio [Tue, 29 Jul 2014 23:07:27 +0000 (23:07 +0000)]
Merge "Fix bug #
16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment$1@
3c1d9ecb was not registered" into lmp-dev
Svetoslav [Tue, 29 Jul 2014 20:24:01 +0000 (20:24 +0000)]
am
01daaca5: Remove unnecessary code.
* commit '
01daaca5475930e394295b06f5a46dc057b44b0f':
Remove unnecessary code.
Svetoslav [Tue, 29 Jul 2014 20:16:12 +0000 (13:16 -0700)]
Remove unnecessary code.
Change-Id: I4a81cd7f855bb075ab71f6c6c812288e3677c90a
Fabrice Di Meglio [Tue, 29 Jul 2014 17:24:31 +0000 (17:24 +0000)]
am
d5ec63ad: Merge "Fix bug #
16382239 "Searching for Printers" progress bar is not Material / Quantum" into lmp-dev
* commit '
d5ec63ad5166b2a6530c2958819a053cccf4ec79':
Fix bug #
16382239 "Searching for Printers" progress bar is not Material / Quantum
Jay Civelli [Tue, 29 Jul 2014 17:02:48 +0000 (17:02 +0000)]
am
09b5228a: New activity that asks users to confirm their pattern. DO NOT MERGE
* commit '
09b5228ae56283ebcb69d1c295033c74ea868ae5':
New activity that asks users to confirm their pattern. DO NOT MERGE
Jay Civelli [Fri, 11 Jul 2014 00:27:07 +0000 (17:27 -0700)]
New activity that asks users to confirm their pattern. DO NOT MERGE
Adds an activity that prompts the user for their PIN/password/pattern.
cherry-pick from master
b88e8577b9049392aa50649cb40edc845d43d689
Bug
16242766
Change-Id: I3468215a8ac522a06de6573c93a5f5a6dc72ee2d
Alexandra Gherghina [Tue, 29 Jul 2014 15:31:48 +0000 (15:31 +0000)]
am
4a45be2f: Merge "Move global sync settings dialogs to the right screen" into lmp-dev
* commit '
4a45be2ff83e1b3b9bd52be523639d100311bec3':
Move global sync settings dialogs to the right screen
Alexandra Gherghina [Tue, 29 Jul 2014 15:27:24 +0000 (15:27 +0000)]
am
9017d3fd: Update the resource name to the new ic_corp prefix one.
* commit '
9017d3fdd607b8978299578721303b8140a64c22':
Update the resource name to the new ic_corp prefix one.
Alexandra Gherghina [Tue, 29 Jul 2014 10:34:28 +0000 (11:34 +0100)]
Update the resource name to the new ic_corp prefix one.
Bug:
16369104
Change-Id: I0cd2188b0ac1806487678c568db068995a1e9142
Alexandra Gherghina [Tue, 29 Jul 2014 13:24:25 +0000 (13:24 +0000)]
am
a6145a65: Toggle between primary and managed profile in App notif settings
* commit '
a6145a656af1241fd771038715cf839a8fce76e1':
Toggle between primary and managed profile in App notif settings
Alexandra Gherghina [Thu, 24 Jul 2014 16:28:36 +0000 (17:28 +0100)]
Toggle between primary and managed profile in App notif settings
This adds a spinner to the app notifications 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:
16369104
Change-Id: I31c2fb4c0bc318fb8fa5c152621a29fd0c4bb403
Zoltan Szatmary-Ban [Tue, 29 Jul 2014 12:49:32 +0000 (12:49 +0000)]
am
0598e6f6: Merge "Fix refresh issue of badged icons in Battery Settings" into lmp-dev
* commit '
0598e6f6842ad08af1d8dbb31aa3ddd3df7e37ed':
Fix refresh issue of badged icons in Battery Settings
Zoltan Szatmary-Ban [Tue, 29 Jul 2014 12:49:27 +0000 (12:49 +0000)]
am
74f34e49: Merge "Update Data Usage Settings for Enterprise" into lmp-dev
* commit '
74f34e496fc460842aa558512de03187f5ad9b2c':
Update Data Usage Settings for Enterprise
Alexandra Gherghina [Tue, 29 Jul 2014 12:49:26 +0000 (12:49 +0000)]
am
11b8bda9: Refactors listening logic in AccountSettings
* commit '
11b8bda93cf3acf3b699eeb479a99e09682a369d':
Refactors listening logic in AccountSettings
Alexandra Gherghina [Tue, 29 Jul 2014 12:49:25 +0000 (12:49 +0000)]
am
fe47a8dc: Toggle between primary and managed profile in Print Settings
* commit '
fe47a8dc89fe0393dae16b1c2152c901feab4dcb':
Toggle between primary and managed profile in Print Settings
Alexandra Gherghina [Wed, 23 Jul 2014 15:19:08 +0000 (16:19 +0100)]
Refactors listening logic in AccountSettings
This is required to make sure that we do not leak broadcast receivers.
No user-visible changes are present.
Bug:
15466880
Change-Id: I90fcf9f8281a786948d862f48a3d7e7ac2bbe6ba
Alexandra Gherghina [Fri, 18 Jul 2014 16:23:37 +0000 (17:23 +0100)]
Toggle between primary and managed profile in Print Settings
This adds a spinner to the print 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:
16369104
Change-Id: I2556a331d09379c2a501bc6b192ab1631b5215f5
John Spurlock [Tue, 29 Jul 2014 02:15:24 +0000 (02:15 +0000)]
am
b8ec3434: Settings: Carve out app-level notifcation settings dialog.
* commit '
b8ec34346495245043933ac0f1b78781ae5054db':
Settings: Carve out app-level notifcation settings dialog.
John Spurlock [Sun, 27 Jul 2014 17:33:34 +0000 (13:33 -0400)]
Settings: Carve out app-level notifcation settings dialog.
Bug:
16208321
Change-Id: I46574618518e8fe4cbef70e80204cc7bb7cb76e9
Fabrice Di Meglio [Tue, 29 Jul 2014 02:04:05 +0000 (02:04 +0000)]
am
3a166613: Merge "Fix bug #
16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)" into lmp-dev
* commit '
3a166613becfb8de08939616d2dd6d28c180a130':
Fix bug #
16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)
Fabrice Di Meglio [Tue, 29 Jul 2014 01:35:46 +0000 (01:35 +0000)]
am
54bac5f2: Merge "Fix App Info padding" into lmp-dev
* commit '
54bac5f2c6e58fca8d1aa5cb4f5ed053a3559c02':
Fix App Info padding
Fabrice Di Meglio [Tue, 29 Jul 2014 01:03:58 +0000 (01:03 +0000)]
am
173e3161: Merge "Some code formatting" into lmp-dev
* commit '
173e31619a34436e8cb100fb30f0e3477b7edf8e':
Some code formatting
Maurice Lam [Tue, 29 Jul 2014 00:47:59 +0000 (00:47 +0000)]
am
569aec7b: [WifiSetup] Fix auto-finish suppression logic
* commit '
569aec7b4d6cc9e5268a059d9f18f271afadb706':
[WifiSetup] Fix auto-finish suppression logic
Alan Viverette [Tue, 29 Jul 2014 00:47:58 +0000 (00:47 +0000)]
am
744c6b22: Remove TimePicker and DatePicker dialog themes
* commit '
744c6b22513f3b51f035b2038a59d35c97c4da6c':
Remove TimePicker and DatePicker dialog themes
Maurice Lam [Fri, 25 Jul 2014 19:40:55 +0000 (12:40 -0700)]
[WifiSetup] Fix auto-finish suppression logic
The flag needs to be saved into the instance state, and the flag is
set as soon as auto-finish occurs to avoid multi-launching the next
activity.
Bug:
16561238
Change-Id: I954b7ff77b2d2fc35684ea59cca7d7cd588a6aab
Alan Viverette [Mon, 28 Jul 2014 23:29:58 +0000 (16:29 -0700)]
Remove TimePicker and DatePicker dialog themes
Also moves TimePicker widget style to appropriate XML file / namespace.
BUG:
14973897
Change-Id: I0eb68a59d8f2800d37cc949c948689d47c34486f
Baligh Uddin [Mon, 28 Jul 2014 23:15:48 +0000 (23:15 +0000)]
am
c4108655: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
c4108655e114631cf71b4f505357936e53469fe4':
Import translations. DO NOT MERGE
Fabrice Di Meglio [Mon, 28 Jul 2014 23:15:47 +0000 (23:15 +0000)]
am
d197608e: Merge "Fix bug #
14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev
* commit '
d197608e8340765e736c234dabffae8d3dc695e1':
Fix bug #
14323097 Launching Security from Settings search results ...show header as Settings instead of Security
Fabrice Di Meglio [Tue, 29 Jul 2014 01:59:53 +0000 (01:59 +0000)]
Merge "Fix bug #
16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)" into lmp-dev
Fabrice Di Meglio [Tue, 29 Jul 2014 01:55:29 +0000 (18:55 -0700)]
Fix bug #
16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)
- add correct padding
Change-Id: I08a34839f94e899469b429dd83e301c5418155f5
Fabrice Di Meglio [Tue, 29 Jul 2014 01:25:14 +0000 (18:25 -0700)]
Fix App Info padding
- need to add to the previous defined on instead of replacing it
- verified also that Notification Station padding is ok too
See bug: #
13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I06394bec2a5baa548f34f3fe7ec19d60172a98e8
Fabrice Di Meglio [Tue, 29 Jul 2014 00:54:30 +0000 (17:54 -0700)]
Some code formatting
- add some extra lines into those XML layout files
Change-Id: I13c004f23a5c59d46702a93b1cfa7e9b9587b8c2
Fabrice Di Meglio [Mon, 28 Jul 2014 22:47:21 +0000 (15:47 -0700)]
Fix bug #
14323097 Launching Security from Settings search results
...show header as Settings instead of Security
- add missing title to a few fragments
Change-Id: I74fb95ca58269ff1c77afa20ed40e7042873130c
Fabrice Di Meglio [Tue, 29 Jul 2014 01:01:03 +0000 (01:01 +0000)]
Merge "Some code formatting" into lmp-dev
Fabrice Di Meglio [Mon, 28 Jul 2014 22:54:48 +0000 (22:54 +0000)]
Merge "Fix bug #
14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev
Jeff Davidson [Mon, 28 Jul 2014 20:41:15 +0000 (20:41 +0000)]
am
6207391a: Fix strings for Wi-Fi Assistant dialog.
* commit '
6207391ac240d130194f1a0cad7b5f10535d45ac':
Fix strings for Wi-Fi Assistant dialog.
Jeff Davidson [Fri, 25 Jul 2014 21:58:20 +0000 (14:58 -0700)]
Fix strings for Wi-Fi Assistant dialog.
Remove some redundant strings that are no longer needed.
Change-Id: I039839989358efa322bac13129d91f7c764fd387