OSDN Git Service
John Spurlock [Tue, 14 Oct 2014 16:40:43 +0000 (16:40 +0000)]
Merge "Settings: Restart existing volumizers in volume prefs." into lmp-mr1-dev
Fabrice Di Meglio [Mon, 13 Oct 2014 23:29:01 +0000 (23:29 +0000)]
Merge "Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
Fabrice Di Meglio [Mon, 13 Oct 2014 23:02:25 +0000 (16:02 -0700)]
Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Per UX request, use a Switch for:
- Automatic date & time
- Automatic time zone
- Use 24-hour format
Change-Id: Ie35816febe2469705446fdd2c703b52ff8b0929a
Geoff Mendal [Mon, 13 Oct 2014 22:25:17 +0000 (22:25 +0000)]
am
c9282823: (-s ours) am
e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
c92828231993aa2c1a447c37a4a6f9740e950a72':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 22:21:27 +0000 (22:21 +0000)]
am
ba35dd1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
ba35dd1bf70e74987e9d167961e747357574a264':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 22:20:30 +0000 (22:20 +0000)]
am
e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
e4d510fac1c149784414004803b9d2e2b7b0f7af':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 22:15:43 +0000 (22:15 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 13 Oct 2014 22:14:10 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
John Spurlock [Mon, 13 Oct 2014 22:13:01 +0000 (22:13 +0000)]
am
ef390443: am
a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.
* commit '
ef390443eb7a6a4ac52c62aea65e7ba94f1f897a':
Fix battery-history-chart large-mode labels in RTL layouts.
John Spurlock [Mon, 13 Oct 2014 22:03:54 +0000 (22:03 +0000)]
am
a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.
* commit '
a312f7f8044a07a2a41de477cc30bb34fc1df55f':
Fix battery-history-chart large-mode labels in RTL layouts.
Alan Viverette [Mon, 13 Oct 2014 20:58:39 +0000 (20:58 +0000)]
Merge "Update Settings to use themed Context.getDrawable()" into lmp-mr1-dev
John Spurlock [Wed, 8 Oct 2014 16:34:50 +0000 (12:34 -0400)]
Settings: Restart existing volumizers in volume prefs.
Use the new .start() method to ensure the underlying volumizer
is always started, regardless of pref activity lifecycle.
Depends on frameworks/base:
I2f860864161f818d5a62a28331ef1c47051fb39f
Bug:
17898190
Change-Id: I55dea590c13363730549aa29f194337efccdeaf7
John Spurlock [Mon, 13 Oct 2014 19:48:50 +0000 (15:48 -0400)]
Fix battery-history-chart large-mode labels in RTL layouts.
Bug:
17425651
Change-Id: Iae53e111fa3c6bc822821a6a30bd34edb058c1a5
Geoff Mendal [Mon, 13 Oct 2014 19:44:59 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8d9e5a58b77ec02b4311629c6520a86e9767a788
Auto-generated-cl: translation import
Geoff Mendal [Mon, 13 Oct 2014 19:36:34 +0000 (12:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib43bc66e564fd16477a7b20724a60f0a4845243f
Auto-generated-cl: translation import
Geoff Mendal [Mon, 13 Oct 2014 19:32:00 +0000 (12:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I58f31b459dd9f775a16c0b887478f15eb7116167
Auto-generated-cl: translation import
Alan Viverette [Sat, 11 Oct 2014 02:49:47 +0000 (02:49 +0000)]
am
87b151c6: am
178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev
* commit '
87b151c65090dfbfcfe09c884377cedd7fd3a34b':
Add option for serif monospace captioning font
Amit Mahajan [Sat, 11 Oct 2014 02:49:38 +0000 (02:49 +0000)]
am
8151ef29: resolved conflicts for merge of
88b2790d to lmp-sprout-dev
* commit '
8151ef29aa80006b7597ed57d507fe48338110c7':
Fix to show signal strength as 0 if out of service.
Alan Viverette [Sat, 11 Oct 2014 00:23:54 +0000 (00:23 +0000)]
am
178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev
* commit '
178db4d5f7522a81ee5cce02ccbb080c2e555697':
Add option for serif monospace captioning font
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
Alan Viverette [Fri, 10 Oct 2014 23:40:58 +0000 (23:40 +0000)]
Merge "Add option for serif monospace captioning font" into lmp-dev
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
Alan Viverette [Fri, 10 Oct 2014 19:24:45 +0000 (12:24 -0700)]
Add option for serif monospace captioning font
BUG:
17666124
Change-Id: I57e3938d16e162165caee7ec9373c59c824cd1da
Alan Viverette [Fri, 10 Oct 2014 17:58:58 +0000 (10:58 -0700)]
Update Settings to use themed Context.getDrawable()
Explicit null theme is passed when using Resources.getDrawable() and
no theme is available, e.g. when using getResourcesForApplication().
This fixes an issue with ic_text_dot theming and helps avoid similar
issues in the future.
BUG:
17648301
Change-Id: I3e97c3490b6f2a55744f567b21284f2935ae9af7
Dianne Hackborn [Thu, 9 Oct 2014 22:02:02 +0000 (22:02 +0000)]
am
8541206e: am
a4204bde: Merge "Update to use "real" L codename." into lmp-dev
* commit '
8541206e6bbc08f5e5bc7d545fcdce38ff853f8e':
Update to use "real" L codename.
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:22:48 +0000 (19:22 +0000)]
am
95dda800: am
50263efb: Remove CA Cert UI item from one list only
* commit '
95dda800a988c1ca778dae08563b6875c30d089a':
Remove CA Cert UI item from one list only
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
Svetoslav [Thu, 9 Oct 2014 18:21:53 +0000 (18:21 +0000)]
Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev
Dianne Hackborn [Thu, 9 Oct 2014 16:54:16 +0000 (16:54 +0000)]
Merge "Update to use "real" L codename." into lmp-dev
Sanket Padawe [Thu, 9 Oct 2014 13:03:33 +0000 (13:03 +0000)]
am
e4cbb865: Merge "Removing display number format from SIM UI" into lmp-sprout-dev
* commit '
e4cbb86596dd55200eb1842b66463a70e59a8ee4':
Removing display number format from SIM UI
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
Svetoslav [Wed, 8 Oct 2014 19:29:12 +0000 (12:29 -0700)]
Update accessibility service toggle switch when resuming.
An accessibility service can be enabled via a global gesture
in which case if the settings activity for enabling the service
is running its toggle switch is shown in the wrong state.
bug:
16558106
Change-Id: I2821b148475a7afae21e29148ef98db724c817f2
Amith Yamasani [Tue, 7 Oct 2014 20:03:26 +0000 (20:03 +0000)]
am
c55c581a: am
742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev
* commit '
c55c581a8a9c7fb777e80498852426a546b1504c':
Set default restrictions for a newly created user
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:32:21 +0000 (00:32 +0000)]
am
237abb0a: (-s ours) am
7096c2dd: (-s ours) Import translations. DO NOT MERGE
* commit '
237abb0a373a3f9a9e70e7f11fbc77dd65dcf80f':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 7 Oct 2014 00:32:21 +0000 (00:32 +0000)]
am
c3cd6d95: (-s ours) Import translations. DO NOT MERGE
* commit '
c3cd6d956b2687a99564010b888513250d2ac29d':
Import translations. DO NOT MERGE
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:57:23 +0000 (16:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I24a02b89f2baf4a914ff56381e46f8a326b9ddba
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:17:26 +0000 (18:17 +0000)]
am
b305e7ad: (-s ours) am
43848de1: (-s ours) Import translations. DO NOT MERGE
* commit '
b305e7adecfafbcfd0c41354750dd2a77c3fdfa9':
Import translations. DO NOT MERGE
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 18:09:22 +0000 (18:09 +0000)]
am
4aed4235: (-s ours) Import translations. DO NOT MERGE
* commit '
4aed423562538583076fe3568bdd01a613d5b36f':
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:33:29 +0000 (21:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: If4aa14267640180bada6274d733dfe955835a8b9
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
Elliott Hughes [Sat, 4 Oct 2014 00:44:10 +0000 (00:44 +0000)]
Merge "Fix percentage formatting throughout Settings." into lmp-mr1-dev
PauloftheWest [Fri, 3 Oct 2014 23:57:18 +0000 (23:57 +0000)]
am
4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev
* commit '
4046cf9cb46762a517b69c6cb78faa5903d6a3d5':
[DS] DSDS support for Settings
Elliott Hughes [Thu, 2 Oct 2014 23:36:32 +0000 (16:36 -0700)]
Fix percentage formatting throughout Settings.
Bug:
15476051
Change-Id: Ic64e7c36d0e2732d3e0e79fec2b79de42decf77d
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:12:34 +0000 (22:12 +0000)]
am
35314f27: am
5cdd3f4f: Update accessibility plus secure lock warning messages.
* commit '
35314f2771a9443acf334bf90ac88f582ded43ee':
Update accessibility plus secure lock warning messages.
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:05:42 +0000 (14:05 +0000)]
am
40fdd482: am
c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev
* commit '
40fdd482048bbf47878137f8552b6cade6832147':
Settings: Update media & alarm stream icons.
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:50:51 +0000 (13:50 +0000)]
am
32ce9484: am
6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec.
* commit '
32ce9484b7e8b039bb7d5b9f31ddaa9834fc1f5d':
Updated Wi-Fi hotspot dialog to the Material Spec.
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
Elliott Hughes [Thu, 2 Oct 2014 23:35:07 +0000 (23:35 +0000)]
Merge "Use the StorageManager constant for the PatternVisible key." into lmp-mr1-dev
Wink Saville [Thu, 2 Oct 2014 23:04:12 +0000 (23:04 +0000)]
am
dbd052ed: Enable Sim Settings
* commit '
dbd052ed5ee71b2fc552e0a2954f8c283acc6f70':
Enable Sim Settings
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
Elliott Hughes [Thu, 2 Oct 2014 20:29:58 +0000 (13:29 -0700)]
Use the StorageManager constant for the PatternVisible key.
Bug:
17659622
Change-Id: Ibd44f5c619f61764ef4e4a3447f241e2f73339b5
PauloftheWest [Wed, 1 Oct 2014 22:18:00 +0000 (22:18 +0000)]
am
c744c448: am
59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
* commit '
c744c448e472a065c1fc96fd6a26e2d1e9fa5c6a':
Fixed a Setting Bluetooth Airplane mode bug.
Alan Viverette [Wed, 1 Oct 2014 22:17:46 +0000 (22:17 +0000)]
am
91f4e5a8: am
7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
* commit '
91f4e5a8aff6266bcb9fb717f8bfc8a4323fc9cf':
Ensure recycled APN preferences are updated to show radio button
Baligh Uddin [Wed, 1 Oct 2014 22:16:50 +0000 (22:16 +0000)]
am
299c6e12: (-s ours) am
9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
299c6e127d5105890a963208a64309af42051b56':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 1 Oct 2014 22:16:47 +0000 (22:16 +0000)]
am
0905bb07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
0905bb07fc7059afc567d03dbca7696604aee0e2':
Import translations. DO NOT MERGE
Hui Shu [Wed, 1 Oct 2014 22:15:49 +0000 (22:15 +0000)]
am
c1c9888d: am
905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit '
c1c9888db4171a9db81345f428342ec838b5da99':
Remove WebView DRP Setting from Developer Settings
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:12 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-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:20:47 +0000 (17:20 +0000)]
am
45f8ffa1: am
b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
* commit '
45f8ffa1da2f5dc937ab47c5f6e097f1a2d06750':
Disambiguate categories in Settings > Trusted Credentials
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:09:26 +0000 (15:09 +0000)]
am
5fdb8fa4: am
f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev
* commit '
5fdb8fa41d44fe31148f00b6c909f511f11fde52':
[WifiSetup] Update background texture
Svetoslav [Wed, 1 Oct 2014 15:09:25 +0000 (15:09 +0000)]
am
42eff3b7: am
52448442: Use default encryption password if an accessibility service is enabled.
* commit '
42eff3b7e695c28c4074f7fd71606fa0ecfe199c':
Use default encryption password if an accessibility service is enabled.
Fabrice Di Meglio [Wed, 1 Oct 2014 15:09:24 +0000 (15:09 +0000)]
am
976aba99: am
fc14e272: Merge "Update Settings App icons" into lmp-dev
* commit '
976aba99c8b06676b9e097de74287bb70138c848':
Update Settings App icons
PauloftheWest [Wed, 1 Oct 2014 15:09:24 +0000 (15:09 +0000)]
am
cc6736bf: am
29aab7a2: Fixed a Settings crash.
* commit '
cc6736bfdee735c236814488a169ee5a7c461f73':
Fixed a Settings crash.
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.
OSDN Git Service
