Jorim Jaggi
ea673970e1
am 1e7b8f86
: Fix userId for credentials from managed profiles
...
* commit '1e7b8f86d8aa46d2ed24b75adb453833ef2d1a88':
Fix userId for credentials from managed profiles
2015-06-29 21:04:41 +00:00
Jorim Jaggi
1e7b8f86d8
Fix userId for credentials from managed profiles
...
Bug: 22094377
Change-Id: Ia98d0e386d4c56f3eb502ff11f86b0fd7dadea3c
2015-06-29 20:34:27 +00:00
Jason Monk
7a63a8f08b
am 2d6445d4
: am 312c90c8
: Merge "Remove char limit from owner info" into mnc-dev
...
* commit '2d6445d4a1b99f95dd5f11561fc9392c7c9eb407':
Remove char limit from owner info
2015-06-29 20:16:18 +00:00
Jason Monk
2d6445d4a1
am 312c90c8
: Merge "Remove char limit from owner info" into mnc-dev
...
* commit '312c90c8caa4fdc59e9a4bd9f900d23ec7274495':
Remove char limit from owner info
2015-06-29 20:04:49 +00:00
Jason Monk
312c90c8ca
Merge "Remove char limit from owner info" into mnc-dev
2015-06-29 19:52:51 +00:00
Jason Monk
d79984c9e4
Remove char limit from owner info
...
Bug: 21959734
Change-Id: I21854309ca390cb126ba50feaa56fb9a35b862e1
2015-06-29 15:42:41 -04:00
Jason Monk
9b9e75d019
am d1c770f0
: am 898acde0
: Merge "Handle rotation (or refresh) before callback is received" into mnc-dev
...
* commit 'd1c770f023c3d428b80c92277d45dcfa0ab83190':
Handle rotation (or refresh) before callback is received
2015-06-29 19:19:51 +00:00
Jason Monk
d1c770f023
am 898acde0
: Merge "Handle rotation (or refresh) before callback is received" into mnc-dev
...
* commit '898acde0602b00599d48161c47fc0762a5e4d75f':
Handle rotation (or refresh) before callback is received
2015-06-29 19:09:16 +00:00
Jason Monk
898acde060
Merge "Handle rotation (or refresh) before callback is received" into mnc-dev
2015-06-29 18:55:29 +00:00
Jason Monk
d0d7b924cb
Handle rotation (or refresh) before callback is received
...
Make sure we unregister the old receiver
Bug: 22160603
Change-Id: I798ca07dd65711caa4d3295b7ad811ca2fc69c1d
2015-06-29 14:43:19 -04:00
Jason Monk
55dd8869db
Reduce jank in wifi settings
...
- Fix view recycling for AccessPointPreferences by adding a dummy
during initial inflation
- Cut down on what is done during onBindView and refresh()
- Try to re-use AccessPointPreferences when possible
Some jank still occurs when scan results come in, but it is less
than before.
Bug: 16518752
Change-Id: I2619303281dd50aa3864783c49738ae9f221834a
2015-06-29 13:47:14 -04:00
Geoff Mendal
672649b854
am 84a66c65
: (-s ours) am 21e00f98
: (-s ours) Import translations. DO NOT MERGE
...
* commit '84a66c6511910aaa1aa403aa1729eab3ec55cb7b':
Import translations. DO NOT MERGE
2015-06-29 15:17:21 +00:00
Geoff Mendal
84a66c6511
am 21e00f98
: (-s ours) Import translations. DO NOT MERGE
...
* commit '21e00f9819f48d33958a1bda87511e38809eb9f3':
Import translations. DO NOT MERGE
2015-06-29 15:06:30 +00:00
Geoff Mendal
21e00f9819
Import translations. DO NOT MERGE
...
Change-Id: Ib4c36b177018329faa9359c2d02f3ebc33bb1134
Auto-generated-cl: translation import
2015-06-29 07:50:47 -07:00
Sanket Padawe
4e484afa12
am d52bd38d
: am 52dce9d3
: Merge "Hide EAP SIM, AKA & AKA\' choices in wifi Settings if device doesn\'t support." into mnc-dev
...
* commit 'd52bd38d055cfa44049f80aed700228968860c54':
Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support.
2015-06-28 03:09:39 +00:00
Sanket Padawe
d52bd38d05
am 52dce9d3
: Merge "Hide EAP SIM, AKA & AKA\' choices in wifi Settings if device doesn\'t support." into mnc-dev
...
* commit '52dce9d3340da087fadf4689a07c943d9a121071':
Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support.
2015-06-28 02:57:36 +00:00
Sanket Padawe
52dce9d334
Merge "Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support." into mnc-dev
2015-06-28 02:45:48 +00:00
Yohei Yukawa
cf1a9a1ada
am 22963d92
: am 473440d7
: Merge "Dont crash if there is no spellchecker" into mnc-dev
...
* commit '22963d9224e594fd8ba50d7ab33d448d910476a6':
Dont crash if there is no spellchecker
2015-06-27 22:02:05 +00:00
Yohei Yukawa
22963d9224
am 473440d7
: Merge "Dont crash if there is no spellchecker" into mnc-dev
...
* commit '473440d79b1b93fac06cba220f70181492855763':
Dont crash if there is no spellchecker
2015-06-27 21:49:05 +00:00
Yohei Yukawa
473440d79b
Merge "Dont crash if there is no spellchecker" into mnc-dev
2015-06-27 21:40:53 +00:00
Adam Lesinski
207ec04b76
am 92f9c17f
: am 18ae8512
: Merge "Report real wifi running time in Power Details" into mnc-dev
...
* commit '92f9c17fe74bea7a9ec00d58dffc8164735efb13':
Report real wifi running time in Power Details
2015-06-27 01:30:21 +00:00
Adam Lesinski
92f9c17fe7
am 18ae8512
: Merge "Report real wifi running time in Power Details" into mnc-dev
...
* commit '18ae8512b9357907f0411013aec46209aa40a384':
Report real wifi running time in Power Details
2015-06-27 01:17:51 +00:00
Johan Redestig
b1570d285a
Dont crash if there is no spellchecker
...
The fact that isSpellCheckerEnabled returns true does not mean
that getCurrentSpellChecker will return non null. By default
isSpellCheckerEnabled is true in TextServicesSettings, even when
there is no spellchecker service active on the device.
The issue can be verified by disabling the Google Keyboard (assuming
the GMS LatinImeGoogle is used) in Settings|Apps and later
entering Settings|Language & input. Without this patch Settings
crashes at that point with the following stack:
E/AndroidRuntime(13020): Caused by: java.lang.NullPointerException: \
Attempt to invoke virtual method 'java.lang.CharSequence android.vie\
w.textservice.SpellCheckerInfo.loadLabel(android.content.pm.PackageM\
anager)' on a null object reference
E/AndroidRuntime(13020): at com.android.settings.inputmethod.\
InputMethodAndLanguageSettings.onResume(InputMethodAndLanguageSettin\
gs.java:253)
E/AndroidRuntime(13020): at android.app.Fragment.performResum\
e(Fragment.java:2096)
E/AndroidRuntime(13020): at android.app.FragmentManagerImpl.m\
oveToState(FragmentManager.java:928)
E/AndroidRuntime(13020): at android.app.FragmentManagerImpl.m\
oveToState(FragmentManager.java:1067)
Bug: 19832033
Change-Id: I65e6d269572e064aa6897807b6611ef947d90211
2015-06-26 18:15:13 -07:00
Adam Lesinski
18ae8512b9
Merge "Report real wifi running time in Power Details" into mnc-dev
2015-06-27 01:10:51 +00:00
Adam Lesinski
cba028c60a
Report real wifi running time in Power Details
...
Bug:21934412
Change-Id: Ic8623c8b424021f1af3d143d3b07398dd22091d6
2015-06-26 18:04:47 -07:00
Sanket Padawe
94c0b0d436
Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support.
...
Bug: 22014309
Change-Id: I606649cb4d2e13330afa89075ad074e7dc525f87
2015-06-26 15:57:43 -07:00
Shirish Kalele
d5b91e4477
am e654ebc0
: am 8ac57a16
: Merge "Use the ephemeral flag in the AccessPoint to mark a connection as a Wifi Assistant connection." into mnc-dev
...
* commit 'e654ebc03a12cb58eed44fab55e5f2ff0a8da3c8':
Use the ephemeral flag in the AccessPoint to mark a connection as a Wifi Assistant connection.
2015-06-26 22:05:13 +00:00
Shirish Kalele
e654ebc03a
am 8ac57a16
: Merge "Use the ephemeral flag in the AccessPoint to mark a connection as a Wifi Assistant connection." into mnc-dev
...
* commit '8ac57a16cd42851e535f3914c8f5a7a516982f5c':
Use the ephemeral flag in the AccessPoint to mark a connection as a Wifi Assistant connection.
2015-06-26 21:47:12 +00:00
Shirish Kalele
8ac57a16cd
Merge "Use the ephemeral flag in the AccessPoint to mark a connection as a Wifi Assistant connection." into mnc-dev
2015-06-26 21:34:37 +00:00
Jim Miller
5222f94ce6
am 2f16e670
: am 8dc38d96
: Remove userActivity() from Settings now that it\'s managed by FingerprintService
...
* commit '2f16e670191cfc6a5e6e5f293f37c0b546d82cdf':
Remove userActivity() from Settings now that it's managed by FingerprintService
2015-06-26 21:27:29 +00:00
Jim Miller
2f16e67019
am 8dc38d96
: Remove userActivity() from Settings now that it\'s managed by FingerprintService
...
* commit '8dc38d96ba7070b63d1ba71f2cde2136be493952':
Remove userActivity() from Settings now that it's managed by FingerprintService
2015-06-26 21:12:13 +00:00
Jim Miller
8dc38d96ba
Remove userActivity() from Settings now that it's managed by FingerprintService
...
Fixes bug 20732273
Change-Id: Ia6ad603cab0255d3ee8739c36516597594acd1f2
2015-06-26 14:00:15 -07:00
Rubin Xu
ccbdc57ee7
No longer use ExternalStorageFormatter to format external storage
...
Bug: 9433509
Change-Id: I5723828de080df568937004157acf830ca190f81
2015-06-26 15:27:23 +01:00
Makoto Onuki
0c0858acad
Make sure Fragments are public for FragMan to instantiate
...
Bug 21990428
Change-Id: If2dd5e43a4cc73ccf60278fdab874516c7fc181b
2015-06-25 17:01:54 -07:00
Robin Lee
a3b8938eeb
am 996e8b1f
: am 614fc178
: Fix build
...
* commit '996e8b1fe2a0f549ffcec32255e1edc42e1e7b4a':
Fix build
2015-06-25 23:28:50 +00:00
Robin Lee
996e8b1fe2
am 614fc178
: Fix build
...
* commit '614fc178bf028ef66bea24a70ae476a91833a7f1':
Fix build
2015-06-25 23:15:51 +00:00
Robin Lee
614fc178bf
Fix build
...
Change-Id: Ibb2db14b2fd38b2c8c066c97f8cd6e396c104ce8
2015-06-25 16:01:44 -07:00
Robin Lee
2d22a7061d
am 4b0f82c0
: am f04bcebd
: Merge "Enable VPN settings for secondary users" into mnc-dev
...
* commit '4b0f82c00dd84c0ae6c171ff267e9493f77cc264':
Enable VPN settings for secondary users
2015-06-25 22:48:14 +00:00
Selim Cinek
d41816193a
am 74dae06f
: am 30d6b2b8
: Merge "Always announcing wrong pattern now for talkback in pattern settings" into mnc-dev
...
* commit '74dae06fa3dee056256cddc8474d122946bc0ecf':
Always announcing wrong pattern now for talkback in pattern settings
2015-06-25 22:48:13 +00:00
Selim Cinek
fa368b8892
am cf1e2a12
: am f2f29ff5
: Merge "Increased the error message font size" into mnc-dev
...
* commit 'cf1e2a12c1b60388fdddfc5fae582ad2257fb541':
Increased the error message font size
2015-06-25 22:48:12 +00:00
Robin Lee
4b0f82c00d
am f04bcebd
: Merge "Enable VPN settings for secondary users" into mnc-dev
...
* commit 'f04bcebd4e9fdc3323c492059d107043e4d8109a':
Enable VPN settings for secondary users
2015-06-25 22:34:38 +00:00
Selim Cinek
74dae06fa3
am 30d6b2b8
: Merge "Always announcing wrong pattern now for talkback in pattern settings" into mnc-dev
...
* commit '30d6b2b8f119cd503577303e3a80313418753333':
Always announcing wrong pattern now for talkback in pattern settings
2015-06-25 22:34:36 +00:00
Selim Cinek
cf1e2a12c1
am f2f29ff5
: Merge "Increased the error message font size" into mnc-dev
...
* commit 'f2f29ff557fb950cde4cae5f1717517484c64c33':
Increased the error message font size
2015-06-25 22:34:35 +00:00
Robin Lee
f04bcebd4e
Merge "Enable VPN settings for secondary users" into mnc-dev
2015-06-25 22:27:55 +00:00
Robin Lee
dd142295da
Enable VPN settings for secondary users
...
This is now supported.
Change-Id: I4a8eabe3042c04061f293066e84238029f18ecd8
2015-06-25 15:26:02 -07:00
Selim Cinek
30d6b2b8f1
Merge "Always announcing wrong pattern now for talkback in pattern settings" into mnc-dev
2015-06-25 22:25:40 +00:00
Selim Cinek
f2f29ff557
Merge "Increased the error message font size" into mnc-dev
2015-06-25 22:25:31 +00:00
Selim Cinek
00da4f6d3b
Always announcing wrong pattern now for talkback in pattern settings
...
Bug: 21797216
Change-Id: If86078f2d711a80e4a4aa28ce8817aed8244d30b
2015-06-25 18:12:26 -04:00
Selim Cinek
f0eebe7e9d
Increased the error message font size
...
Bug: 21568693
Change-Id: I059b962950335f5780783953505ec1e1f0e5b591
2015-06-25 18:12:21 -04:00
Shirish Kalele
1bcf050bf0
Use the ephemeral flag in the AccessPoint to mark a
...
connection as a Wifi Assistant connection.
Change-Id: Ife26f6799a5b9e4640181d150edb7455adf38f0f
2015-06-25 13:56:33 -07:00