OSDN Git Service
Jason Monk [Tue, 30 Jun 2015 14:32:58 +0000 (14:32 +0000)]
am
e6a0bee5: Merge "Fix crash in ignore optimizations dialog" into mnc-dev
* commit '
e6a0bee557c8f2ceaa25cd8287511b55479e7293':
Fix crash in ignore optimizations dialog
Jason Monk [Tue, 30 Jun 2015 14:20:57 +0000 (14:20 +0000)]
Merge "Fix crash in ignore optimizations dialog" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:15:53 +0000 (10:15 -0400)]
Fix crash in ignore optimizations dialog
Launch it like a dialog, because it is one.
Bug:
22181580
Change-Id: Ibeda8506cfb7a9a9d60f70462a4e03972b38f8aa
Rubin Xu [Tue, 30 Jun 2015 14:12:39 +0000 (14:12 +0000)]
am
02c7e95f: Merge "No longer use ExternalStorageFormatter to format external storage" into mnc-dev
* commit '
02c7e95fd4e03d7356def00f68e6e93f4da87f73':
No longer use ExternalStorageFormatter to format external storage
Jason Monk [Tue, 30 Jun 2015 14:12:38 +0000 (14:12 +0000)]
am
6799ef42: Merge "Reduce jank in wifi settings" into mnc-dev
* commit '
6799ef423b18c37c9a8a3684159dd185f61a0931':
Reduce jank in wifi settings
Rubin Xu [Tue, 30 Jun 2015 14:05:31 +0000 (14:05 +0000)]
Merge "No longer use ExternalStorageFormatter to format external storage" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:03:04 +0000 (14:03 +0000)]
Merge "Reduce jank in wifi settings" into mnc-dev
Jorim Jaggi [Tue, 30 Jun 2015 00:35:45 +0000 (00:35 +0000)]
am
d9bd96b3: Add setting to disable screenshot separately (2/2)
* commit '
d9bd96b3094039fdcb8c76042a6f2dc21d6c7875':
Add setting to disable screenshot separately (2/2)
Jorim Jaggi [Fri, 26 Jun 2015 23:40:41 +0000 (16:40 -0700)]
Add setting to disable screenshot separately (2/2)
Bug:
22063668
Change-Id: I85b255ac114184e0edbd71010d517b337ad935e5
Jorim Jaggi [Mon, 29 Jun 2015 21:04:41 +0000 (21:04 +0000)]
am
1e7b8f86: Fix userId for credentials from managed profiles
* commit '
1e7b8f86d8aa46d2ed24b75adb453833ef2d1a88':
Fix userId for credentials from managed profiles
Jorim Jaggi [Sat, 27 Jun 2015 01:49:35 +0000 (18:49 -0700)]
Fix userId for credentials from managed profiles
Bug:
22094377
Change-Id: Ia98d0e386d4c56f3eb502ff11f86b0fd7dadea3c
Jason Monk [Mon, 29 Jun 2015 20:04:49 +0000 (20:04 +0000)]
am
312c90c8: Merge "Remove char limit from owner info" into mnc-dev
* commit '
312c90c8caa4fdc59e9a4bd9f900d23ec7274495':
Remove char limit from owner info
Jason Monk [Mon, 29 Jun 2015 19:52:51 +0000 (19:52 +0000)]
Merge "Remove char limit from owner info" into mnc-dev
Jason Monk [Mon, 29 Jun 2015 18:52:54 +0000 (14:52 -0400)]
Remove char limit from owner info
Bug:
21959734
Change-Id: I21854309ca390cb126ba50feaa56fb9a35b862e1
Jason Monk [Mon, 29 Jun 2015 19:09:16 +0000 (19:09 +0000)]
am
898acde0: Merge "Handle rotation (or refresh) before callback is received" into mnc-dev
* commit '
898acde0602b00599d48161c47fc0762a5e4d75f':
Handle rotation (or refresh) before callback is received
Jason Monk [Mon, 29 Jun 2015 18:55:18 +0000 (18:55 +0000)]
Merge "Handle rotation (or refresh) before callback is received" into mnc-dev
Jason Monk [Mon, 29 Jun 2015 18:42:25 +0000 (14:42 -0400)]
Handle rotation (or refresh) before callback is received
Make sure we unregister the old receiver
Bug:
22160603
Change-Id: I798ca07dd65711caa4d3295b7ad811ca2fc69c1d
Jason Monk [Mon, 29 Jun 2015 17:28:21 +0000 (13:28 -0400)]
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
Geoff Mendal [Mon, 29 Jun 2015 15:06:30 +0000 (15:06 +0000)]
am
21e00f98: (-s ours) Import translations. DO NOT MERGE
* commit '
21e00f9819f48d33958a1bda87511e38809eb9f3':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 29 Jun 2015 14:50:47 +0000 (07:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib4c36b177018329faa9359c2d02f3ebc33bb1134
Auto-generated-cl: translation import
Sanket Padawe [Sun, 28 Jun 2015 02:57:36 +0000 (02:57 +0000)]
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.
Sanket Padawe [Sun, 28 Jun 2015 02:45:39 +0000 (02:45 +0000)]
Merge "Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support." into mnc-dev
Yohei Yukawa [Sat, 27 Jun 2015 21:49:05 +0000 (21:49 +0000)]
am
473440d7: Merge "Dont crash if there is no spellchecker" into mnc-dev
* commit '
473440d79b1b93fac06cba220f70181492855763':
Dont crash if there is no spellchecker
Yohei Yukawa [Sat, 27 Jun 2015 21:40:51 +0000 (21:40 +0000)]
Merge "Dont crash if there is no spellchecker" into mnc-dev
Adam Lesinski [Sat, 27 Jun 2015 01:17:51 +0000 (01:17 +0000)]
am
18ae8512: Merge "Report real wifi running time in Power Details" into mnc-dev
* commit '
18ae8512b9357907f0411013aec46209aa40a384':
Report real wifi running time in Power Details
Johan Redestig [Sat, 7 Mar 2015 06:48:41 +0000 (07:48 +0100)]
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
Adam Lesinski [Sat, 27 Jun 2015 01:10:47 +0000 (01:10 +0000)]
Merge "Report real wifi running time in Power Details" into mnc-dev
Adam Lesinski [Sat, 27 Jun 2015 01:04:47 +0000 (18:04 -0700)]
Report real wifi running time in Power Details
Bug:
21934412
Change-Id: Ic8623c8b424021f1af3d143d3b07398dd22091d6
Sanket Padawe [Fri, 26 Jun 2015 22:57:43 +0000 (15:57 -0700)]
Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support.
Bug:
22014309
Change-Id: I606649cb4d2e13330afa89075ad074e7dc525f87
Shirish Kalele [Fri, 26 Jun 2015 21:47:12 +0000 (21:47 +0000)]
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.
Shirish Kalele [Fri, 26 Jun 2015 21:34:22 +0000 (21:34 +0000)]
Merge "Use the ephemeral flag in the AccessPoint to mark a connection as a Wifi Assistant connection." into mnc-dev
Jim Miller [Fri, 26 Jun 2015 21:12:13 +0000 (21:12 +0000)]
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
Jim Miller [Fri, 26 Jun 2015 00:18:12 +0000 (17:18 -0700)]
Remove userActivity() from Settings now that it's managed by FingerprintService
Fixes bug
20732273
Change-Id: Ia6ad603cab0255d3ee8739c36516597594acd1f2
Rubin Xu [Fri, 26 Jun 2015 14:27:23 +0000 (15:27 +0100)]
No longer use ExternalStorageFormatter to format external storage
Bug:
9433509
Change-Id: I5723828de080df568937004157acf830ca190f81
Robin Lee [Thu, 25 Jun 2015 23:15:51 +0000 (23:15 +0000)]
Robin Lee [Thu, 25 Jun 2015 23:01:44 +0000 (16:01 -0700)]
Fix build
Change-Id: Ibb2db14b2fd38b2c8c066c97f8cd6e396c104ce8
Robin Lee [Thu, 25 Jun 2015 22:34:38 +0000 (22:34 +0000)]
am
f04bcebd: Merge "Enable VPN settings for secondary users" into mnc-dev
* commit '
f04bcebd4e9fdc3323c492059d107043e4d8109a':
Enable VPN settings for secondary users
Selim Cinek [Thu, 25 Jun 2015 22:34:36 +0000 (22:34 +0000)]
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
Selim Cinek [Thu, 25 Jun 2015 22:34:35 +0000 (22:34 +0000)]
am
f2f29ff5: Merge "Increased the error message font size" into mnc-dev
* commit '
f2f29ff557fb950cde4cae5f1717517484c64c33':
Increased the error message font size
Robin Lee [Thu, 25 Jun 2015 22:27:54 +0000 (22:27 +0000)]
Merge "Enable VPN settings for secondary users" into mnc-dev
Robin Lee [Thu, 25 Jun 2015 22:18:55 +0000 (15:18 -0700)]
Enable VPN settings for secondary users
This is now supported.
Change-Id: I4a8eabe3042c04061f293066e84238029f18ecd8
Selim Cinek [Thu, 25 Jun 2015 22:25:39 +0000 (22:25 +0000)]
Merge "Always announcing wrong pattern now for talkback in pattern settings" into mnc-dev
Selim Cinek [Thu, 25 Jun 2015 22:25:30 +0000 (22:25 +0000)]
Merge "Increased the error message font size" into mnc-dev
Selim Cinek [Thu, 25 Jun 2015 21:42:58 +0000 (17:42 -0400)]
Always announcing wrong pattern now for talkback in pattern settings
Bug:
21797216
Change-Id: If86078f2d711a80e4a4aa28ce8817aed8244d30b
Selim Cinek [Thu, 25 Jun 2015 18:54:08 +0000 (14:54 -0400)]
Increased the error message font size
Bug:
21568693
Change-Id: I059b962950335f5780783953505ec1e1f0e5b591
Shirish Kalele [Thu, 25 Jun 2015 20:56:33 +0000 (13:56 -0700)]
Use the ephemeral flag in the AccessPoint to mark a
connection as a Wifi Assistant connection.
Change-Id: Ife26f6799a5b9e4640181d150edb7455adf38f0f
Adam Lesinski [Thu, 25 Jun 2015 19:41:57 +0000 (19:41 +0000)]
am
7217592d: Merge "Add computed power to each Battery Details page" into mnc-dev
* commit '
7217592dd161e5ac4f9d66bd659e55f85000abcc':
Add computed power to each Battery Details page
Adam Lesinski [Thu, 25 Jun 2015 19:34:42 +0000 (19:34 +0000)]
Merge "Add computed power to each Battery Details page" into mnc-dev
Jason Monk [Thu, 25 Jun 2015 19:16:41 +0000 (19:16 +0000)]
am
fb6e1186: Fix accessibility for account sync
* commit '
fb6e1186ab0b967acf0a041dc0d2d6ea96c672b9':
Fix accessibility for account sync
Jason Monk [Thu, 25 Jun 2015 19:03:26 +0000 (15:03 -0400)]
Fix accessibility for account sync
Needed to get views recycling so that feedback could occur during
switch turning off.
Bug:
20020216
Change-Id: Ib7b1cdca78f5ac5064cdf521122ff7a5ee49f572
Adam Lesinski [Thu, 25 Jun 2015 18:14:21 +0000 (11:14 -0700)]
Add computed power to each Battery Details page
Some battery sippers have nothing interesting besides
their power consumption. Show that.
Bug:
21934412
Change-Id: I7669343086892fb7be34fec00d1fd4c0bfd08b55
Daichi Hirono [Thu, 25 Jun 2015 05:09:17 +0000 (05:09 +0000)]
am
91ba69df: Merge "Remove while box at the top right of storage setup wizard." into mnc-dev
* commit '
91ba69df7e0fd7c3cc594e16a1d97339f769da09':
Remove while box at the top right of storage setup wizard.
Daichi Hirono [Thu, 25 Jun 2015 05:08:57 +0000 (05:08 +0000)]
am
fdc72d90: Merge "Update storage wizard\'s assets." into mnc-dev
* commit '
fdc72d907c37da41d0ec6dfd7dabaf26bcda1fca':
Update storage wizard's assets.
Srinu Jella [Thu, 25 Jun 2015 05:08:33 +0000 (05:08 +0000)]
am
1c1320a8: Bluetooth: Fix to avoid taking space as name upon orientation
* commit '
1c1320a84d22419efb3bf45d970f80b33658edc2':
Bluetooth: Fix to avoid taking space as name upon orientation
Daichi Hirono [Thu, 25 Jun 2015 04:47:13 +0000 (04:47 +0000)]
Merge "Remove while box at the top right of storage setup wizard." into mnc-dev
Daichi Hirono [Thu, 25 Jun 2015 04:45:07 +0000 (04:45 +0000)]
Merge "Update storage wizard's assets." into mnc-dev
Daichi Hirono [Thu, 25 Jun 2015 04:40:39 +0000 (13:40 +0900)]
Remove while box at the top right of storage setup wizard.
The CL specify correct ID for the tile asset.
BUG=
22049781
Change-Id: Ib7800487518e017fab1110fde5d70cc35bceffb7
Daichi Hirono [Thu, 25 Jun 2015 04:16:18 +0000 (13:16 +0900)]
Update storage wizard's assets.
BUG=
22049781
Change-Id: Ie7eae9c76db06c77d0f4e85941125c005c2f28eb
Srinu Jella [Mon, 12 May 2014 14:23:12 +0000 (19:53 +0530)]
Bluetooth: Fix to avoid taking space as name upon orientation
Use case: Renaming the DUT name on orientation chnage
STR:
1) Go for the option of rename phone.
2) give only space characters.
3) The rename option shows disabled.
4) Change the orientation of the phone.
5) Check whether it accepts space as a name.
Failure: Renaming a phone with space characters gets
accepted during change in orientation.Accepted
space as BT name upon changing orientation
Root cause: There is no check for validating the input
string while renaming the device name on orientation change.
Fix: This fix is to avoid taking space character as a name in the
BluetoothNameDialogFragment upon orientation change from
PORTRAIT mode to LANDSCAPE mode and vice versa.
Change-Id: Ia66f27bb9b06739e42d73b15745c12a42512a1fc
Sanket Padawe [Wed, 24 Jun 2015 21:37:43 +0000 (21:37 +0000)]
am
1c19cb5e: Merge "Add data limit paused string to Data Usage Settings screen." into mnc-dev
* commit '
1c19cb5edd7a366192f28a0d7eb47e0021e9bbdd':
Add data limit paused string to Data Usage Settings screen.
Sanket Padawe [Wed, 24 Jun 2015 21:29:43 +0000 (21:29 +0000)]
Merge "Add data limit paused string to Data Usage Settings screen." into mnc-dev
Sanket Padawe [Wed, 24 Jun 2015 21:26:21 +0000 (14:26 -0700)]
Add data limit paused string to Data Usage Settings screen.
Bug:
17073752
Change-Id: I14ade2c13db9203d33c11b2b06307e06d87b3800
Jason Monk [Wed, 24 Jun 2015 19:18:39 +0000 (19:18 +0000)]
am
1cbbec00: Merge "Fix marquee on app snippet in InstalledAppDetails" into mnc-dev
* commit '
1cbbec00ab574729c7bc547d250690b26a81057f':
Fix marquee on app snippet in InstalledAppDetails
Jason Monk [Wed, 24 Jun 2015 19:04:28 +0000 (19:04 +0000)]
Merge "Fix marquee on app snippet in InstalledAppDetails" into mnc-dev
Jason Monk [Wed, 24 Jun 2015 18:53:57 +0000 (14:53 -0400)]
Fix marquee on app snippet in InstalledAppDetails
First need to fix layout of the app_item as the widget was running
over the end of the view, do this by switching to a RelativeLayout.
Then select the view so it can actually marquee.
Bug:
22043942
Change-Id: Ieb94649ccf3dc8dcf56014c02fcdc06da71a9a62
Akshay Kannan [Wed, 24 Jun 2015 16:08:39 +0000 (16:08 +0000)]
am
5006bf1d: Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev
* commit '
5006bf1de7a8add85f9a24706041757f9c93bb01':
Language Update for Wi-Fi/Bluetooth Scanning
Akshay Kannan [Wed, 24 Jun 2015 15:55:31 +0000 (15:55 +0000)]
Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev
Geoff Mendal [Wed, 24 Jun 2015 15:45:39 +0000 (15:45 +0000)]
am
ab93f0e8: (-s ours) Import translations. DO NOT MERGE
* commit '
ab93f0e80372aa8c601d043781163cc93b98c9ee':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 24 Jun 2015 15:01:08 +0000 (08:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I837fc4cac73ece9ddde78dcc941afc75ad3ae7ca
Auto-generated-cl: translation import
Daichi Hirono [Wed, 24 Jun 2015 05:29:49 +0000 (05:29 +0000)]
am
95029c97: Merge "Change the color of format button in "Device storage > Format" screen." into mnc-dev
* commit '
95029c97019f90499fbce040b8b7971a8de680ec':
Change the color of format button in "Device storage > Format" screen.
Daichi Hirono [Wed, 24 Jun 2015 05:22:00 +0000 (05:22 +0000)]
Merge "Change the color of format button in "Device storage > Format" screen." into mnc-dev
Daichi Hirono [Wed, 24 Jun 2015 03:37:13 +0000 (12:37 +0900)]
Change the color of format button in "Device storage > Format" screen.
BUG=
21898857
Change-Id: Ic1619482f5294b6f2d1e14154bab25103ec3b630
Lifu Tang [Wed, 24 Jun 2015 00:54:56 +0000 (17:54 -0700)]
Language Update for Wi-Fi/Bluetooth Scanning
Bug:
22046234
Change-Id: Iea8fa2368d1e568a8e1fdd3edefa8f4fc6053e48
Selim Cinek [Tue, 23 Jun 2015 22:02:04 +0000 (22:02 +0000)]
am
1726b2c9: Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev
* commit '
1726b2c94d994843abe43283465be7c049763b94':
Added contentDescription for fingerprint on the confirmCredential screen
Selim Cinek [Tue, 23 Jun 2015 21:50:26 +0000 (21:50 +0000)]
Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev
Selim Cinek [Tue, 23 Jun 2015 21:48:48 +0000 (17:48 -0400)]
Added contentDescription for fingerprint on the confirmCredential screen
Bug:
21850269
Change-Id: Ia3720451a74e69e119b60121d7906274c522f70a
Jason Monk [Tue, 23 Jun 2015 19:59:17 +0000 (19:59 +0000)]
am
96a06144: Merge "Add action for search results including the count" into mnc-dev
* commit '
96a0614409e9bdc2df6dd83bc151a0d00eaf2ced':
Add action for search results including the count
Jason Monk [Tue, 23 Jun 2015 19:49:23 +0000 (19:49 +0000)]
Merge "Add action for search results including the count" into mnc-dev
Jason Monk [Tue, 23 Jun 2015 18:36:08 +0000 (14:36 -0400)]
Add action for search results including the count
Bug:
20293458
Change-Id: I9d3f04fb74c0e978e69e17898b703e270298fcbc
Jason Monk [Tue, 23 Jun 2015 17:39:36 +0000 (17:39 +0000)]
am
52e728ab: Merge "Screen pinning set default lock on exit value" into mnc-dev
* commit '
52e728ab114d37b24a0c50dba58f8d81b4e1ea9b':
Screen pinning set default lock on exit value
Jason Monk [Tue, 23 Jun 2015 17:30:13 +0000 (17:30 +0000)]
Merge "Screen pinning set default lock on exit value" into mnc-dev
Selim Cinek [Tue, 23 Jun 2015 17:28:33 +0000 (17:28 +0000)]
am
966a29dc: Merge "Improved talkback fingerprint enrollment flow" into mnc-dev
* commit '
966a29dc979cedb1b90faec5bba25a0fd6d2bf10':
Improved talkback fingerprint enrollment flow
Jason Monk [Tue, 23 Jun 2015 16:07:27 +0000 (12:07 -0400)]
Screen pinning set default lock on exit value
The UI default varies based on security state, so make sure we set
the current value when we turn on the feature so that the setting
has the same value as the UI.
Bug:
21999172
Change-Id: I6c920aa93aab391852d6f3a4dd8ee52da5618729
Selim Cinek [Tue, 23 Jun 2015 17:14:42 +0000 (17:14 +0000)]
Merge "Improved talkback fingerprint enrollment flow" into mnc-dev
Selim Cinek [Tue, 23 Jun 2015 17:12:24 +0000 (13:12 -0400)]
Improved talkback fingerprint enrollment flow
Bug:
21565901
Change-Id: If25468574afd25b1a7d19278710045083ba1d4f7
Zoltan Szatmary-Ban [Tue, 23 Jun 2015 09:50:32 +0000 (09:50 +0000)]
am
9dd754e1: Merge "Reflect effect of all Wifi editability factors in Settings" into mnc-dev
* commit '
9dd754e1f405aa47a6d9c97bf50f23c8f51b7a79':
Reflect effect of all Wifi editability factors in Settings
Zoltan Szatmary-Ban [Tue, 23 Jun 2015 08:44:35 +0000 (08:44 +0000)]
Merge "Reflect effect of all Wifi editability factors in Settings" into mnc-dev
Sanket Padawe [Tue, 23 Jun 2015 02:57:29 +0000 (02:57 +0000)]
am
2bed3a50: Merge "Align Enlish words to RTL in RTL context in networkreset Settings." into mnc-dev
* commit '
2bed3a507faaab29569857fd7a92b739faa31ee3':
Align Enlish words to RTL in RTL context in networkreset Settings.
Sanket Padawe [Tue, 23 Jun 2015 02:47:27 +0000 (02:47 +0000)]
Merge "Align Enlish words to RTL in RTL context in networkreset Settings." into mnc-dev
Sanket Padawe [Tue, 23 Jun 2015 02:46:28 +0000 (19:46 -0700)]
Align Enlish words to RTL in RTL context in networkreset Settings.
Bug:
21553326
Change-Id: I216723172cc6998e1432d0a066f21a72afe1bc27
Sanket Padawe [Tue, 23 Jun 2015 00:43:57 +0000 (00:43 +0000)]
am
4044d6cd: Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." into mnc-dev
* commit '
4044d6cdd6309e06377ae57a4b941f2db87d6942':
Fix display of "Contact sharing" option in Car kit for BT Settings.
Sanket Padawe [Tue, 23 Jun 2015 00:34:32 +0000 (00:34 +0000)]
Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." into mnc-dev
xinhe [Tue, 23 Jun 2015 00:20:09 +0000 (00:20 +0000)]
am
d55ddc33: Merge "if do not turn on wifi STA or SAP, there is no 5GHz choice for SAP config" into mnc-dev
* commit '
d55ddc337edd7236a7024602b7970e146f9489db':
if do not turn on wifi STA or SAP, there is no 5GHz choice for SAP config
xinhe [Mon, 22 Jun 2015 23:56:10 +0000 (23:56 +0000)]
Merge "if do not turn on wifi STA or SAP, there is no 5GHz choice for SAP config" into mnc-dev
xinhe [Mon, 22 Jun 2015 22:26:33 +0000 (15:26 -0700)]
if do not turn on wifi STA or SAP, there is no 5GHz choice
for SAP config
b/
22008176
Change-Id: Id1020f975bce1ff7a3c738c4180f3d7686718d82
Alan Viverette [Mon, 22 Jun 2015 21:01:57 +0000 (21:01 +0000)]
am
8a4e44ba: Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev
* commit '
8a4e44ba92d2c7552860d7e8d23015c013da32f4':
Ensure "default" and "none" caption colors are consistent w/ framework
Makoto Onuki [Mon, 22 Jun 2015 21:01:56 +0000 (21:01 +0000)]
am
b544ce78: Merge "Set service name to printer service setting title" into mnc-dev
* commit '
b544ce78dc63b9119dcc741d18200f3128d42aa3':
Set service name to printer service setting title
Alan Viverette [Mon, 22 Jun 2015 20:55:10 +0000 (20:55 +0000)]
Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev
Makoto Onuki [Mon, 22 Jun 2015 20:47:58 +0000 (20:47 +0000)]
Merge "Set service name to printer service setting title" into mnc-dev
Makoto Onuki [Mon, 22 Jun 2015 20:43:49 +0000 (13:43 -0700)]
Set service name to printer service setting title
Bug
21899319
Change-Id: I940957dd4036eb3386c7f59fbbd3608e7169f415