OSDN Git Service
Paul Lawrence [Tue, 19 Aug 2014 20:59:12 +0000 (20:59 +0000)]
am
d5a497b8: Merge "Change decryption strings" into lmp-dev
* commit '
d5a497b8375444858fb17008a450d3bc26269d1c':
Change decryption strings
Lorenzo Colitti [Tue, 19 Aug 2014 19:29:01 +0000 (19:29 +0000)]
am
f1b786d8: Stop using LinkProperties for static configuration.
* commit '
f1b786d8a8dc894904c5edc6e375da0e7ddb7ed4':
Stop using LinkProperties for static configuration.
Lorenzo Colitti [Tue, 12 Aug 2014 01:05:51 +0000 (10:05 +0900)]
Stop using LinkProperties for static configuration.
Bug:
16114392
Bug:
16893413
Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df
Julia Reynolds [Tue, 19 Aug 2014 18:54:36 +0000 (18:54 +0000)]
am
7138ed74: Merge "Supress menu if screen ought to be hidden." into lmp-dev
* commit '
7138ed7404f22862ac7e2fdb29d71833dec9b1a3':
Supress menu if screen ought to be hidden.
Lifu Tang [Tue, 19 Aug 2014 17:32:13 +0000 (17:32 +0000)]
am
72bd4d25: Merge "Dim the preference icons when its disabled" into lmp-dev
* commit '
72bd4d252dc7a706b661f2970396dc0211d7b4de':
Dim the preference icons when its disabled
Lifu Tang [Tue, 19 Aug 2014 17:25:19 +0000 (17:25 +0000)]
Merge "Dim the preference icons when its disabled" into lmp-dev
Amith Yamasani [Tue, 19 Aug 2014 15:43:40 +0000 (15:43 +0000)]
am
d05dd864: Merge "Update strings for guest removal affordance and dialog" into lmp-dev
* commit '
d05dd864d6f26a1577cbcb25a43ddf9d3e638299':
Update strings for guest removal affordance and dialog
Lifu Tang [Tue, 19 Aug 2014 04:29:17 +0000 (04:29 +0000)]
am
081a9162: Merge "Set switch to the correct enabling state" into lmp-dev
* commit '
081a9162c959f9cbd0cbd76674501cdb47d516a7':
Set switch to the correct enabling state
Lifu Tang [Tue, 19 Aug 2014 04:24:09 +0000 (04:24 +0000)]
Merge "Set switch to the correct enabling state" into lmp-dev
Lifu Tang [Mon, 18 Aug 2014 23:46:48 +0000 (16:46 -0700)]
Set switch to the correct enabling state
- Fix b/
16951708
Change-Id: I4f9a2a374a771fd353fca436a0d34644f9bc8320
PauloftheWest [Mon, 18 Aug 2014 20:07:36 +0000 (20:07 +0000)]
am
31584ec3: Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev
* commit '
31584ec3e99ded3dd96de06bcb1aa8e4dc408cce':
Fixed a crash when rotating a saved networks dialog.
PauloftheWest [Mon, 18 Aug 2014 20:07:35 +0000 (20:07 +0000)]
am
6a2b1a44: Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev
* commit '
6a2b1a44d2ed5bc0b5025ec62a51662850499d71':
Fixed a bug were AdvanceWifiSettings would crash on resume.
Lifu Tang [Mon, 18 Aug 2014 18:08:43 +0000 (11:08 -0700)]
Dim the preference icons when its disabled
- Fix b/
16956979
Change-Id: Idfa3fddf63746dea1db0c75dedab06b57aaf5de7
Alexandra Gherghina [Mon, 18 Aug 2014 16:56:17 +0000 (16:56 +0000)]
am
0cad779d: Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev
* commit '
0cad779d3e4d7ef361fa972e54879cd6791b467c':
Switch to listening for USER_INITIALIZE broadcast in the Settings app.
Alexandra Gherghina [Mon, 18 Aug 2014 16:39:54 +0000 (16:39 +0000)]
am
cd88c2f7: Fix Account Settings crash
* commit '
cd88c2f7c30fe58e523e93469dd1fc7a121320f3':
Fix Account Settings crash
Alexandra Gherghina [Mon, 18 Aug 2014 13:34:08 +0000 (14:34 +0100)]
Fix Account Settings crash
Bug:
17020198
Change-Id: I9d4a18381ebb0f57a0e9917c3b7579b0a7feeaf4
Baligh Uddin [Sun, 17 Aug 2014 14:08:30 +0000 (14:08 +0000)]
am
f14fa7ed: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
f14fa7ed4e9c61543a10f081027489558c4bc104':
Import translations. DO NOT MERGE
Adam Lesinski [Sat, 16 Aug 2014 06:49:40 +0000 (06:49 +0000)]
am
a9dc57c1: Merge "Added Warning dialog when enabling usage access for app" into lmp-dev
* commit '
a9dc57c145c91eaa5b43510575eae3e425adc461':
Added Warning dialog when enabling usage access for app
Baligh Uddin [Sat, 16 Aug 2014 04:38:20 +0000 (04:38 +0000)]
am
88ee936a: (-s ours) am
2719eebf: (-s ours) am
b3b64705: (-s ours) Import translations. DO NOT MERGE
* commit '
88ee936a94db3dcbecf7089183f740ab184c3907':
Import translations. DO NOT MERGE
Amith Yamasani [Tue, 19 Aug 2014 15:39:37 +0000 (15:39 +0000)]
Merge "Update strings for guest removal affordance and dialog" into lmp-dev
Amith Yamasani [Mon, 18 Aug 2014 23:42:43 +0000 (16:42 -0700)]
Update strings for guest removal affordance and dialog
Exit guest -> Remove guest
etc.
Bug:
16495144
Change-Id: Ieb44e886ea537682a6922046c0f63cef1456c6d8
PauloftheWest [Mon, 18 Aug 2014 20:00:36 +0000 (20:00 +0000)]
Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev
PauloftheWest [Mon, 18 Aug 2014 16:25:03 +0000 (09:25 -0700)]
Fixed a crash when rotating a saved networks dialog.
Bug:
16972819
Change-Id: I83d00df974f8c6692697d59ea71e93f193fa5066
Alexandra Gherghina [Mon, 18 Aug 2014 16:50:04 +0000 (16:50 +0000)]
Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev
Alexandra Gherghina [Mon, 18 Aug 2014 12:16:17 +0000 (13:16 +0100)]
Switch to listening for USER_INITIALIZE broadcast in the Settings app.
The PRE_BOOT_COMPLETED broadcast is no longer sent when creating a new
profile.
Also, we no longer listen to BOOT_COMPLETED as that adds too much overload.
Bug:
17102460
Change-Id: I05eb56c7a05748e8a91b9717966c20ac586d90ef
Paul Lawrence [Tue, 19 Aug 2014 20:49:52 +0000 (20:49 +0000)]
Merge "Change decryption strings" into lmp-dev
Paul Lawrence [Tue, 19 Aug 2014 15:55:26 +0000 (08:55 -0700)]
Change decryption strings
Bug:
17062716
Change-Id: Ib7d0ee77a4a2bab1fc44c041382bc819035333f1
PauloftheWest [Mon, 18 Aug 2014 20:00:11 +0000 (20:00 +0000)]
Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev
PauloftheWest [Mon, 18 Aug 2014 18:49:09 +0000 (11:49 -0700)]
Fixed a bug were AdvanceWifiSettings would crash on resume.
Bug:
17059286
Change-Id: I9c2b03806a45c739cfb4edf64a1518d60e74cdf5
Baligh Uddin [Sat, 16 Aug 2014 04:02:06 +0000 (04:02 +0000)]
am
2719eebf: (-s ours) am
b3b64705: (-s ours) Import translations. DO NOT MERGE
* commit '
2719eebfc5e7fcfdac417be9a4ae07e25abcaaea':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 17 Aug 2014 13:49:40 +0000 (13:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sat, 16 Aug 2014 07:01:16 +0000 (00:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I988fe5d15b0bc0468a637030be9b77c4ca543979
Auto-generated-cl: translation import
Adam Lesinski [Sat, 16 Aug 2014 06:43:23 +0000 (06:43 +0000)]
Merge "Added Warning dialog when enabling usage access for app" into lmp-dev
Adam Lesinski [Tue, 12 Aug 2014 03:54:12 +0000 (20:54 -0700)]
Added Warning dialog when enabling usage access for app
The user is now thoroughly warned about enabling third party
app access to device history.
Change-Id: If8d49a47cae76e06f19cba117d3ec60075966541
Julia Reynolds [Tue, 19 Aug 2014 18:43:31 +0000 (18:43 +0000)]
Merge "Supress menu if screen ought to be hidden." into lmp-dev
Julia Reynolds [Mon, 18 Aug 2014 20:04:48 +0000 (16:04 -0400)]
Supress menu if screen ought to be hidden.
Bug:
14081992
Change-Id: I56183413a001b3e6dd74de249e9afc131e6671e4
Christopher Tate [Sat, 16 Aug 2014 00:43:04 +0000 (00:43 +0000)]
am
568eeca5: Disallow downgrade of bundled home apps
* commit '
568eeca569f97bfdd7cf6ae3b9cb5e7360eadc2c':
Disallow downgrade of bundled home apps
Christopher Tate [Fri, 15 Aug 2014 16:20:46 +0000 (09:20 -0700)]
Disallow downgrade of bundled home apps
Bug
14162565
Change-Id: I754721178722edbf0765039bc9669ed24b92633c
Baligh Uddin [Fri, 15 Aug 2014 22:36:02 +0000 (22:36 +0000)]
am
b3b64705: (-s ours) Import translations. DO NOT MERGE
* commit '
b3b647054e8610a29536ccee7be3aa2483e16431':
Import translations. DO NOT MERGE
Jim Miller [Fri, 15 Aug 2014 21:45:31 +0000 (21:45 +0000)]
am
23c76e38: Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev
* commit '
23c76e38ef2a62a996dbb304c558c80b3fee5f28':
Remove temporary workaround for GMS TrustAgent while API changed.
Fabrice Di Meglio [Fri, 15 Aug 2014 21:37:24 +0000 (21:37 +0000)]
am
4325f808: Update NFC to use a SwitchPreference
* commit '
4325f8080888bd3b15246f5bbd9db878aced030c':
Update NFC to use a SwitchPreference
Fabrice Di Meglio [Fri, 15 Aug 2014 21:14:17 +0000 (14:14 -0700)]
Update NFC to use a SwitchPreference
- do the switch
See bug: #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Change-Id: I78ab5b86fe6b541f9f3dc3d77115fde656d40c80
Jim Miller [Fri, 15 Aug 2014 21:36:38 +0000 (21:36 +0000)]
Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev
Jim Miller [Fri, 15 Aug 2014 21:28:58 +0000 (14:28 -0700)]
Remove temporary workaround for GMS TrustAgent while API changed.
Fixes bug
16401527
Change-Id: I2e892664ecbdd1cd893f521f2181bc6840ba027e
Baligh Uddin [Fri, 15 Aug 2014 21:21:56 +0000 (14:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I33188a7df715a4accf49444b4e182a64a94aa880
Auto-generated-cl: translation import
Glenn Kasten [Fri, 15 Aug 2014 21:07:10 +0000 (21:07 +0000)]
am
2be2a8a4: Merge "Increase character limit for translation" into lmp-dev
* commit '
2be2a8a47f5ef585301479268752aa3d7d3a9261':
Increase character limit for translation
arete [Fri, 15 Aug 2014 20:56:44 +0000 (20:56 +0000)]
am
300e920f: Keep SwitchPreference status until user makes choice in confirmation dialog.
* commit '
300e920f66c03b390ce738ccf4d4646ffa039d40':
Keep SwitchPreference status until user makes choice in confirmation dialog.
arete [Fri, 15 Aug 2014 19:04:48 +0000 (12:04 -0700)]
Keep SwitchPreference status until user makes choice in confirmation dialog.
Bug:
17062433
Change-Id: I2c52be1921e1eefa3b2b2868cc526675c9215a41
Fabrice Di Meglio [Fri, 15 Aug 2014 20:45:12 +0000 (20:45 +0000)]
am
e3bced2c: Update Airplane mode to use a SwitchPreference
* commit '
e3bced2cdaf70812f658c45c170e4943ed79dfaf':
Update Airplane mode to use a SwitchPreference
Maurice Lam [Fri, 15 Aug 2014 20:36:35 +0000 (20:36 +0000)]
am
cd93d141: Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev
* commit '
cd93d141302ee374285d5a8dcd97bc7ab61298cc':
[WifiSetup] Use framework AutoMirrored
Fabrice Di Meglio [Wed, 6 Aug 2014 17:22:52 +0000 (10:22 -0700)]
Update Airplane mode to use a SwitchPreference
- do the switch
See bug: #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Change-Id: I7addc48a90d74c105b2f0275ae80874b9324f589
Julia Reynolds [Fri, 15 Aug 2014 20:23:20 +0000 (20:23 +0000)]
am
fad2b09d: Merge "Disable disable button according to user restrictions." into lmp-dev
* commit '
fad2b09db8cf65478db35f9a8265c948ccffeabc':
Disable disable button according to user restrictions.
Julia Reynolds [Fri, 15 Aug 2014 20:17:27 +0000 (20:17 +0000)]
Merge "Disable disable button according to user restrictions." into lmp-dev
Glenn Kasten [Fri, 15 Aug 2014 21:01:17 +0000 (21:01 +0000)]
Merge "Increase character limit for translation" into lmp-dev
Glenn Kasten [Fri, 15 Aug 2014 20:24:45 +0000 (13:24 -0700)]
Increase character limit for translation
Bug:
17033153
Change-Id: Iac0b695cee1ee7dd6c66898b8c5bf68cff5efa75
Maurice Lam [Fri, 15 Aug 2014 20:29:32 +0000 (20:29 +0000)]
Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev
Maurice Lam [Fri, 15 Aug 2014 19:04:12 +0000 (12:04 -0700)]
[WifiSetup] Use framework AutoMirrored
Use framework autoMirrored and override onResolveDrawables to
propagate the layout direction to the drawables.
Bug:
17047609
Change-Id: Ic4a764510e3a89c897d4e243f8fa2a690ac71899
Fabrice Di Meglio [Fri, 15 Aug 2014 18:46:56 +0000 (18:46 +0000)]
am
0ff107e3: Merge "Fix bug #
16703191 APN settings shows back button even when you intent into it" into lmp-dev
* commit '
0ff107e384a6fe99bfa8a5e542f6e0c89b909d85':
Fix bug #
16703191 APN settings shows back button even when you intent into it
John Spurlock [Fri, 15 Aug 2014 15:16:15 +0000 (15:16 +0000)]
am
a7f8addd: Settings: Update to follow NotificationManager aidl change.
* commit '
a7f8addd0982f599105aeb9611477b149860db83':
Settings: Update to follow NotificationManager aidl change.
John Spurlock [Thu, 14 Aug 2014 17:03:13 +0000 (13:03 -0400)]
Settings: Update to follow NotificationManager aidl change.
Depends on frameworks/base:
I1d8269a4e6fe170ce776bf932dbbdfb29dd25dd7
Change-Id: I4015b60d84541a1f3d9e9c506ab8f44f1d18f71f
Baligh Uddin [Fri, 15 Aug 2014 05:52:16 +0000 (05:52 +0000)]
am
86370f5d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
86370f5dfd3f78e80b9940c31d73975a46080964':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Aug 2014 05:48:03 +0000 (05:48 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Fabrice Di Meglio [Fri, 15 Aug 2014 18:37:33 +0000 (18:37 +0000)]
Merge "Fix bug #
16703191 APN settings shows back button even when you intent into it" into lmp-dev
Fabrice Di Meglio [Wed, 13 Aug 2014 23:22:38 +0000 (16:22 -0700)]
Fix bug #
16703191 APN settings shows back button even when you intent into it
- change a bit the way we recognize a SubSetting. Now we can pass the new
":settings:show_fragment_as_subsetting" Intent extra for forcing it.
- convert ApnSettings to a SettingsPreferenceFragment
Change-Id: I22167ad317530c0a58c4d522a72826f9d34ad2d3
Maurice Lam [Fri, 15 Aug 2014 02:55:34 +0000 (02:55 +0000)]
am
3d8dd19c: Merge "[WifiSetup] Update illustrations" into lmp-dev
* commit '
3d8dd19c85ca94e647245a70df9ca6a9c039b7de':
[WifiSetup] Update illustrations
Jim Miller [Fri, 15 Aug 2014 01:37:29 +0000 (01:37 +0000)]
am
bbce34d9: Merge "API review - move confirm credential constants from Intent" into lmp-dev
* commit '
bbce34d9be421effb055fbf1a945ec49dfeef02d':
API review - move confirm credential constants from Intent
Selim Gurun [Fri, 15 Aug 2014 00:08:38 +0000 (00:08 +0000)]
am
ce8d3910: Remove logic to read the key from GServices
* commit '
ce8d39103f51eb418cad61ee3e0a80445307e46a':
Remove logic to read the key from GServices
Selim Gurun [Thu, 14 Aug 2014 22:19:15 +0000 (15:19 -0700)]
Remove logic to read the key from GServices
Bug:
12492817
The key is now stored in webview apk so remove the logic
to read from GServices.
Change-Id: I9f9b57d59885d93023be307a80d5a7db143ffbfe
arete [Thu, 14 Aug 2014 21:52:22 +0000 (21:52 +0000)]
am
17224826: Cannot cancel in the "Warn app installation" dialog in security settings.
* commit '
17224826f896278de0805e6a2fec321701bbb83d':
Cannot cancel in the "Warn app installation" dialog in security settings.
arete [Thu, 14 Aug 2014 20:45:36 +0000 (13:45 -0700)]
Cannot cancel in the "Warn app installation" dialog in security settings.
Bug:
16900059
Change-Id: Ie4e335b000350632bffc5740939b46b21357e298
Adam Powell [Thu, 14 Aug 2014 20:29:17 +0000 (20:29 +0000)]
am
aa772c95: Merge "Use material alert dialog item view layout" into lmp-dev
* commit '
aa772c9521529d6235aa7be0fb81e75a334c4b82':
Use material alert dialog item view layout
arete [Thu, 14 Aug 2014 20:24:39 +0000 (20:24 +0000)]
am
ce543836: Change checkboxes to switches in "Settings->Backup&Reset"
* commit '
ce543836cea5887484026837f0a4181dca04a733':
Change checkboxes to switches in "Settings->Backup&Reset"
arete [Tue, 12 Aug 2014 23:33:52 +0000 (16:33 -0700)]
Change checkboxes to switches in "Settings->Backup&Reset"
Change-Id: I92b5d0051b717c66bc456a0864c3068b13112dd3
Bug:
16982604
Fabrice Di Meglio [Thu, 14 Aug 2014 18:08:51 +0000 (18:08 +0000)]
am
d83b3c2a: Fix bug #
16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment@
273c8fdb was not registered
* commit '
d83b3c2a39e4716b4a4276b8b8ce0db2b9a62b9e':
Fix bug #
16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment$1@
273c8fdb was not registered
Fabrice Di Meglio [Wed, 13 Aug 2014 17:45:19 +0000 (10:45 -0700)]
Fix bug #
16957601 Stability: ISE in Settings: Observer com.android.settings.
SettingsPreferenceFragment$1@
273c8fdb was not registered
- add override for onUnbindPreferences() that will unregister the observer
if needed
- keep track of the root adapter so that we can unregister / register with
the correct one (by having a new PreferenceScreen the root adapter would not
be the same and thus unregistering the Observer on the new one would not work
and create the current bug)
Change-Id: I2cef0398c2ae0ab4f5ffd67ca20e8874be997bf6
Julia Reynolds [Fri, 8 Aug 2014 16:22:42 +0000 (12:22 -0400)]
Disable disable button according to user restrictions.
Bug:
16891777
Change-Id: I5223af905dc43d259c5fd3e03eedf8c71bf23ae9
PauloftheWest [Thu, 14 Aug 2014 15:43:59 +0000 (15:43 +0000)]
am
841f760f: Merge "Fixed a bug were secure Wi-Fi connections would show unsecured." into lmp-dev
* commit '
841f760fd7345ef2d84b9409c27e36c2365a3de4':
Fixed a bug were secure Wi-Fi connections would show unsecured.
Zoltan Szatmary-Ban [Thu, 14 Aug 2014 13:06:08 +0000 (13:06 +0000)]
am
3aaf0eb4: Fix app icons on some Settings screens
* commit '
3aaf0eb457639b52228143b84d9624bf73d862ea':
Fix app icons on some Settings screens
Zoltan Szatmary-Ban [Thu, 14 Aug 2014 09:55:19 +0000 (09:55 +0000)]
am
f8be13d8: Merge "Remove spinner in Settings > VPN" into lmp-dev
* commit '
f8be13d8ca29a61a97411d9d30cb4b82bb669bcf':
Remove spinner in Settings > VPN
Zoltan Szatmary-Ban [Thu, 7 Aug 2014 13:02:41 +0000 (14:02 +0100)]
Fix app icons on some Settings screens
App icons appeared as the default icon and sometimes without the corp badge on
Data Usage and Battery screens for applications that were only installed for
the managed profile. This CL fixes the issue.
Bug:
16705204
Change-Id: I778d36554feb19f28f3cb9321a291cab3d3e17bb
Amith Yamasani [Wed, 13 Aug 2014 23:32:17 +0000 (23:32 +0000)]
am
e73b8ccf: Merge "Make sure profile owner is system app" into lmp-dev
* commit '
e73b8ccf37470869e8acb00946c95737a44d54d0':
Make sure profile owner is system app
Maurice Lam [Fri, 15 Aug 2014 02:46:37 +0000 (02:46 +0000)]
Merge "[WifiSetup] Update illustrations" into lmp-dev
Maurice Lam [Wed, 13 Aug 2014 22:52:15 +0000 (15:52 -0700)]
[WifiSetup] Update illustrations
Update illustration assets and support for auto-mirroring for RTL
languages.
Bug:
16888091
Change-Id: I828a13558aff42f2ddb12b9afe123f463c4c1522
Jim Miller [Fri, 15 Aug 2014 01:01:50 +0000 (01:01 +0000)]
Merge "API review - move confirm credential constants from Intent" into lmp-dev
Jim Miller [Wed, 13 Aug 2014 21:52:52 +0000 (14:52 -0700)]
API review - move confirm credential constants from Intent
Moves constants from Intent to KeyguardManager.
Fixes bug
17006280
Change-Id: I8ee1f534816a3fe823ad44479e227ba6d3675389
Glenn Kasten [Wed, 13 Aug 2014 22:56:05 +0000 (22:56 +0000)]
am
f51daced: Merge "Add setting to disable automatic USB audio routing" into lmp-dev
* commit '
f51dacedd8ccbe99584e05320a92adbb8e95abfe':
Add setting to disable automatic USB audio routing
Michael Wright [Wed, 13 Aug 2014 22:41:17 +0000 (22:41 +0000)]
am
bf55863b: Remove indexes for removed hard keyboard options.
* commit '
bf55863b41efc3ad29c752f133f8739aac35d103':
Remove indexes for removed hard keyboard options.
Michael Wright [Tue, 12 Aug 2014 01:39:23 +0000 (18:39 -0700)]
Remove indexes for removed hard keyboard options.
Bug:
16027438
Change-Id: If668024e3b7073b49142de7e9aae4a46b4969d40
Amith Yamasani [Wed, 13 Aug 2014 20:13:13 +0000 (20:13 +0000)]
am
561d6bc9: Merge "Allow creating last user even if a guest exists." into lmp-dev
* commit '
561d6bc9bb3f1473ac67f4bef5edac7b3046a901':
Allow creating last user even if a guest exists.
Paul Lawrence [Wed, 13 Aug 2014 19:55:41 +0000 (19:55 +0000)]
am
d6d0cd53: Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev
* commit '
d6d0cd53d00a84619f3f90761ee3907732fac898':
Bring up factory reset UI when decryption fails but password is correct
Jim Miller [Wed, 13 Aug 2014 19:48:21 +0000 (19:48 +0000)]
am
5a10a8df: Use SwitchPreference in TrustAgentSettings.
* commit '
5a10a8df0efcf034077cbfcd28dd2e495b8d0441':
Use SwitchPreference in TrustAgentSettings.
Jim Miller [Sat, 9 Aug 2014 01:30:20 +0000 (18:30 -0700)]
Use SwitchPreference in TrustAgentSettings.
Fixes bug
16900059
Change-Id: I52dcfd2a2651f8f770477df3c72176303a9d1b39
Jason Monk [Wed, 13 Aug 2014 17:35:10 +0000 (17:35 +0000)]
am
b37ad3d0: Merge "Handle default properly to avoid scary logging." into lmp-dev
* commit '
b37ad3d0e903a602272c8ce6e5c51630b5ca063b':
Handle default properly to avoid scary logging.
PauloftheWest [Wed, 13 Aug 2014 17:16:55 +0000 (17:16 +0000)]
am
d8e08e55: Merge "Changed PBAP\'s default permission from allow to UNKNOWN." into lmp-dev
* commit '
d8e08e55cd6669f5c576b58d8ed7c79ff27c8fa6':
Changed PBAP's default permission from allow to UNKNOWN.
Amith Yamasani [Wed, 13 Aug 2014 20:10:14 +0000 (20:10 +0000)]
Merge "Allow creating last user even if a guest exists." into lmp-dev
Paul Lawrence [Wed, 13 Aug 2014 19:47:52 +0000 (19:47 +0000)]
Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev
PauloftheWest [Wed, 13 Aug 2014 14:46:02 +0000 (14:46 +0000)]
am
e1fd76a8: Merge "Revert "Add BT message access"" into lmp-dev
* commit '
e1fd76a85bf86fe5cd6637d3fdfe6420283395ed':
Revert "Add BT message access"
Dianne Hackborn [Wed, 13 Aug 2014 02:09:14 +0000 (02:09 +0000)]
am
b51253cf: Add action targets for voice input and usage access settings.
* commit '
b51253cfed0796b20e03a104aaca4d8d3e2d3024':
Add action targets for voice input and usage access settings.
Dianne Hackborn [Tue, 12 Aug 2014 22:08:04 +0000 (15:08 -0700)]
Add action targets for voice input and usage access settings.
Change-Id: I5ea0b34ed440b2cfdce0c63e2c4976c89202eb64
Zoltan Szatmary-Ban [Thu, 14 Aug 2014 09:50:31 +0000 (09:50 +0000)]
Merge "Remove spinner in Settings > VPN" into lmp-dev