OSDN Git Service
Fabrice Di Meglio [Fri, 8 Aug 2014 19:39:57 +0000 (19:39 +0000)]
am
09076e5f: Merge "Fix bug #
16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots" into lmp-dev
* commit '
09076e5f3c90dbc1a3bdf6f000e0c99dd2bb45b4':
Fix bug #
16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots
Jeff Sharkey [Fri, 8 Aug 2014 17:37:16 +0000 (17:37 +0000)]
am
dc16286f: Merge "Avoid NPE when template rapidly switched." into lmp-dev
* commit '
dc16286ff32dfc4d087938461d0beca29b6167a3':
Avoid NPE when template rapidly switched.
Fabrice Di Meglio [Fri, 8 Aug 2014 19:35:06 +0000 (19:35 +0000)]
Merge "Fix bug #
16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots" into lmp-dev
Fabrice Di Meglio [Fri, 8 Aug 2014 19:27:57 +0000 (12:27 -0700)]
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
PauloftheWest [Fri, 8 Aug 2014 17:24:12 +0000 (17:24 +0000)]
am
14f60296: Merge "Fixed Bluetooth renaming bug." into lmp-dev
* commit '
14f60296574316f94ca03fb82fc3675db373734e':
Fixed Bluetooth renaming bug.
Alexandra Gherghina [Fri, 8 Aug 2014 17:24:11 +0000 (17:24 +0000)]
am
e54014c4: Merge "Open the same tab when switching profiles in apps settings" into lmp-dev
* commit '
e54014c4bbabfa3307e51253308263da0844537b':
Open the same tab when switching profiles in apps settings
Dan Sandler [Fri, 8 Aug 2014 12:59:34 +0000 (12:59 +0000)]
am
b5fca457: Merge "Fully deprecate Power Control widget." into lmp-dev
* commit '
b5fca45768d36552ce74785dfbc9d7da7ce67bea':
Fully deprecate Power Control widget.
Jim Miller [Thu, 7 Aug 2014 22:29:33 +0000 (22:29 +0000)]
am
6cd90f45: Merge "Don\'t show TrustAgent entries when no security is enabled." into lmp-dev
* commit '
6cd90f45b7fb7324eef9d05ae38e0e26bfc934d5':
Don't show TrustAgent entries when no security is enabled.
PauloftheWest [Thu, 7 Aug 2014 22:00:50 +0000 (22:00 +0000)]
am
b0a97a52: Merge "Removed infinite loop in Multi-Sim Settings." into lmp-dev
* commit '
b0a97a52dffa5ea3520cb2ff58681c2782b53160':
Removed infinite loop in Multi-Sim Settings.
Kenny Guy [Thu, 7 Aug 2014 21:08:24 +0000 (21:08 +0000)]
am
39a37163: Merge "Move over to CharSequence version of badging method." into lmp-dev
* commit '
39a371631370cd6f150d2d67d73e2d96da7a5e18':
Move over to CharSequence version of badging method.
Dianne Hackborn [Thu, 7 Aug 2014 21:04:22 +0000 (21:04 +0000)]
am
537a0a82: Fix issue #
16555033: Battery history overflowing too much
* commit '
537a0a82351d9671d14dccde8c9fc2a45c3c4f3a':
Fix issue #
16555033: Battery history overflowing too much
Dianne Hackborn [Thu, 7 Aug 2014 02:22:46 +0000 (19:22 -0700)]
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
PauloftheWest [Thu, 7 Aug 2014 21:53:44 +0000 (21:53 +0000)]
Merge "Removed infinite loop in Multi-Sim Settings." into lmp-dev
PauloftheWest [Thu, 7 Aug 2014 17:41:41 +0000 (10:41 -0700)]
Removed infinite loop in Multi-Sim Settings.
Change-Id: I1d5e78abcd9b93d8fb4e1b6c14d73f9d23dce38d
Kenny Guy [Thu, 7 Aug 2014 21:05:48 +0000 (21:05 +0000)]
Merge "Move over to CharSequence version of badging method." into lmp-dev
Kenny Guy [Thu, 7 Aug 2014 21:01:22 +0000 (22:01 +0100)]
Move over to CharSequence version of badging method.
Bug:
16484455
Change-Id: Ie5ee010efc439219cb71fd4241fdb798a5f4ea12
Alexandra Gherghina [Fri, 8 Aug 2014 17:17:56 +0000 (17:17 +0000)]
Merge "Open the same tab when switching profiles in apps settings" into lmp-dev
Alexandra Gherghina [Thu, 31 Jul 2014 11:46:15 +0000 (12:46 +0100)]
Open the same tab when switching profiles in apps settings
Bug:
16369104
Change-Id: Ibd23824a120541b17a5255952b7cf02d07b62c7b
PauloftheWest [Thu, 7 Aug 2014 18:40:34 +0000 (18:40 +0000)]
am
689d2ce2: Changed a Bluetooth device\'s settings from an activity to a dialog.
* commit '
689d2ce29b3093c32d1d2b70caa6fb36a4ecefcb':
Changed a Bluetooth device's settings from an activity to a dialog.
Jeff Sharkey [Fri, 8 Aug 2014 17:32:39 +0000 (17:32 +0000)]
Merge "Avoid NPE when template rapidly switched." into lmp-dev
Jeff Sharkey [Fri, 8 Aug 2014 17:25:24 +0000 (10:25 -0700)]
Avoid NPE when template rapidly switched.
Monkeys can race and end up swapping template before the dialog
is shown.
Bug:
16660160
Change-Id: I301784d707ee3998c38cf2874f7016a5c5350825
Dan Sandler [Fri, 8 Aug 2014 12:57:33 +0000 (12:57 +0000)]
Merge "Fully deprecate Power Control widget." into lmp-dev
PauloftheWest [Sun, 3 Aug 2014 22:17:45 +0000 (15:17 -0700)]
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
PauloftheWest [Fri, 8 Aug 2014 17:18:56 +0000 (17:18 +0000)]
Merge "Fixed Bluetooth renaming bug." into lmp-dev
PauloftheWest [Fri, 8 Aug 2014 15:36:26 +0000 (08:36 -0700)]
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
Andres Morales [Thu, 7 Aug 2014 17:36:51 +0000 (17:36 +0000)]
am
ff150032: Merge "Don\'t wipe PST partition if OEM unlock is enabled" into lmp-dev
* commit '
ff150032e3c369513b0ba85b09aff1d8933c7ad3':
Don't wipe PST partition if OEM unlock is enabled
Andres Morales [Thu, 7 Aug 2014 17:13:23 +0000 (17:13 +0000)]
am
b1e7688a: Merge "Prevent newlines and long captions selecting default payment app" into lmp-dev
* commit '
b1e7688aef258a4cd832b363ff7db632baabd13b':
Prevent newlines and long captions selecting default payment app
Dan Sandler [Thu, 7 Aug 2014 16:59:11 +0000 (12:59 -0400)]
Fully deprecate Power Control widget.
Its behavior is obviated by quick settings and battery
saver, and so should not be shipped on any new builds by
default.
Bug:
8415180
Change-Id: Ic941a1e536c0b37c6be62fed876bfa23e34dc84b
Zoltan Szatmary-Ban [Thu, 7 Aug 2014 13:41:42 +0000 (13:41 +0000)]
am
ec08228e: Merge "Badge texts correctly for accessibility in Settings" into lmp-dev
* commit '
ec08228ea9a3713fbfac05fe211fc931992788a2':
Badge texts correctly for accessibility in Settings
Sander Alewijnse [Thu, 7 Aug 2014 11:57:49 +0000 (11:57 +0000)]
am
6a39bc68: Merge "Prevent launcher switching in Settings app." into lmp-dev
* commit '
6a39bc68aea91483804d2ab8635159803208095d':
Prevent launcher switching in Settings app.
Jim Miller [Thu, 7 Aug 2014 22:25:46 +0000 (22:25 +0000)]
Merge "Don't show TrustAgent entries when no security is enabled." into lmp-dev
Jim Miller [Thu, 31 Jul 2014 22:30:29 +0000 (15:30 -0700)]
Don't show TrustAgent entries when no security is enabled.
Fixes bug
16383666
Change-Id: Ia6c3d7563c384269d1e53ef5e2e07099432c8a13
Andres Morales [Thu, 7 Aug 2014 17:33:58 +0000 (17:33 +0000)]
Merge "Don't wipe PST partition if OEM unlock is enabled" into lmp-dev
Andres Morales [Thu, 7 Aug 2014 00:01:19 +0000 (17:01 -0700)]
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
Andres Morales [Thu, 7 Aug 2014 17:05:48 +0000 (17:05 +0000)]
Merge "Prevent newlines and long captions selecting default payment app" into lmp-dev
Andres Morales [Tue, 22 Jul 2014 18:04:21 +0000 (11:04 -0700)]
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
Amith Yamasani [Wed, 6 Aug 2014 23:21:29 +0000 (23:21 +0000)]
am
f34c3501: Merge "Fix removal of optional settings tiles" into lmp-dev
* commit '
f34c3501948190acf44defefba8eb161ec6dc07b':
Fix removal of optional settings tiles
Geoff Mendal [Wed, 6 Aug 2014 19:50:48 +0000 (19:50 +0000)]
am
a0b87a24: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
a0b87a2436c95777dcb3b3a14660105aa63d0b80':
Import translations. DO NOT MERGE
Fabrice Di Meglio [Wed, 6 Aug 2014 19:07:31 +0000 (19:07 +0000)]
am
fa8950be: Merge "Fix bug #
16800261 Settings app: Device administrator screen padding issue" into lmp-dev
* commit '
fa8950be33c777d0305775ee3a364300d454f91b':
Fix bug #
16800261 Settings app: Device administrator screen padding issue
Dan Sandler [Wed, 6 Aug 2014 18:05:45 +0000 (18:05 +0000)]
am
bac0fc1f: Merge "Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS." into lmp-dev
* commit '
bac0fc1f6b448c41f9f3889cba2b93c718dc1788':
Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS.
Dan Sandler [Wed, 6 Aug 2014 18:01:41 +0000 (18:01 +0000)]
am
4bdf8b49: Merge "Replace missing resource." into lmp-dev
* commit '
4bdf8b498bf588f42368faf822f757fcd97a7959':
Replace missing resource.
Fabrice Di Meglio [Wed, 6 Aug 2014 18:01:40 +0000 (18:01 +0000)]
am
bce84e79: Merge "Fix bug #
16712121 Add \'Experimental\' substring to \'High contrast text\'" into lmp-dev
* commit '
bce84e798bbfbb9fd576cb785d90bf69cb3843e0':
Fix bug #
16712121 Add 'Experimental' substring to 'High contrast text'
Fabrice Di Meglio [Wed, 6 Aug 2014 18:27:39 +0000 (18:27 +0000)]
Merge "Fix bug #
16800261 Settings app: Device administrator screen padding issue" into lmp-dev
Fabrice Di Meglio [Wed, 6 Aug 2014 18:25:39 +0000 (11:25 -0700)]
Fix bug #
16800261 Settings app: Device administrator screen padding issue
- remove listPreferredItemPaddingStart / listPreferredItemPaddingEnd from
the ListView and add it to the list item
- add missing 8dp end padding for the icon
Change-Id: I78696e5ee8e243771d23c86fa178de2f60b5c88d
Fabrice Di Meglio [Wed, 6 Aug 2014 17:57:34 +0000 (17:57 +0000)]
Merge "Fix bug #
16712121 Add 'Experimental' substring to 'High contrast text'" into lmp-dev
Fabrice Di Meglio [Wed, 6 Aug 2014 17:55:39 +0000 (10:55 -0700)]
Fix bug #
16712121 Add 'Experimental' substring to 'High contrast text'
- add "(Experimental)" as a summary text for "High contrast text"
Change-Id: I6faf1ea382e90a4f0dffcc8a093e4aa5a4653d23
Alexandra Gherghina [Wed, 6 Aug 2014 13:45:43 +0000 (13:45 +0000)]
am
1fcd7faa: Merge "Clears previously added cross-profile-intents" into lmp-dev
* commit '
1fcd7faad666cfb56553c7313723a5c6fc8df3cb':
Clears previously added cross-profile-intents
Dianne Hackborn [Wed, 6 Aug 2014 01:13:15 +0000 (01:13 +0000)]
am
dc77335e: Merge "Fix issue #
16537318: clarify voice interaction strings." into lmp-dev
* commit '
dc77335eda0edee8e8a72d04155aacad91ddc12c':
Fix issue #
16537318: clarify voice interaction strings.
Svet Ganov [Tue, 5 Aug 2014 22:25:06 +0000 (22:25 +0000)]
am
c15c0c07: Add support for widgets in user profiles
* commit '
c15c0c078e65dfd8c10cf646fcd556cc26a6f62d':
Add support for widgets in user profiles
Svet Ganov [Fri, 1 Aug 2014 22:06:43 +0000 (15:06 -0700)]
Add support for widgets in user profiles
bug:
14991269
Change-Id: I7f71787bf5e5278230063b9d3bafac96a0680682
Adrian Roos [Tue, 5 Aug 2014 19:12:22 +0000 (19:12 +0000)]
am
1f4049ed: Merge "Ask about redacted notifications after setting up a secure lock" into lmp-dev
* commit '
1f4049edfe1937ce19c7d93a5576ea03db83ad50':
Ask about redacted notifications after setting up a secure lock
John Spurlock [Tue, 5 Aug 2014 15:13:07 +0000 (15:13 +0000)]
am
802ddf99: Settings: New application-level notification settings.
* commit '
802ddf99f57e316d0fd87c2cfeed5dc3a0cfa8fe':
Settings: New application-level notification settings.
John Spurlock [Fri, 18 Jul 2014 15:51:13 +0000 (11:51 -0400)]
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
Geoff Mendal [Tue, 5 Aug 2014 01:03:22 +0000 (01:03 +0000)]
am
f3dfd182: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
f3dfd182e17c91ae4cd9e40a96308b83fdaefb49':
Import translations. DO NOT MERGE
Adrian Roos [Tue, 5 Aug 2014 19:10:20 +0000 (19:10 +0000)]
Merge "Ask about redacted notifications after setting up a secure lock" into lmp-dev
Adrian Roos [Tue, 5 Aug 2014 17:41:11 +0000 (19:41 +0200)]
Ask about redacted notifications after setting up a secure lock
Bug:
14437890
Change-Id: I54cf355242375e8c7968c7d27c441fbd0a54cef2
Dan Sandler [Wed, 6 Aug 2014 18:01:19 +0000 (18:01 +0000)]
Merge "Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS." into lmp-dev
Dan Sandler [Wed, 23 Jul 2014 03:15:17 +0000 (23:15 -0400)]
Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS.
Bug:
15331132
Change-Id: Ia80ccb2cfdf60116bd50601e60ff131619eafcc5
Dan Sandler [Wed, 6 Aug 2014 17:53:16 +0000 (13:53 -0400)]
Replace missing resource.
Bug:
16833578
Change-Id: I9ad1dc992577f6bfdc9d1201b6c13591a32f3fc8
Dan Sandler [Wed, 6 Aug 2014 17:59:24 +0000 (17:59 +0000)]
Merge "Replace missing resource." into lmp-dev
Geoff Mendal [Tue, 5 Aug 2014 00:48:51 +0000 (00:48 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Tue, 5 Aug 2014 00:35:58 +0000 (17:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: If24e248354ae999208643fb8f91b0c0a9e7de233
Auto-generated-cl: translation import
Geoff Mendal [Wed, 6 Aug 2014 19:31:20 +0000 (19:31 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Wed, 6 Aug 2014 19:23:02 +0000 (12:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9d45348a4c9fab36e1c23ddf01b3c5c2cb535f56
Auto-generated-cl: translation import
Zoltan Szatmary-Ban [Thu, 7 Aug 2014 13:38:59 +0000 (13:38 +0000)]
Merge "Badge texts correctly for accessibility in Settings" into lmp-dev
Zoltan Szatmary-Ban [Wed, 23 Jul 2014 10:02:46 +0000 (11:02 +0100)]
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
Sander Alewijnse [Thu, 7 Aug 2014 11:49:32 +0000 (11:49 +0000)]
Merge "Prevent launcher switching in Settings app." into lmp-dev
Sander Alewijnse [Tue, 15 Jul 2014 19:23:25 +0000 (20:23 +0100)]
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
Amith Yamasani [Wed, 6 Aug 2014 23:16:27 +0000 (23:16 +0000)]
Merge "Fix removal of optional settings tiles" into lmp-dev
Amith Yamasani [Wed, 6 Aug 2014 22:48:10 +0000 (15:48 -0700)]
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
Alexandra Gherghina [Wed, 6 Aug 2014 13:42:42 +0000 (13:42 +0000)]
Merge "Clears previously added cross-profile-intents" into lmp-dev
Dianne Hackborn [Tue, 5 Aug 2014 23:18:00 +0000 (23:18 +0000)]
Merge "Fix issue #
16537318: clarify voice interaction strings." into lmp-dev
Dianne Hackborn [Tue, 5 Aug 2014 20:58:26 +0000 (13:58 -0700)]
Fix issue #
16537318: clarify voice interaction strings.
Change-Id: I7e2c379e28447fa83ecf9c53b064d7917253b880
Etan Cohen [Mon, 4 Aug 2014 23:00:46 +0000 (23:00 +0000)]
am
572d2539: Radio Information UI for enabling/disabling debug settings of MO over VoLTE
* commit '
572d25398297049a4da3042d58b1ccecf3514e4d':
Radio Information UI for enabling/disabling debug settings of MO over VoLTE
Etan Cohen [Mon, 4 Aug 2014 03:38:30 +0000 (20:38 -0700)]
Radio Information UI for enabling/disabling debug settings of MO over VoLTE
Change-Id: Ib05ff460ac6001c511113e80a63707a073908637
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