OSDN Git Service
Alex Klyubin [Wed, 11 Feb 2015 19:27:24 +0000 (19:27 +0000)]
Merge "Hidden ApplicationInfo flags are now in privateFlags."
Alex Klyubin [Wed, 4 Feb 2015 16:47:12 +0000 (08:47 -0800)]
Hidden ApplicationInfo flags are now in privateFlags.
See
b9f8a5204a1b0b3919fa921e858d04124c582828.
Change-Id: I98bbe4b1a5ac0939e0000e4da8b21a1964c75e8b
Amith Yamasani [Tue, 3 Feb 2015 21:24:51 +0000 (21:24 +0000)]
Merge "set tapjacking protection for deviceadmin permission dialog"
Stephan Huber [Fri, 23 Jan 2015 08:49:57 +0000 (09:49 +0100)]
set tapjacking protection for deviceadmin permission dialog
Second try to commit tapjacking protection for device administrator permission dialog.
Remplaced tap by spaces
Signed-off-by: Stephan Huber <huber.stephan.sit@gmail.com>
Change-Id: I8e14e713d1f039ca79f5006cdeb12b65652884fb
Narayan Kamath [Mon, 15 Dec 2014 14:23:46 +0000 (14:23 +0000)]
Merge "Stop using apache-http in settings."
Narayan Kamath [Fri, 12 Dec 2014 13:53:28 +0000 (13:53 +0000)]
Stop using apache-http in settings.
Most of this usage is from crufty "test" code, and is trivially
replacable.
bug:
18027885
Change-Id: If4441a5e76405eba068479a4dcaa6012b5a74cbf
David Turner [Wed, 3 Dec 2014 10:46:30 +0000 (10:46 +0000)]
Merge "Fix Settings app crash for devices with no USB support."
Yu Ning [Tue, 2 Dec 2014 09:52:42 +0000 (17:52 +0800)]
Fix Settings app crash for devices with no USB support.
On emulator and any device that does not support USB connection, the
Settings app crashes as soon as the user tries to view the details of
an installed app. This is because the InstalledAppDetails activity
assumes that the USB service is always started, which is no longer
true due to a change in SystemServer.java (frameworks/base, Change-Id
I6dad511c652bcacc085f27ede5f8f22a6982c6bd). Adding null checks fixes
this issue.
Change-Id: I85263fb795ee06bd61ba28ec12a7161c1f17f4cc
Signed-off-by: Yu Ning <yu.ning@intel.com>
Fabrice Di Meglio [Tue, 25 Nov 2014 23:12:37 +0000 (23:12 +0000)]
Merge "IllegalStateException fixed in print service settings"
Raju Yadav [Tue, 25 Nov 2014 12:26:17 +0000 (13:26 +0100)]
IllegalStateException fixed in print service settings
Settings crashed due to IllegalStateException
as OnQueryTextListener refers to an already
detached view. The listener is set to null
on press of home key (onPause).
Change-Id: If9c76fe3ff040c295f0af9c092e8824b9a1371d7
Narayan Kamath [Mon, 24 Nov 2014 15:59:15 +0000 (15:59 +0000)]
Merge "Use shortFormat instead of shortFormat4."
Narayan Kamath [Tue, 18 Nov 2014 15:17:44 +0000 (15:17 +0000)]
Use shortFormat instead of shortFormat4.
Won't make a difference since shortFormat4 is simply shortFormat
with the 'y' characters doubled.
bug:
18388178
Change-Id: I6177807430b295035092367553da5de3b942e2d6
Elliott Hughes [Mon, 17 Nov 2014 17:28:39 +0000 (17:28 +0000)]
Merge "Remove vestigial "Choose date format" option."
Elliott Hughes [Fri, 14 Nov 2014 19:16:16 +0000 (11:16 -0800)]
Remove vestigial "Choose date format" option.
Almost all of our date formatting goes via icu these days, so this is
a no-op almost everywhere. (And should be a no-op everywhere soon.)
There's no obvious way to fix it, so remove it. UI guidelines say we
should use spelled out month names anyway.
Bug:
18322220
Change-Id: Ic9e903eceab3c096426f313bf4ef3a38644774e1
Baligh Uddin [Thu, 30 Oct 2014 18:46:41 +0000 (11:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I802b868cb89763e3a0ee655415b08303a467c9bb
Auto-generated-cl: translation import
Geoff Mendal [Mon, 20 Oct 2014 23:46:55 +0000 (23:46 +0000)]
am
795c8378: (-s ours) Import translations. DO NOT MERGE
* commit '
795c83780752d0301985d53e2e230c2088af825b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 23:33:09 +0000 (16:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80fabd3e1f2306d6b9be8973c70aaf5438e58c51
Auto-generated-cl: translation import
Baligh Uddin [Sun, 19 Oct 2014 19:57:30 +0000 (19:57 +0000)]
am
25149b38: (-s ours) Import translations. DO NOT MERGE
* commit '
25149b389501afc817f1248d704def0b4c5b5c04':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 17:10:53 +0000 (10:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3435cc63d25394c2b14089857e36de92c9a2b673
Auto-generated-cl: translation import
Jim Miller [Sat, 18 Oct 2014 02:11:05 +0000 (02:11 +0000)]
am
aa037675: Fix bad string in EncryptionInterstitial
* commit '
aa0376759873893197a0109025fd4ec8beca5929':
Fix bad string in EncryptionInterstitial
Jim Miller [Sat, 18 Oct 2014 01:28:52 +0000 (18:28 -0700)]
Fix bad string in EncryptionInterstitial
The string contains "Talkback", but it should grab one of
the installed Accessibility services so it works on 3rd party
devices.
Fixes bug
17881324
Change-Id: Iee2d8d4ce93c851badc59b5ef21462213f530a96
Jim Miller [Sat, 18 Oct 2014 01:17:34 +0000 (01:17 +0000)]
am
47adff0a: Show warning dialog when Accessibility is enabled
* commit '
47adff0a8bb4aeeefe6e3d3efc0b2579f6754af0':
Show warning dialog when Accessibility is enabled
Jim Miller [Sat, 18 Oct 2014 00:43:18 +0000 (17:43 -0700)]
Show warning dialog when Accessibility is enabled
This shows a warning dialog in EncryptionInterstitial when the
user selects "Require password".
Fixes bug
17881324
Change-Id: Id9336f1f14d38f169205cc72cc42be8de94fae71
Jim Miller [Fri, 17 Oct 2014 23:52:45 +0000 (23:52 +0000)]
am
602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
* commit '
602d559d9c59074664ad684579dc3d14a09219cb':
Several fixes to new EncryptionInterstitial dialog.
Jim Miller [Fri, 17 Oct 2014 23:48:34 +0000 (23:48 +0000)]
Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
Jim Miller [Fri, 17 Oct 2014 02:49:07 +0000 (19:49 -0700)]
Several fixes to new EncryptionInterstitial dialog.
The code now observes whether accessibility is turned on when
deciding the default state.
Additionally, it fixes a bug where the user can back out of
EncryptionInterstitial and leave the setting in a bad state.
We now propagate the state until the place where it ultimately
gets stored.
Also fixes problem where Encryption was ignoring the state
where the device was already encrypted.
Fixes bug
17881324
Change-Id: Iec09e4464832a506bb2a78bb14a38b3531971fa0
Svetoslav [Fri, 17 Oct 2014 23:04:14 +0000 (23:04 +0000)]
am
ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
* commit '
ba202e9fb299f4557190dbad5ed989a9c83a4380':
Accessibility no longer overrides strong encryption (Settings).
Svetoslav [Fri, 17 Oct 2014 22:59:42 +0000 (22:59 +0000)]
Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
Svetoslav [Fri, 17 Oct 2014 21:37:02 +0000 (14:37 -0700)]
Accessibility no longer overrides strong encryption (Settings).
Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.
bug:
17881324
Change-Id: Iaf46cbabf1c19c193ea39b35add27aaa4ff509e4
Amith Yamasani [Fri, 17 Oct 2014 21:02:51 +0000 (21:02 +0000)]
am
e52c159c: Fix some strings for the encryption stuff.
* commit '
e52c159cd9b34222ca0440e824d729a9428cbfe6':
Fix some strings for the encryption stuff.
Amith Yamasani [Fri, 17 Oct 2014 20:42:14 +0000 (13:42 -0700)]
Fix some strings for the encryption stuff.
Bug:
17881324
Change-Id: I2bee6773d3ce8f5bede92ded3d2d937bf0e8685c
Jim Miller [Fri, 17 Oct 2014 19:32:09 +0000 (19:32 +0000)]
am
4f903c3e: Add strings for upcoming change.
* commit '
4f903c3e6502e1a87805a1def69c2a6f44bf601f':
Add strings for upcoming change.
Jim Miller [Fri, 17 Oct 2014 19:04:21 +0000 (12:04 -0700)]
Add strings for upcoming change.
Fixes bug
17881324
Change-Id: Ib8fc4de7d8689049e38ed7e1c3a0914c71787327
Svetoslav [Fri, 17 Oct 2014 16:55:46 +0000 (16:55 +0000)]
am
3ea423ae: User to confirm credentials if an accessibility service changes encryption.
* commit '
3ea423ae0ff56d249b6844b3a68c67ee5eba243d':
User to confirm credentials if an accessibility service changes encryption.
Svetoslav [Thu, 16 Oct 2014 21:44:25 +0000 (14:44 -0700)]
User to confirm credentials if an accessibility service changes encryption.
When an accessibility service is enabled we are not using the user secure
lock when encrypting the data. If the latter is already used for encryption
we are decreasing the encryption level and therefore shall challenge the
user with their secure lock.
bug:
17881324
Change-Id: If8905c05e20bc6bb6a6415e501871e5ad83f3d86
Geoff Mendal [Thu, 16 Oct 2014 00:42:05 +0000 (00:42 +0000)]
am
4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
4909c412fa8c495f1abba3c7d3fe0c32f08934db':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 16 Oct 2014 00:38:03 +0000 (00:38 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Thu, 16 Oct 2014 00:31:39 +0000 (17:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6ddb57a8bea2ad4ad1b6272e1f88f219e9cd8db0
Auto-generated-cl: translation import
Jim Miller [Wed, 15 Oct 2014 18:26:04 +0000 (18:26 +0000)]
am
46c7f6d6: Add a checkbox option to \'require password to decrypt\'
* commit '
46c7f6d6f32efec26bc9343f591ad1ddbe8f3b4a':
Add a checkbox option to 'require password to decrypt'
Jim Miller [Tue, 14 Oct 2014 01:15:17 +0000 (18:15 -0700)]
Add a checkbox option to 'require password to decrypt'
Fixes bug
17881324
Change-Id: I3f256f448a35cf8104ee6acb4de253874101f7c0
Fabrice Di Meglio [Wed, 15 Oct 2014 00:43:56 +0000 (00:43 +0000)]
am
94dce761: Merge "Fix bug #
17976062 Stability: ISE in Settings: Fragment ApnSettings{
4da9ae0} not attached to Activity" into lmp-dev
* commit '
94dce7618584b4ca51bf17937cbd6cb0c22aaaea':
Fix bug #
17976062 Stability: ISE in Settings: Fragment ApnSettings{
4da9ae0} not attached to Activity
Fabrice Di Meglio [Wed, 15 Oct 2014 00:39:57 +0000 (00:39 +0000)]
Merge "Fix bug #
17976062 Stability: ISE in Settings: Fragment ApnSettings{
4da9ae0} not attached to Activity" into lmp-dev
Fabrice Di Meglio [Tue, 14 Oct 2014 01:59:34 +0000 (18:59 -0700)]
Fix bug #
17976062 Stability: ISE in Settings: Fragment ApnSettings{
4da9ae0} not attached to Activity
- prevent IllegalStateException
Change-Id: I63fa1bb6240c7ff82c04be938b72940049409dee
Jason Monk [Tue, 14 Oct 2014 22:47:25 +0000 (22:47 +0000)]
am
eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev
* commit '
eaf84472ea10e0ec34b22faad0438700a86787b9':
Update screen pinning strings to say Overview
Jason Monk [Tue, 14 Oct 2014 22:42:49 +0000 (22:42 +0000)]
Merge "Update screen pinning strings to say Overview" into lmp-dev
Andres Morales [Tue, 14 Oct 2014 22:20:11 +0000 (22:20 +0000)]
am
26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev
* commit '
26bc6907b93a21adcdf8ffdc24d7d96482be8165':
Set layout_width in WiFi+NFC resource
Andres Morales [Tue, 14 Oct 2014 22:03:34 +0000 (22:03 +0000)]
Merge "Set layout_width in WiFi+NFC resource" into lmp-dev
Andres Morales [Tue, 14 Oct 2014 20:49:31 +0000 (13:49 -0700)]
Set layout_width in WiFi+NFC resource
Bug:
17930750
Change-Id: Ida2fd6040a52cc5d7fa6fe6c4a8c86a1a2dc4208
Jason Monk [Tue, 14 Oct 2014 13:29:25 +0000 (09:29 -0400)]
Update screen pinning strings to say Overview
Bug:
17969466
Change-Id: I1ce8e7912f4b897493a164103ee6d776317d7495
vandwalle [Tue, 14 Oct 2014 06:45:00 +0000 (06:45 +0000)]
am
2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:
17939405" into lmp-dev
* commit '
2fb9c773761b1375c86963ebb8f3bb3bec18e479':
dont show a config in saved network if it is self added and we never connected to it Bug:
17939405
vandwalle [Tue, 14 Oct 2014 06:41:26 +0000 (06:41 +0000)]
Merge "dont show a config in saved network if it is self added and we never connected to it Bug:
17939405" into lmp-dev
vandwalle [Tue, 14 Oct 2014 01:44:13 +0000 (18:44 -0700)]
dont show a config in saved network if it is self added and we never connected to it
Bug:
17939405
Change-Id: I1c56ba85d4f98c8b5eb711f6afdc0c06731d7b6e
Geoff Mendal [Mon, 13 Oct 2014 22:19:51 +0000 (22:19 +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:14:10 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
John Spurlock [Mon, 13 Oct 2014 22:03:08 +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.
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:32:00 +0000 (12:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I58f31b459dd9f775a16c0b887478f15eb7116167
Auto-generated-cl: translation import
Alan Viverette [Fri, 10 Oct 2014 23:46:06 +0000 (23:46 +0000)]
am
178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev
* commit '
178db4d5f7522a81ee5cce02ccbb080c2e555697':
Add option for serif monospace captioning font
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:44:03 +0000 (22:44 +0000)]
am
88b2790d: Merge "Fix to show signal strength as 0 if out of service." into lmp-dev
* commit '
88b2790d734504389156111002d8c5bd162d9b9c':
Fix to show signal strength as 0 if out of service.
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
Dianne Hackborn [Thu, 9 Oct 2014 16:57:19 +0000 (16:57 +0000)]
am
a4204bde: Merge "Update to use "real" L codename." into lmp-dev
* commit '
a4204bde454bbac665c7c1302056c9a64f76ffb1':
Update to use "real" L codename.
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:58:13 +0000 (12:58 +0000)]
am
50263efb: Remove CA Cert UI item from one list only
* commit '
50263efbaf5ce432c7335c1428ca10c1096cce1f':
Remove CA Cert UI item from one list only
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
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:51 +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:13 +0000 (00:08 +0000)]
am
7096c2dd: (-s ours) Import translations. DO NOT MERGE
* commit '
7096c2dd0b1fadabe6f2bcb07ef5045405f2337f':
Import translations. DO NOT MERGE
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:49 +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:30:28 +0000 (21:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebb3a9a429b160434faeae21a112480e888c6bb4
Auto-generated-cl: translation import
Svetoslav [Fri, 3 Oct 2014 22:06:42 +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:13 +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:14 +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
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 22:38:25 +0000 (22:38 +0000)]
am
59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
* commit '
59d33dbd25d8ca968e03bdeefedea9b0fe2e01f3':
Fixed a Setting Bluetooth Airplane mode bug.
Alan Viverette [Wed, 1 Oct 2014 22:38:05 +0000 (22:38 +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
Baligh Uddin [Wed, 1 Oct 2014 22:37:43 +0000 (22:37 +0000)]
am
9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
9d4dc326d1988ef2760e9d0d31239e43801587e2':
Import translations. DO NOT MERGE
Hui Shu [Wed, 1 Oct 2014 22:37:18 +0000 (22:37 +0000)]
am
905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit '
905f9e2f90c886a8405e0cca8286cd3dd7f430e9':
Remove WebView DRP Setting from Developer Settings
Zoltan Szatmary-Ban [Wed, 1 Oct 2014 22:36:15 +0000 (22:36 +0000)]
am
b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
* commit '
b0c216d3b95b3aa3a0a38ebde92ec19956598e9d':
Disambiguate categories in Settings > Trusted Credentials
Maurice Lam [Wed, 1 Oct 2014 22:34:39 +0000 (22:34 +0000)]
am
f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev
* commit '
f7b567081ef5f4daafdf0b229793323751e0d764':
[WifiSetup] Update background texture
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: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:29:10 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
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 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 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 23:38:17 +0000 (23:38 +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.
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
OSDN Git Service
