Daichi Hirono
a1f85511d1
am fdc72d90
: Merge "Update storage wizard\'s assets." into mnc-dev
...
* commit 'fdc72d907c37da41d0ec6dfd7dabaf26bcda1fca':
Update storage wizard's assets.
2015-06-25 05:08:57 +00:00
Srinu Jella
87629cda33
am 1c1320a8
: Bluetooth: Fix to avoid taking space as name upon orientation
...
* commit '1c1320a84d22419efb3bf45d970f80b33658edc2':
Bluetooth: Fix to avoid taking space as name upon orientation
2015-06-25 05:08:33 +00:00
Daichi Hirono
fdc72d907c
Merge "Update storage wizard's assets." into mnc-dev
2015-06-25 04:45:10 +00:00
Daichi Hirono
b7edd7b852
Update storage wizard's assets.
...
BUG=22049781
Change-Id: Ie7eae9c76db06c77d0f4e85941125c005c2f28eb
2015-06-25 13:16:18 +09:00
Srinu Jella
1c1320a84d
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
2015-06-25 02:08:38 +00:00
Sanket Padawe
60f0026830
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.
2015-06-24 21:37:43 +00:00
Sanket Padawe
1c19cb5edd
Merge "Add data limit paused string to Data Usage Settings screen." into mnc-dev
2015-06-24 21:29:44 +00:00
Sanket Padawe
716b1f841c
Add data limit paused string to Data Usage Settings screen.
...
Bug: 17073752
Change-Id: I14ade2c13db9203d33c11b2b06307e06d87b3800
2015-06-24 14:26:21 -07:00
Jason Monk
a768c0b237
am 1cbbec00
: Merge "Fix marquee on app snippet in InstalledAppDetails" into mnc-dev
...
* commit '1cbbec00ab574729c7bc547d250690b26a81057f':
Fix marquee on app snippet in InstalledAppDetails
2015-06-24 19:18:39 +00:00
Jason Monk
1cbbec00ab
Merge "Fix marquee on app snippet in InstalledAppDetails" into mnc-dev
2015-06-24 19:04:28 +00:00
Jason Monk
b01459997e
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
2015-06-24 14:53:57 -04:00
Akshay Kannan
2f7fea739a
am 5006bf1d
: Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev
...
* commit '5006bf1de7a8add85f9a24706041757f9c93bb01':
Language Update for Wi-Fi/Bluetooth Scanning
2015-06-24 16:08:39 +00:00
Akshay Kannan
5006bf1de7
Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev
2015-06-24 15:55:32 +00:00
Geoff Mendal
631fd465cc
am ab93f0e8
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ab93f0e80372aa8c601d043781163cc93b98c9ee':
Import translations. DO NOT MERGE
2015-06-24 15:45:39 +00:00
Geoff Mendal
ab93f0e803
Import translations. DO NOT MERGE
...
Change-Id: I837fc4cac73ece9ddde78dcc941afc75ad3ae7ca
Auto-generated-cl: translation import
2015-06-24 08:01:08 -07:00
Daichi Hirono
5c1542e6fd
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.
2015-06-24 05:29:49 +00:00
Daichi Hirono
95029c9701
Merge "Change the color of format button in "Device storage > Format" screen." into mnc-dev
2015-06-24 05:22:03 +00:00
Daichi Hirono
c8463895a8
Change the color of format button in "Device storage > Format" screen.
...
BUG=21898857
Change-Id: Ic1619482f5294b6f2d1e14154bab25103ec3b630
2015-06-24 14:17:06 +09:00
Lifu Tang
55601622d5
Language Update for Wi-Fi/Bluetooth Scanning
...
Bug: 22046234
Change-Id: Iea8fa2368d1e568a8e1fdd3edefa8f4fc6053e48
2015-06-23 18:54:27 -07:00
Selim Cinek
ae3693d44f
am 1726b2c9
: Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev
...
* commit '1726b2c94d994843abe43283465be7c049763b94':
Added contentDescription for fingerprint on the confirmCredential screen
2015-06-23 22:02:04 +00:00
Selim Cinek
1726b2c94d
Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev
2015-06-23 21:50:27 +00:00
Selim Cinek
cf8347b33f
Added contentDescription for fingerprint on the confirmCredential screen
...
Bug: 21850269
Change-Id: Ia3720451a74e69e119b60121d7906274c522f70a
2015-06-23 17:48:48 -04:00
Jason Monk
cee7423220
am 96a06144
: Merge "Add action for search results including the count" into mnc-dev
...
* commit '96a0614409e9bdc2df6dd83bc151a0d00eaf2ced':
Add action for search results including the count
2015-06-23 19:59:17 +00:00
Jason Monk
96a0614409
Merge "Add action for search results including the count" into mnc-dev
2015-06-23 19:49:23 +00:00
Jason Monk
cbbc69b823
Add action for search results including the count
...
Bug: 20293458
Change-Id: I9d3f04fb74c0e978e69e17898b703e270298fcbc
2015-06-23 14:36:08 -04:00
Jason Monk
df82f5bf1b
am 52e728ab
: Merge "Screen pinning set default lock on exit value" into mnc-dev
...
* commit '52e728ab114d37b24a0c50dba58f8d81b4e1ea9b':
Screen pinning set default lock on exit value
2015-06-23 17:39:36 +00:00
Jason Monk
52e728ab11
Merge "Screen pinning set default lock on exit value" into mnc-dev
2015-06-23 17:30:14 +00:00
Selim Cinek
d91a08bbc3
am 966a29dc
: Merge "Improved talkback fingerprint enrollment flow" into mnc-dev
...
* commit '966a29dc979cedb1b90faec5bba25a0fd6d2bf10':
Improved talkback fingerprint enrollment flow
2015-06-23 17:28:33 +00:00
Jason Monk
39ab4eae12
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
2015-06-23 13:28:27 -04:00
Selim Cinek
966a29dc97
Merge "Improved talkback fingerprint enrollment flow" into mnc-dev
2015-06-23 17:14:43 +00:00
Selim Cinek
e5fc0bae73
Improved talkback fingerprint enrollment flow
...
Bug: 21565901
Change-Id: If25468574afd25b1a7d19278710045083ba1d4f7
2015-06-23 13:12:24 -04:00
Zoltan Szatmary-Ban
26699a07da
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
2015-06-23 09:50:32 +00:00
Zoltan Szatmary-Ban
9dd754e1f4
Merge "Reflect effect of all Wifi editability factors in Settings" into mnc-dev
2015-06-23 08:44:45 +00:00
Sanket Padawe
088c6d68c2
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.
2015-06-23 02:57:29 +00:00
Sanket Padawe
2bed3a507f
Merge "Align Enlish words to RTL in RTL context in networkreset Settings." into mnc-dev
2015-06-23 02:47:28 +00:00
Sanket Padawe
bf91bc6bd3
Align Enlish words to RTL in RTL context in networkreset Settings.
...
Bug: 21553326
Change-Id: I216723172cc6998e1432d0a066f21a72afe1bc27
2015-06-22 19:46:28 -07:00
Sanket Padawe
a8c6cb5a72
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.
2015-06-23 00:43:57 +00:00
Sanket Padawe
4044d6cdd6
Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." into mnc-dev
2015-06-23 00:34:37 +00:00
xinhe
5dee645cd6
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
2015-06-23 00:20:09 +00:00
xinhe
d55ddc337e
Merge "if do not turn on wifi STA or SAP, there is no 5GHz choice for SAP config" into mnc-dev
2015-06-22 23:56:11 +00:00
xinhe
5a0d83b11e
if do not turn on wifi STA or SAP, there is no 5GHz choice
...
for SAP config
b/22008176
Change-Id: Id1020f975bce1ff7a3c738c4180f3d7686718d82
2015-06-22 15:55:28 -07:00
Alan Viverette
270353f659
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
2015-06-22 21:01:57 +00:00
Makoto Onuki
1e998fd6a8
am b544ce78
: Merge "Set service name to printer service setting title" into mnc-dev
...
* commit 'b544ce78dc63b9119dcc741d18200f3128d42aa3':
Set service name to printer service setting title
2015-06-22 21:01:56 +00:00
Alan Viverette
8a4e44ba92
Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev
2015-06-22 20:55:15 +00:00
Makoto Onuki
b544ce78dc
Merge "Set service name to printer service setting title" into mnc-dev
2015-06-22 20:47:59 +00:00
Makoto Onuki
077a7173c6
Set service name to printer service setting title
...
Bug 21899319
Change-Id: I940957dd4036eb3386c7f59fbbd3608e7169f415
2015-06-22 13:43:49 -07:00
Alan Viverette
751625e9a2
Ensure "default" and "none" caption colors are consistent w/ framework
...
Also enables scroll indicators in color grid dialog.
Bug: 21602597
Change-Id: I7fabd36787fc8689966eb8dcece3d4d047ee8066
2015-06-22 13:05:45 -07:00
Sanket Padawe
53e74f510b
Fix display of "Contact sharing" option in Car kit for BT Settings.
...
Bug: 21879473
Change-Id: I0d2f839c525d2a5179f9ef59ab12a94f1aab9b6f
2015-06-22 12:33:53 -07:00
Alan Viverette
e7924ca819
am 14f5da9b
: Merge "Disable foreground opacity when using default foreground color" into mnc-dev
...
* commit '14f5da9b4d2cb1e0b6828312613bf8f4c8a1df2d':
Disable foreground opacity when using default foreground color
2015-06-22 17:27:31 +00:00
Barnaby James
83f3ef2cfe
am ab1c2b0d
: Merge "Hide title of the zen mode voice activity." into mnc-dev
...
* commit 'ab1c2b0d8097396fd67045f52829703e84e73350':
Hide title of the zen mode voice activity.
2015-06-22 17:27:30 +00:00