Commit Graph

10185 Commits

Author SHA1 Message Date
Daichi Hirono
70a821d04d am d922e870: am f2a795a2: am 91ba69df: Merge "Remove while box at the top right of storage setup wizard." into mnc-dev
* commit 'd922e870eacf74437f94880bbe33b1b0b4a5eb61':
  Remove while box at the top right of storage setup wizard.
2015-06-25 05:36:16 +00:00
Srinu Jella
8e2b768771 am d70314a2: am 87629cda: am 1c1320a8: Bluetooth: Fix to avoid taking space as name upon orientation
* commit 'd70314a2316b773757def95972d214078acd2c8f':
  Bluetooth: Fix to avoid taking space as name upon orientation
2015-06-25 05:36:14 +00:00
Daichi Hirono
d922e870ea am f2a795a2: am 91ba69df: Merge "Remove while box at the top right of storage setup wizard." into mnc-dev
* commit 'f2a795a2709321ba9d277c9ee604f0567930ebf9':
  Remove while box at the top right of storage setup wizard.
2015-06-25 05:21:02 +00:00
Srinu Jella
d70314a231 am 87629cda: am 1c1320a8: Bluetooth: Fix to avoid taking space as name upon orientation
* commit '87629cda33ead267c44a9276e10403f194c62651':
  Bluetooth: Fix to avoid taking space as name upon orientation
2015-06-25 05:20:59 +00:00
Daichi Hirono
91ba69df7e Merge "Remove while box at the top right of storage setup wizard." into mnc-dev 2015-06-25 04:47:13 +00:00
Daichi Hirono
ae56c1449a 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
2015-06-25 13:44:44 +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
c3b9b50e87 am 20344e38: am 60f00268: am 1c19cb5e: Merge "Add data limit paused string to Data Usage Settings screen." into mnc-dev
* commit '20344e38ed3bcf42b8520269d14ef0f2a55bf292':
  Add data limit paused string to Data Usage Settings screen.
2015-06-24 22:16:08 +00:00
Sanket Padawe
20344e38ed am 60f00268: am 1c19cb5e: Merge "Add data limit paused string to Data Usage Settings screen." into mnc-dev
* commit '60f00268305b64c8270fc520f66ceb7b7130f7e8':
  Add data limit paused string to Data Usage Settings screen.
2015-06-24 21:51:49 +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
45dbf8ba4b am d7dfbb62: am a768c0b2: am 1cbbec00: Merge "Fix marquee on app snippet in InstalledAppDetails" into mnc-dev
* commit 'd7dfbb627c0fca16bc557699698f7eb488e86699':
  Fix marquee on app snippet in InstalledAppDetails
2015-06-24 19:41:44 +00:00
Jason Monk
d7dfbb627c am a768c0b2: am 1cbbec00: Merge "Fix marquee on app snippet in InstalledAppDetails" into mnc-dev
* commit 'a768c0b2372fe129aede00fc5f559682704d7829':
  Fix marquee on app snippet in InstalledAppDetails
2015-06-24 19:29:19 +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
84e14f296f am bc99d35e: am 2f7fea73: am 5006bf1d: Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev
* commit 'bc99d35e38b83c7f7a19fd2bf591c15618d6161a':
  Language Update for Wi-Fi/Bluetooth Scanning
2015-06-24 16:34:06 +00:00
Akshay Kannan
bc99d35e38 am 2f7fea73: am 5006bf1d: Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev
* commit '2f7fea739a2ef32482412dfa144ee252a62525e2':
  Language Update for Wi-Fi/Bluetooth Scanning
2015-06-24 16:21:41 +00:00
Akshay Kannan
5006bf1de7 Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev 2015-06-24 15:55:32 +00:00
Lifu Tang
55601622d5 Language Update for Wi-Fi/Bluetooth Scanning
Bug: 22046234
Change-Id: Iea8fa2368d1e568a8e1fdd3edefa8f4fc6053e48
2015-06-23 18:54:27 -07:00
Jason Monk
aafba39c29 am 053522c5: am cee74232: am 96a06144: Merge "Add action for search results including the count" into mnc-dev
* commit '053522c5daddc24e740969f3295c4c59b8eab993':
  Add action for search results including the count
2015-06-23 22:21:23 +00:00
Jason Monk
053522c5da am cee74232: am 96a06144: Merge "Add action for search results including the count" into mnc-dev
* commit 'cee742322034b87db0607a945a638c961ad6a51e':
  Add action for search results including the count
2015-06-23 21:07:09 +00:00
Jason Monk
d761c71115 am 32c8b874: am df82f5bf: am 52e728ab: Merge "Screen pinning set default lock on exit value" into mnc-dev
* commit '32c8b8745a766a5de43e8e480c9ec1097f519fa0':
  Screen pinning set default lock on exit value
2015-06-23 20:55:24 +00:00
Jason Monk
32c8b8745a am df82f5bf: am 52e728ab: Merge "Screen pinning set default lock on exit value" into mnc-dev
* commit 'df82f5bf1b90bc458a22aa0baec3e4f18da4e95c':
  Screen pinning set default lock on exit value
2015-06-23 20:46:01 +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
Selim Cinek
28909f1142 am 5cb96691: am d91a08bb: am 966a29dc: Merge "Improved talkback fingerprint enrollment flow" into mnc-dev
* commit '5cb96691414ffbf06b6d63ffac5d760de1670905':
  Improved talkback fingerprint enrollment flow
2015-06-23 18:23:28 +00:00
Selim Cinek
5cb9669141 am d91a08bb: am 966a29dc: Merge "Improved talkback fingerprint enrollment flow" into mnc-dev
* commit 'd91a08bbc37785817f435cac67dba6bae98fbdfb':
  Improved talkback fingerprint enrollment flow
2015-06-23 18:08:16 +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
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
48bdf54ed4 am ab403120: am 26699a07: am 9dd754e1: Merge "Reflect effect of all Wifi editability factors in Settings" into mnc-dev
* commit 'ab40312078fe664c33bd7fb8f363b9e04f047892':
  Reflect effect of all Wifi editability factors in Settings
2015-06-23 10:11:57 +00:00
Zoltan Szatmary-Ban
ab40312078 am 26699a07: am 9dd754e1: Merge "Reflect effect of all Wifi editability factors in Settings" into mnc-dev
* commit '26699a07da2931a078349bd381e340bd751e6efd':
  Reflect effect of all Wifi editability factors in Settings
2015-06-23 10:00:26 +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
a129c1e1f8 am bf4849c8: am a8c6cb5a: am 4044d6cd: Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." into mnc-dev
* commit 'bf4849c8bb5b16adf51dcdbad18a42c705bf918d':
  Fix display of "Contact sharing" option in Car kit for BT Settings.
2015-06-23 05:38:47 +00:00
xinhe
e50a15965c am 30552566: am 5dee645c: am d55ddc33: Merge "if do not turn on wifi STA or SAP, there is no 5GHz choice for SAP config" into mnc-dev
* commit '30552566f7d349af7a7629aad8f7d5c89c614086':
  if do not turn on wifi STA or SAP, there is no 5GHz choice  for SAP config
2015-06-23 04:38:33 +00:00
Sanket Padawe
bf4849c8bb am a8c6cb5a: am 4044d6cd: Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." into mnc-dev
* commit 'a8c6cb5a72974118adb7f39acb3a906a63541dac':
  Fix display of "Contact sharing" option in Car kit for BT Settings.
2015-06-23 03:20:29 +00:00
xinhe
30552566f7 am 5dee645c: am d55ddc33: Merge "if do not turn on wifi STA or SAP, there is no 5GHz choice for SAP config" into mnc-dev
* commit '5dee645cd6e909a014c8cf1538fc0c96190e09b3':
  if do not turn on wifi STA or SAP, there is no 5GHz choice  for SAP config
2015-06-23 03:12:55 +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
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
3a1e634a59 am be0c398c: am 270353f6: am 8a4e44ba: Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev
* commit 'be0c398cdac1a4441e15e4cbc806dc23286de85d':
  Ensure "default" and "none" caption colors are consistent w/ framework
2015-06-22 21:57:00 +00:00
Makoto Onuki
981eec6668 am 7ee9e16d: am 1e998fd6: am b544ce78: Merge "Set service name to printer service setting title" into mnc-dev
* commit '7ee9e16d84b03557416f203e91975b111afdcdfe':
  Set service name to printer service setting title
2015-06-22 21:56:59 +00:00
Alan Viverette
be0c398cda am 270353f6: am 8a4e44ba: Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev
* commit '270353f659c2b6bdcf58c16f087c6e5cff810875':
  Ensure "default" and "none" caption colors are consistent w/ framework
2015-06-22 21:13:48 +00:00
Makoto Onuki
7ee9e16d84 am 1e998fd6: am b544ce78: Merge "Set service name to printer service setting title" into mnc-dev
* commit '1e998fd6a8c49ac8ab776647533c8391cd17ab94':
  Set service name to printer service setting title
2015-06-22 21:13:47 +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