OSDN Git Service
Amit Mahajan [Sat, 11 Oct 2014 00:15:48 +0000 (17:15 -0700)]
resolved conflicts for merge of
88b2790d to lmp-sprout-dev
Change-Id: I4f43133131aa7ef8eeec97edc993da06c1883903
Amit Mahajan [Fri, 10 Oct 2014 22:41:08 +0000 (22:41 +0000)]
Merge "Fix to show signal strength as 0 if out of service." into lmp-dev
Amit Mahajan [Fri, 10 Oct 2014 21:23:22 +0000 (14:23 -0700)]
Fix to show signal strength as 0 if out of service.
Bug:
17942583
Change-Id: I399e5352b4585cff42ee5c7dd164315c1797110a
Dianne Hackborn [Thu, 9 Oct 2014 19:29:33 +0000 (19:29 +0000)]
am
a4204bde: Merge "Update to use "real" L codename." into lmp-dev
* commit '
a4204bde454bbac665c7c1302056c9a64f76ffb1':
Update to use "real" L codename.
Zoltan Szatmary-Ban [Thu, 9 Oct 2014 19:11:25 +0000 (19:11 +0000)]
am
50263efb: Remove CA Cert UI item from one list only
* commit '
50263efbaf5ce432c7335c1428ca10c1096cce1f':
Remove CA Cert UI item from one list only
Dianne Hackborn [Thu, 9 Oct 2014 16:54:16 +0000 (16:54 +0000)]
Merge "Update to use "real" L codename." into lmp-dev
Zoltan Szatmary-Ban [Thu, 9 Oct 2014 12:00:32 +0000 (13:00 +0100)]
Remove CA Cert UI item from one list only
When removing a CA Cert in TrustedCredentialsSettings the UI item
is now removed from the list of the respective profile only.
Bug:
17926190
Change-Id: I7f7ae3498717cc457cb9e360e59bb365225b0cb6
Sanket Padawe [Thu, 9 Oct 2014 00:33:10 +0000 (00:33 +0000)]
Merge "Removing display number format from SIM UI" into lmp-sprout-dev
Sanket Padawe [Wed, 8 Oct 2014 22:41:41 +0000 (15:41 -0700)]
Removing display number format from SIM UI
Removed "Display Number" from the SIM settings UI.
Change-Id: Ib2b228931dfac56503ac56ffdf2238e6f416a469
Dianne Hackborn [Wed, 8 Oct 2014 16:38:36 +0000 (09:38 -0700)]
Update to use "real" L codename.
Change-Id: If7112bc4a41007bd3dbcb2b4d2c9ff9e44f7cf0c
Amith Yamasani [Tue, 7 Oct 2014 19:58:24 +0000 (19:58 +0000)]
am
742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev
* commit '
742a6803c31692f6cf0b36ef934cf1e9bc9b01d8':
Set default restrictions for a newly created user
Amith Yamasani [Tue, 7 Oct 2014 17:41:09 +0000 (17:41 +0000)]
Merge "Set default restrictions for a newly created user" into lmp-dev
Amith Yamasani [Mon, 6 Oct 2014 21:16:11 +0000 (14:16 -0700)]
Set default restrictions for a newly created user
Call a different createUser version that sets up the defaults.
Make sure any previously created guest also gets the restrictions
as soon as they are changed.
Bug:
17832802
Bug:
17891763
Change-Id: I3eaa9e3da32b2f436699db24bb7be2668f1480b3
Geoff Mendal [Tue, 7 Oct 2014 00:08:25 +0000 (00:08 +0000)]
am
7096c2dd: (-s ours) Import translations. DO NOT MERGE
* commit '
7096c2dd0b1fadabe6f2bcb07ef5045405f2337f':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 7 Oct 2014 00:04:43 +0000 (17:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I86bdfc2ed82420c69d8123d82c3e376eef9ff2b1
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 23:53:34 +0000 (16:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I081acd53e6011744f1fdf01403290172ac9ab96f
Auto-generated-cl: translation import
Baligh Uddin [Sun, 5 Oct 2014 18:10:55 +0000 (18:10 +0000)]
am
43848de1: (-s ours) Import translations. DO NOT MERGE
* commit '
43848de1603dc30e390049e2057285303132a836':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 04:38:39 +0000 (21:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9049c251a4ee54d87835a2a4a892c15ddf313a1e
Auto-generated-cl: translation import
Baligh Uddin [Sun, 5 Oct 2014 04:30:28 +0000 (21:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebb3a9a429b160434faeae21a112480e888c6bb4
Auto-generated-cl: translation import
PauloftheWest [Fri, 3 Oct 2014 22:45:26 +0000 (22:45 +0000)]
Merge "[DS] DSDS support for Settings" into lmp-sprout-dev
PauloftheWest [Fri, 3 Oct 2014 18:07:14 +0000 (11:07 -0700)]
[DS] DSDS support for Settings
+ Rebase and modify as APIs rename.
+ Fix bugs on set sub's name as title.
+ Enabled Sim Settings.
Change-Id: Ic731c7882be95b86b6b8dcdd3f208a6125681f3e
Svetoslav [Fri, 3 Oct 2014 22:06:18 +0000 (22:06 +0000)]
am
5cdd3f4f: Update accessibility plus secure lock warning messages.
* commit '
5cdd3f4f6fcee6af89742dc0427df4bba4214cc8':
Update accessibility plus secure lock warning messages.
Svetoslav [Fri, 3 Oct 2014 20:27:08 +0000 (13:27 -0700)]
Update accessibility plus secure lock warning messages.
bug:
17671790
Change-Id: I694586452963a8f0e4c86b5c9c807ca9bb2ec15d
John Spurlock [Fri, 3 Oct 2014 14:00:25 +0000 (14:00 +0000)]
am
c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev
* commit '
c05b739c691684350b63ca2e232319ee4fcaa76d':
Settings: Update media & alarm stream icons.
John Spurlock [Fri, 3 Oct 2014 13:55:34 +0000 (13:55 +0000)]
Merge "Settings: Update media & alarm stream icons." into lmp-dev
PauloftheWest [Fri, 3 Oct 2014 13:46:28 +0000 (13:46 +0000)]
am
6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec.
* commit '
6e26427e521a79a11c1a9e1b64995494290eaf7c':
Updated Wi-Fi hotspot dialog to the Material Spec.
John Spurlock [Thu, 2 Oct 2014 23:20:36 +0000 (19:20 -0400)]
Settings: Update media & alarm stream icons.
Update icon pointers and remove obsolete preference class.
Bug:
17762712
Change-Id: Ia4b96c5b38f2a73a7a339b2ab3abfcd433f4403d
Wink Saville [Thu, 2 Oct 2014 22:54:21 +0000 (15:54 -0700)]
Enable Sim Settings
Changes from Paul and MTK will be coming soon but this
allow us to do some initial testing.
Change-Id: Ic52bc3656bc7066c8bbb7435eaf14e9b8e66a257
PauloftheWest [Thu, 2 Oct 2014 13:22:47 +0000 (06:22 -0700)]
Updated Wi-Fi hotspot dialog to the Material Spec.
+ If there is scrolling then force the scrollbars to always appear.
+ Align contents of the dialog with the title.
+ Change "Network SSID" to "Network name".
+ Added wifi_* styles to other style xml files so that Wi-Fi hotspot dialogs are visible on tablets.
+ Move layout_width/height from res/layout/{wifi_dialog.xml, wifi_dialog_row.xml} from style into the xml file.
Bug:
17684359
Change-Id: I42fb69132d6ba0fb8d9853de6f5524f29e6b70b6
PauloftheWest [Wed, 1 Oct 2014 21:12:30 +0000 (21:12 +0000)]
am
59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
* commit '
59d33dbd25d8ca968e03bdeefedea9b0fe2e01f3':
Fixed a Setting Bluetooth Airplane mode bug.
PauloftheWest [Wed, 1 Oct 2014 21:07:55 +0000 (21:07 +0000)]
Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
Alan Viverette [Wed, 1 Oct 2014 20:12:01 +0000 (20:12 +0000)]
am
7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
* commit '
7a4d229d2dd958fe033c739785eae6728caa5184':
Ensure recycled APN preferences are updated to show radio button
Alan Viverette [Wed, 1 Oct 2014 20:05:20 +0000 (20:05 +0000)]
Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
Alan Viverette [Wed, 1 Oct 2014 19:42:18 +0000 (12:42 -0700)]
Ensure recycled APN preferences are updated to show radio button
BUG:
17516352
Change-Id: I5da19b7c6d5a3ec03fe24f7bdfda656d6d616342
Baligh Uddin [Wed, 1 Oct 2014 19:32:32 +0000 (19:32 +0000)]
am
9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
9d4dc326d1988ef2760e9d0d31239e43801587e2':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 1 Oct 2014 19:29:16 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Wed, 1 Oct 2014 19:29:10 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Hui Shu [Wed, 1 Oct 2014 18:32:04 +0000 (18:32 +0000)]
am
905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit '
905f9e2f90c886a8405e0cca8286cd3dd7f430e9':
Remove WebView DRP Setting from Developer Settings
Hui Shu [Wed, 1 Oct 2014 18:28:51 +0000 (18:28 +0000)]
Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
Zoltan Szatmary-Ban [Wed, 1 Oct 2014 17:02:07 +0000 (17:02 +0000)]
am
b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
* commit '
b0c216d3b95b3aa3a0a38ebde92ec19956598e9d':
Disambiguate categories in Settings > Trusted Credentials
Zoltan Szatmary-Ban [Wed, 1 Oct 2014 15:47:59 +0000 (15:47 +0000)]
Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
PauloftheWest [Wed, 1 Oct 2014 13:14:58 +0000 (06:14 -0700)]
Fixed a Setting Bluetooth Airplane mode bug.
+ This patch moves the switch listeners from setup/teardown of the SwitchBar
to pause/resume of Bluetooth Settings. This prevents Bluetooth from
receiving connect messages while Airplane mode is turning off Bluetooth
(which is what caused Bluetooth to re-enable.)
Bug:
17465951
Change-Id: I4d32fcf5bb3a2241ed03e2295c86390e15743954
Maurice Lam [Wed, 1 Oct 2014 15:03:19 +0000 (15:03 +0000)]
am
f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev
* commit '
f7b567081ef5f4daafdf0b229793323751e0d764':
[WifiSetup] Update background texture
Svetoslav [Wed, 1 Oct 2014 15:02:20 +0000 (15:02 +0000)]
am
52448442: Use default encryption password if an accessibility service is enabled.
* commit '
524484426855f814ff1f3189fd5221dd630dbf8c':
Use default encryption password if an accessibility service is enabled.
Fabrice Di Meglio [Wed, 1 Oct 2014 15:00:30 +0000 (15:00 +0000)]
am
fc14e272: Merge "Update Settings App icons" into lmp-dev
* commit '
fc14e272aaed6a6e36c044b93e12d68896aaa543':
Update Settings App icons
PauloftheWest [Wed, 1 Oct 2014 14:58:41 +0000 (14:58 +0000)]
am
29aab7a2: Fixed a Settings crash.
* commit '
29aab7a2ad3cabdc1681fdc93a0f00b20072d385':
Fixed a Settings crash.
Maurice Lam [Wed, 1 Oct 2014 01:54:40 +0000 (01:54 +0000)]
Merge "[WifiSetup] Update background texture" into lmp-dev
Maurice Lam [Tue, 30 Sep 2014 02:40:42 +0000 (19:40 -0700)]
[WifiSetup] Update background texture
Bug:
17611097
Change-Id: I75264ecac3b689426500e063a18d687866638a85
Hui Shu [Tue, 30 Sep 2014 23:53:36 +0000 (16:53 -0700)]
Remove WebView DRP Setting from Developer Settings
BUG:
17730990
Change-Id: I776844ee617916037b861ec7385365bb5873d4a0
Svetoslav [Tue, 30 Sep 2014 01:15:45 +0000 (18:15 -0700)]
Use default encryption password if an accessibility service is enabled.
If accessibility is on and the user selectes a secure lock we use weaker
encryption to enable running accessibility layer at the time the user
authenticates. This change adds a warning message to the enable accessibility
service dialog if there is a secure lock and also adds a warning as a
summary for the secure lock in the lock chooser activity. Both warning
mention the weaker encryption to be used.
bug:
17671790
Change-Id: Ib5cc9d3a78f751e18362bb9238fd2804c3b600f8
Baligh Uddin [Tue, 30 Sep 2014 19:59:02 +0000 (12:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I79c53aaccbdec874aa56c457c61e8f5858a42c45
Auto-generated-cl: translation import
Baligh Uddin [Tue, 30 Sep 2014 19:47:02 +0000 (12:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3b6fcec9576d2305d0eb872b9d3d404f4b0556a1
Auto-generated-cl: translation import
Fabrice Di Meglio [Tue, 30 Sep 2014 19:45:31 +0000 (19:45 +0000)]
Merge "Update Settings App icons" into lmp-dev
Zoltan Szatmary-Ban [Tue, 30 Sep 2014 15:30:07 +0000 (16:30 +0100)]
Disambiguate categories in Settings > Trusted Credentials
Use fixed category names (e.g. 'Personal' and 'Work') on Trusted Credentials
screen instead of names of profiles that may be the same (or similar) for both.
Bug:
17629895
Change-Id: I25b39310f7b9f445d2724be046a16cc82f5d1a9a
Fabrice Di Meglio [Tue, 30 Sep 2014 02:17:56 +0000 (19:17 -0700)]
Update Settings App icons
Per UX request
See bug: #
17703962 update Settings app icons
Change-Id: I3cc0010e498a6150d6633ae9f0def408db22c77a
PauloftheWest [Fri, 26 Sep 2014 23:05:44 +0000 (16:05 -0700)]
Fixed a Settings crash.
+ When in Settings->More... we will no longer provide a tethering option
if tethering requires provisioning, but the provisioning app is invalid.
Bug:
17671381
Change-Id: I48a8178865a7ffddec714c1f6ee6f18d34801b60
Baligh Uddin [Mon, 29 Sep 2014 20:41:53 +0000 (20:41 +0000)]
am
5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
5c664d8e20e2b093f7602f8114e26a4c97f45ebd':
Import translations. DO NOT MERGE
PauloftheWest [Mon, 29 Sep 2014 20:41:53 +0000 (20:41 +0000)]
am
709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev
* commit '
709ddd5c24ca276e0c2efc76c77ae375276cc080':
Fixed multiple MAP issues.
Baligh Uddin [Mon, 29 Sep 2014 16:37:22 +0000 (16:37 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
PauloftheWest [Mon, 29 Sep 2014 15:10:23 +0000 (15:10 +0000)]
Merge "Fixed multiple MAP issues." into lmp-dev
Baligh Uddin [Mon, 29 Sep 2014 07:31:03 +0000 (00:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic77eba24209b5d24e9272fb70f3c828e5f04d422
Auto-generated-cl: translation import
Robert Greenwalt [Sat, 27 Sep 2014 00:13:17 +0000 (00:13 +0000)]
am
ce77a43a: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev
* commit '
ce77a43abfb05ee6011ebf6e5ced8dd11e163dcf':
ATT Entitlement changes in Settings to pass Tether Type.
Robert Greenwalt [Sat, 27 Sep 2014 00:09:02 +0000 (00:09 +0000)]
Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev
Elliott Hughes [Fri, 26 Sep 2014 22:58:34 +0000 (22:58 +0000)]
am
ed6a6ca0: Make the system locale available to the decryption UI.
* commit '
ed6a6ca0266346142cfd07389ae9c5b3be6b1eb6':
Make the system locale available to the decryption UI.
Elliott Hughes [Fri, 26 Sep 2014 19:29:12 +0000 (12:29 -0700)]
Make the system locale available to the decryption UI.
Bug:
17659622
Change-Id: I8f7d1c4d1d04ec483b6a3c9bea742f79374b647a
Rohit Sisodia [Mon, 22 Sep 2014 21:34:56 +0000 (16:34 -0500)]
ATT Entitlement changes in Settings to pass Tether Type.
ATT has different provisioning servers for BT,Wifi and USB Tethering and
Entitlement app need the type of Tethering to be passed before provisioning
request goes out.
Bug:
17640036
Change-Id: I6683a747e1925716575ba683aeefc644ced7e37f
Alexandra Gherghina [Fri, 26 Sep 2014 19:55:28 +0000 (19:55 +0000)]
am
9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev
* commit '
9de68440a9ae9cfadee3939c1ca461e42871f766':
Match parent width for user spinner to fix tint
Alexandra Gherghina [Fri, 26 Sep 2014 19:55:27 +0000 (19:55 +0000)]
am
3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
* commit '
3c3ceb9d42ddd8ee65547183b3685fd088a6676e':
Use plain user icon in UserSpinnerAdapter
Alexandra Gherghina [Fri, 26 Sep 2014 17:53:27 +0000 (17:53 +0000)]
Merge "Match parent width for user spinner to fix tint" into lmp-dev
Alexandra Gherghina [Fri, 26 Sep 2014 17:42:48 +0000 (17:42 +0000)]
Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
PauloftheWest [Fri, 26 Sep 2014 14:54:19 +0000 (14:54 +0000)]
am
3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
* commit '
3aabfca462af26c487d2a834f70d0998d7556637':
Fixed a crash when rotating a WPS dialog.
PauloftheWest [Fri, 26 Sep 2014 14:47:27 +0000 (14:47 +0000)]
Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
Michael Wright [Thu, 25 Sep 2014 22:26:59 +0000 (22:26 +0000)]
am
1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev
* commit '
1b87bec5de17dc23cf63d9f71358b8c979f8c896':
If a device identifier is specified, bring up keyboard layouts dialog.
Michael Wright [Thu, 25 Sep 2014 22:18:33 +0000 (22:18 +0000)]
Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev
PauloftheWest [Thu, 25 Sep 2014 19:36:09 +0000 (12:36 -0700)]
Fixed a crash when rotating a WPS dialog.
Bug:
17635632
Change-Id: Ibd4497362dc61a2f82c098889145430740207638
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 16:24:18 +0000 (16:24 +0000)]
am
a2b7bb6b: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev
* commit '
a2b7bb6be612fc050fc7634815a614f84fcac778':
Make Force Stop button work for packages of managed profile
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 16:24:17 +0000 (16:24 +0000)]
am
7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
* commit '
7258650efdea447dea6f2f557cb9d2b90df92754':
Start PowerUsageDetails fragment in the correct activity
Alexandra Gherghina [Thu, 25 Sep 2014 16:24:15 +0000 (16:24 +0000)]
am
eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev
* commit '
eac7cc5eead6d79fb6e0558d8005b4c8ea1911a1':
Add null check for sync authorities of an account type
Jeff Sharkey [Thu, 25 Sep 2014 16:22:25 +0000 (16:22 +0000)]
am
d642d1ab: Merge "Include reason when wiping data." into lmp-dev
* commit '
d642d1abcfed427e4c152e28e39b50cdb68b81c6':
Include reason when wiping data.
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 10:38:40 +0000 (10:38 +0000)]
Merge "Make Force Stop button work for packages of managed profile" into lmp-dev
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 10:35:57 +0000 (10:35 +0000)]
Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
Alexandra Gherghina [Thu, 25 Sep 2014 10:29:16 +0000 (11:29 +0100)]
Match parent width for user spinner to fix tint
Bug:
17640172
Change-Id: I4cbea855cac9180d193f9ba936ec1bab81df537d
Alexandra Gherghina [Mon, 22 Sep 2014 09:16:06 +0000 (10:16 +0100)]
Use plain user icon in UserSpinnerAdapter
Before, we were using CircleFramedDrawable, used by user settings.
That performs some alterations on the image (adds an outline and
shadow) that made it inconsistent with the corp icon.
Bug:
17561925
Change-Id: I2490360d332a1b93864858122868b571f2949617
Paul Lawrence [Thu, 25 Sep 2014 09:51:35 +0000 (09:51 +0000)]
am
29df3796: Merge "Hide controls once password is known good" into lmp-dev
* commit '
29df37969794aa4db73af0d0fdbcde273aef5ab2':
Hide controls once password is known good
Alexandra Gherghina [Thu, 25 Sep 2014 09:37:57 +0000 (09:37 +0000)]
Merge "Add null check for sync authorities of an account type" into lmp-dev
Jeff Sharkey [Wed, 24 Sep 2014 23:28:00 +0000 (23:28 +0000)]
Merge "Include reason when wiping data." into lmp-dev
PauloftheWest [Wed, 24 Sep 2014 22:21:30 +0000 (15:21 -0700)]
Fixed multiple MAP issues.
+ Bluetooth Settings properly stores the MAP state as a shared
preference.
+ A Bluetooth's Settings profile will display MAP even if it was
previously denied.
Bug:
17391677
Change-Id: I94dd7d1a75cc4fe09647c85d84d9e3651a07a673
Paul Lawrence [Wed, 24 Sep 2014 22:59:07 +0000 (22:59 +0000)]
Merge "Hide controls once password is known good" into lmp-dev
Jeff Sharkey [Wed, 24 Sep 2014 20:57:07 +0000 (13:57 -0700)]
Include reason when wiping data.
This will help us track down who requested a data wipe.
Bug:
17412160
Change-Id: I46b3f12a661a406450d23a7974513f40beb23c8d
Adrian Roos [Wed, 24 Sep 2014 17:11:42 +0000 (17:11 +0000)]
am
6d5c75f6: Prevent saving credentials multiple times
* commit '
6d5c75f6cd928befb348fa283e53edc10716f151':
Prevent saving credentials multiple times
Adrian Roos [Wed, 24 Sep 2014 13:28:12 +0000 (15:28 +0200)]
Prevent saving credentials multiple times
Bug:
17610563
Change-Id: Ibb51889fc8085f8fad5e36481af2419576cda34a
Alexandra Gherghina [Wed, 24 Sep 2014 10:29:48 +0000 (11:29 +0100)]
Add null check for sync authorities of an account type
This protects against a potential NPE if there are no sync authorities for
an account of a given type.
Bug:
17612697
Change-Id: Ifd34b5b7692cbcc8de78d353eedd284e499f954e
Zoltan Szatmary-Ban [Mon, 22 Sep 2014 16:14:08 +0000 (17:14 +0100)]
Start PowerUsageDetails fragment in the correct activity
Make sure the stack does not get corrupted by running a fragment as a
managed profile in an activity that runs as primary profile.
Bug:
17523189
Change-Id: I7a066a411c7995ffe44b73c6dc27b24eec85b5b3
Alan Viverette [Wed, 24 Sep 2014 01:34:44 +0000 (01:34 +0000)]
am
3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev
* commit '
3156e38f5ec788048439a401ea5f5012e11ea2a7':
Fix background colors to point directly to theme attribute
Alan Viverette [Wed, 24 Sep 2014 01:25:06 +0000 (01:25 +0000)]
Merge "Fix background colors to point directly to theme attribute" into lmp-dev
Alan Viverette [Wed, 24 Sep 2014 01:14:54 +0000 (18:14 -0700)]
Fix background colors to point directly to theme attribute
BUG:
17520824
Change-Id: I77fcbc2a5535f4916053cf1668cbe2e432b2dc95
Fabrice Di Meglio [Wed, 24 Sep 2014 00:05:54 +0000 (00:05 +0000)]
am
a1c6a0c8: Merge "Fix bug #
17594602 Battery Usage refresh icon needs updating" into lmp-dev
* commit '
a1c6a0c895f6d580bebfb714c7930f5ec015770d':
Fix bug #
17594602 Battery Usage refresh icon needs updating
Fabrice Di Meglio [Tue, 23 Sep 2014 23:58:57 +0000 (23:58 +0000)]
Merge "Fix bug #
17594602 Battery Usage refresh icon needs updating" into lmp-dev
Fabrice Di Meglio [Tue, 23 Sep 2014 23:17:00 +0000 (16:17 -0700)]
Fix bug #
17594602 Battery Usage refresh icon needs updating
- use the correct Framework asset for "refresh"
Change-Id: I57d55c0646fb3a8693cf5cc51a4c7fa213873385
vandwalle [Tue, 23 Sep 2014 22:41:31 +0000 (22:41 +0000)]
am
3962f171: Merge "correctly report DHCP failures" into lmp-dev
* commit '
3962f171a9a44adea57618c5ac9bf4a47342c0b6':
correctly report DHCP failures
OSDN Git Service
