OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam a3b8938e: am 996e8b1f: am 614fc178: Fix build
Robin Lee [Thu, 25 Jun 2015 23:40:51 +0000 (23:40 +0000)]
am a3b8938e: am 996e8b1f: am 614fc178: Fix build

* commit 'a3b8938eeb6c0c3061984aab111d7cd6f40f6f1c':
  Fix build

9 years agoam 996e8b1f: am 614fc178: Fix build
Robin Lee [Thu, 25 Jun 2015 23:28:50 +0000 (23:28 +0000)]
am 996e8b1f: am 614fc178: Fix build

* commit '996e8b1fe2a0f549ffcec32255e1edc42e1e7b4a':
  Fix build

9 years agoam 614fc178: Fix build
Robin Lee [Thu, 25 Jun 2015 23:15:51 +0000 (23:15 +0000)]
am 614fc178: Fix build

* commit '614fc178bf028ef66bea24a70ae476a91833a7f1':
  Fix build

9 years agoam 2d22a706: am 4b0f82c0: am f04bcebd: Merge "Enable VPN settings for secondary users...
Robin Lee [Thu, 25 Jun 2015 23:04:11 +0000 (23:04 +0000)]
am 2d22a706: am 4b0f82c0: am f04bcebd: Merge "Enable VPN settings for secondary users" into mnc-dev

* commit '2d22a7061dba6feab11f4663a4e9a1aab9ddbe12':
  Enable VPN settings for secondary users

9 years agoam d4181619: am 74dae06f: am 30d6b2b8: Merge "Always announcing wrong pattern now...
Selim Cinek [Thu, 25 Jun 2015 23:04:10 +0000 (23:04 +0000)]
am d4181619: am 74dae06f: am 30d6b2b8: Merge "Always announcing wrong pattern now for talkback in pattern settings" into mnc-dev

* commit 'd41816193af397cc05fbf1962fce391b5d06ddb3':
  Always announcing wrong pattern now for talkback in pattern settings

9 years agoam fa368b88: am cf1e2a12: am f2f29ff5: Merge "Increased the error message font size...
Selim Cinek [Thu, 25 Jun 2015 23:04:09 +0000 (23:04 +0000)]
am fa368b88: am cf1e2a12: am f2f29ff5: Merge "Increased the error message font size" into mnc-dev

* commit 'fa368b8892bac1d92436c08f4067abbc76c33537':
  Increased the error message font size

9 years agoFix build
Robin Lee [Thu, 25 Jun 2015 23:01:44 +0000 (16:01 -0700)]
Fix build

Change-Id: Ibb2db14b2fd38b2c8c066c97f8cd6e396c104ce8

9 years agoam 4b0f82c0: am f04bcebd: Merge "Enable VPN settings for secondary users" into mnc-dev
Robin Lee [Thu, 25 Jun 2015 22:48:14 +0000 (22:48 +0000)]
am 4b0f82c0: am f04bcebd: Merge "Enable VPN settings for secondary users" into mnc-dev

* commit '4b0f82c00dd84c0ae6c171ff267e9493f77cc264':
  Enable VPN settings for secondary users

9 years agoam 74dae06f: am 30d6b2b8: Merge "Always announcing wrong pattern now for talkback...
Selim Cinek [Thu, 25 Jun 2015 22:48:13 +0000 (22:48 +0000)]
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

9 years agoam cf1e2a12: am f2f29ff5: Merge "Increased the error message font size" into mnc-dev
Selim Cinek [Thu, 25 Jun 2015 22:48:12 +0000 (22:48 +0000)]
am cf1e2a12: am f2f29ff5: Merge "Increased the error message font size" into mnc-dev

* commit 'cf1e2a12c1b60388fdddfc5fae582ad2257fb541':
  Increased the error message font size

9 years agoam f04bcebd: Merge "Enable VPN settings for secondary users" into mnc-dev
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

9 years agoam 30d6b2b8: Merge "Always announcing wrong pattern now for talkback in pattern setti...
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

9 years agoam f2f29ff5: Merge "Increased the error message font size" into mnc-dev
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

9 years agoMerge "Enable VPN settings for secondary users" into mnc-dev
Robin Lee [Thu, 25 Jun 2015 22:27:54 +0000 (22:27 +0000)]
Merge "Enable VPN settings for secondary users" into mnc-dev

9 years agoEnable VPN settings for secondary users
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

9 years agoMerge "Always announcing wrong pattern now for talkback in pattern settings" into...
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

9 years agoMerge "Increased the error message font size" 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

9 years agoAlways announcing wrong pattern now for talkback in pattern settings
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

9 years agoIncreased the error message font size
Selim Cinek [Thu, 25 Jun 2015 18:54:08 +0000 (14:54 -0400)]
Increased the error message font size

Bug: 21568693
Change-Id: I059b962950335f5780783953505ec1e1f0e5b591

9 years agoam a0da7783: am 27edf038: am 7217592d: Merge "Add computed power to each Battery...
Adam Lesinski [Thu, 25 Jun 2015 20:16:29 +0000 (20:16 +0000)]
am a0da7783: am 27edf038: am 7217592d: Merge "Add computed power to each Battery Details page" into mnc-dev

* commit 'a0da7783a880b9f3988b9f790cdfbbe4f3c2e99f':
  Add computed power to each Battery Details page

9 years agoam 4c1b0b7d: am bdb83ba4: am fb6e1186: Fix accessibility for account sync
Jason Monk [Thu, 25 Jun 2015 20:16:28 +0000 (20:16 +0000)]
am 4c1b0b7d: am bdb83ba4: am fb6e1186: Fix accessibility for account sync

* commit '4c1b0b7d25b32028b5401efb39a29dac1f550867':
  Fix accessibility for account sync

9 years agoam 27edf038: am 7217592d: Merge "Add computed power to each Battery Details page...
Adam Lesinski [Thu, 25 Jun 2015 20:01:33 +0000 (20:01 +0000)]
am 27edf038: am 7217592d: Merge "Add computed power to each Battery Details page" into mnc-dev

* commit '27edf038b94430875c24800287c46774b2f561d8':
  Add computed power to each Battery Details page

9 years agoam bdb83ba4: am fb6e1186: Fix accessibility for account sync
Jason Monk [Thu, 25 Jun 2015 20:01:26 +0000 (20:01 +0000)]
am bdb83ba4: am fb6e1186: Fix accessibility for account sync

* commit 'bdb83ba43f834cbeb8226c0becdbbf87ec0c07ff':
  Fix accessibility for account sync

9 years agoam 7217592d: Merge "Add computed power to each Battery Details page" into mnc-dev
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

9 years agoMerge "Add computed power to each Battery Details page" into mnc-dev
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

9 years agoam fb6e1186: Fix accessibility for account sync
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

9 years agoFix 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

9 years agoAdd computed power to each Battery Details page
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

9 years agoam d922e870: am f2a795a2: am 91ba69df: Merge "Remove while box at the top right of...
Daichi Hirono [Thu, 25 Jun 2015 05:36:16 +0000 (05:36 +0000)]
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.

9 years agoam 21c9c2f1: am a1f85511: am fdc72d90: Merge "Update storage wizard\'s assets." into...
Daichi Hirono [Thu, 25 Jun 2015 05:36:15 +0000 (05:36 +0000)]
am 21c9c2f1: am a1f85511: am fdc72d90: Merge "Update storage wizard\'s assets." into mnc-dev

* commit '21c9c2f1501f7a42cc3c126b6b31d068435460a5':
  Update storage wizard's assets.

9 years agoam d70314a2: am 87629cda: am 1c1320a8: Bluetooth: Fix to avoid taking space as name...
Srinu Jella [Thu, 25 Jun 2015 05:36:14 +0000 (05:36 +0000)]
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

9 years agoam f2a795a2: am 91ba69df: Merge "Remove while box at the top right of storage setup...
Daichi Hirono [Thu, 25 Jun 2015 05:21:02 +0000 (05:21 +0000)]
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.

9 years agoam a1f85511: am fdc72d90: Merge "Update storage wizard\'s assets." into mnc-dev
Daichi Hirono [Thu, 25 Jun 2015 05:21:00 +0000 (05:21 +0000)]
am a1f85511: am fdc72d90: Merge "Update storage wizard\'s assets." into mnc-dev

* commit 'a1f85511d12d4fc7ce352742dc44a9ca151ccdbe':
  Update storage wizard's assets.

9 years agoam 87629cda: am 1c1320a8: Bluetooth: Fix to avoid taking space as name upon orientation
Srinu Jella [Thu, 25 Jun 2015 05:20:59 +0000 (05:20 +0000)]
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

9 years agoam 91ba69df: Merge "Remove while box at the top right of storage setup wizard." into...
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.

9 years agoam fdc72d90: Merge "Update storage wizard\'s assets." into mnc-dev
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.

9 years agoam 1c1320a8: Bluetooth: Fix to avoid taking space as name upon orientation
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

9 years agoMerge "Remove while box at the top right of storage setup wizard." into mnc-dev
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

9 years agoMerge "Update storage wizard's assets." 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

9 years agoRemove while box at the top right of storage setup wizard.
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

9 years agoUpdate storage wizard's assets.
Daichi Hirono [Thu, 25 Jun 2015 04:16:18 +0000 (13:16 +0900)]
Update storage wizard's assets.

BUG=22049781

Change-Id: Ie7eae9c76db06c77d0f4e85941125c005c2f28eb

9 years agoBluetooth: Fix to avoid taking space as name upon orientation
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

9 years agoam 20344e38: am 60f00268: am 1c19cb5e: Merge "Add data limit paused string to Data...
Sanket Padawe [Wed, 24 Jun 2015 22:16:08 +0000 (22:16 +0000)]
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.

9 years agoam 60f00268: am 1c19cb5e: Merge "Add data limit paused string to Data Usage Settings...
Sanket Padawe [Wed, 24 Jun 2015 21:51:49 +0000 (21:51 +0000)]
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.

9 years agoam 1c19cb5e: Merge "Add data limit paused string to Data Usage Settings screen."...
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.

9 years agoMerge "Add data limit paused string to Data Usage Settings screen." into mnc-dev
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

9 years agoAdd data limit paused string to Data Usage Settings screen.
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

9 years agoam d7dfbb62: am a768c0b2: am 1cbbec00: Merge "Fix marquee on app snippet in Installed...
Jason Monk [Wed, 24 Jun 2015 19:41:44 +0000 (19:41 +0000)]
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

9 years agoam a768c0b2: am 1cbbec00: Merge "Fix marquee on app snippet in InstalledAppDetails...
Jason Monk [Wed, 24 Jun 2015 19:29:19 +0000 (19:29 +0000)]
am a768c0b2: am 1cbbec00: Merge "Fix marquee on app snippet in InstalledAppDetails" into mnc-dev

* commit 'a768c0b2372fe129aede00fc5f559682704d7829':
  Fix marquee on app snippet in InstalledAppDetails

9 years agoam 1cbbec00: Merge "Fix marquee on app snippet in InstalledAppDetails" into mnc-dev
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

9 years agoMerge "Fix marquee on app snippet in InstalledAppDetails" into mnc-dev
Jason Monk [Wed, 24 Jun 2015 19:04:28 +0000 (19:04 +0000)]
Merge "Fix marquee on app snippet in InstalledAppDetails" into mnc-dev

9 years agoFix marquee on app snippet in InstalledAppDetails
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

9 years agoam bc99d35e: am 2f7fea73: am 5006bf1d: Merge "Language Update for Wi-Fi/Bluetooth...
Akshay Kannan [Wed, 24 Jun 2015 16:34:06 +0000 (16:34 +0000)]
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

9 years agoam 2f7fea73: am 5006bf1d: Merge "Language Update for Wi-Fi/Bluetooth Scanning" into...
Akshay Kannan [Wed, 24 Jun 2015 16:21:41 +0000 (16:21 +0000)]
am 2f7fea73: am 5006bf1d: Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev

* commit '2f7fea739a2ef32482412dfa144ee252a62525e2':
  Language Update for Wi-Fi/Bluetooth Scanning

9 years agoam 5006bf1d: Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev
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

9 years agoam a8ac7064: (-s ours) am 631fd465: (-s ours) am ab93f0e8: (-s ours) Import translati...
Geoff Mendal [Wed, 24 Jun 2015 16:08:12 +0000 (16:08 +0000)]
am a8ac7064: (-s ours) am 631fd465: (-s ours) am ab93f0e8: (-s ours) Import translations. DO NOT MERGE

* commit 'a8ac70647b5e8a77cebade3b42a60ba942a21065':
  Import translations. DO NOT MERGE

9 years agoam 631fd465: (-s ours) am ab93f0e8: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 24 Jun 2015 15:56:28 +0000 (15:56 +0000)]
am 631fd465: (-s ours) am ab93f0e8: (-s ours) Import translations. DO NOT MERGE

* commit '631fd465cc6fbb146ed2469ef1821e81e8c1b7de':
  Import translations. DO NOT MERGE

9 years agoMerge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev
Akshay Kannan [Wed, 24 Jun 2015 15:55:31 +0000 (15:55 +0000)]
Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev

9 years agoam ab93f0e8: (-s ours) Import translations. DO NOT MERGE
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

9 years agoImport 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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 24 Jun 2015 14:24:25 +0000 (07:24 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5af7b82d50d9b20c854626ed896a7b8b414716e7
Auto-generated-cl: translation import

9 years agoam 396366ed: am 5c1542e6: am 95029c97: Merge "Change the color of format button in...
Daichi Hirono [Wed, 24 Jun 2015 05:53:57 +0000 (05:53 +0000)]
am 396366ed: am 5c1542e6: am 95029c97: Merge "Change the color of format button in "Device storage > Format" screen." into mnc-dev

* commit '396366eda979351f9749d3c86036c8f5cd71a62c':
  Change the color of format button in "Device storage > Format" screen.

9 years agoam 5c1542e6: am 95029c97: Merge "Change the color of format button in "Device storage...
Daichi Hirono [Wed, 24 Jun 2015 05:41:40 +0000 (05:41 +0000)]
am 5c1542e6: am 95029c97: Merge "Change the color of format button in "Device storage > Format" screen." into mnc-dev

* commit '5c1542e6fdfc619ed5bc5ded2a2dfa29d7082c5d':
  Change the color of format button in "Device storage > Format" screen.

9 years agoam 95029c97: Merge "Change the color of format button in "Device storage > Format...
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.

9 years agoMerge "Change the color of format button in "Device storage > Format" screen." into...
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

9 years agoChange the color of format button in "Device storage > Format" screen.
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

9 years agoLanguage Update for Wi-Fi/Bluetooth Scanning
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

9 years agoam c9d3f895: am ae3693d4: am 1726b2c9: Merge "Added contentDescription for fingerprin...
Selim Cinek [Tue, 23 Jun 2015 23:17:37 +0000 (23:17 +0000)]
am c9d3f895: am ae3693d4: am 1726b2c9: Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev

* commit 'c9d3f895295c578652f13b331bec1fe02394224b':
  Added contentDescription for fingerprint on the confirmCredential screen

9 years agoam 053522c5: am cee74232: am 96a06144: Merge "Add action for search results including...
Jason Monk [Tue, 23 Jun 2015 22:21:23 +0000 (22:21 +0000)]
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

9 years agoam ae3693d4: am 1726b2c9: Merge "Added contentDescription for fingerprint on the...
Selim Cinek [Tue, 23 Jun 2015 22:12:05 +0000 (22:12 +0000)]
am ae3693d4: am 1726b2c9: Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev

* commit 'ae3693d44f036f99c0a32a18dda0a4ff312e456a':
  Added contentDescription for fingerprint on the confirmCredential screen

9 years agoam 1726b2c9: Merge "Added contentDescription for fingerprint on the confirmCredential...
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

9 years agoMerge "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

9 years agoAdded contentDescription for fingerprint on the confirmCredential screen
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

9 years agoam cee74232: am 96a06144: Merge "Add action for search results including the count...
Jason Monk [Tue, 23 Jun 2015 21:07:09 +0000 (21:07 +0000)]
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

9 years agoam 32c8b874: am df82f5bf: am 52e728ab: Merge "Screen pinning set default lock on...
Jason Monk [Tue, 23 Jun 2015 20:55:24 +0000 (20:55 +0000)]
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

9 years agoam df82f5bf: am 52e728ab: Merge "Screen pinning set default lock on exit value" into...
Jason Monk [Tue, 23 Jun 2015 20:46:01 +0000 (20:46 +0000)]
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

9 years agoam 96a06144: Merge "Add action for search results including the count" into mnc-dev
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

9 years agoMerge "Add action for search results including the count" into mnc-dev
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

9 years agoAdd action for search results including the count
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

9 years agoam 5cb96691: am d91a08bb: am 966a29dc: Merge "Improved talkback fingerprint enrollmen...
Selim Cinek [Tue, 23 Jun 2015 18:23:28 +0000 (18:23 +0000)]
am 5cb96691: am d91a08bb: am 966a29dc: Merge "Improved talkback fingerprint enrollment flow" into mnc-dev

* commit '5cb96691414ffbf06b6d63ffac5d760de1670905':
  Improved talkback fingerprint enrollment flow

9 years agoam d91a08bb: am 966a29dc: Merge "Improved talkback fingerprint enrollment flow" into...
Selim Cinek [Tue, 23 Jun 2015 18:08:16 +0000 (18:08 +0000)]
am d91a08bb: am 966a29dc: Merge "Improved talkback fingerprint enrollment flow" into mnc-dev

* commit 'd91a08bbc37785817f435cac67dba6bae98fbdfb':
  Improved talkback fingerprint enrollment flow

9 years agoam 52e728ab: Merge "Screen pinning set default lock on exit value" into mnc-dev
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

9 years agoMerge "Screen pinning set default lock on exit value" into mnc-dev
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

9 years agoam 966a29dc: Merge "Improved talkback fingerprint enrollment flow" 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

9 years agoScreen pinning set default lock on exit value
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

9 years agoMerge "Improved talkback fingerprint enrollment flow" into mnc-dev
Selim Cinek [Tue, 23 Jun 2015 17:14:42 +0000 (17:14 +0000)]
Merge "Improved talkback fingerprint enrollment flow" into mnc-dev

9 years agoImproved talkback fingerprint enrollment flow
Selim Cinek [Tue, 23 Jun 2015 17:12:24 +0000 (13:12 -0400)]
Improved talkback fingerprint enrollment flow

Bug: 21565901
Change-Id: If25468574afd25b1a7d19278710045083ba1d4f7

9 years agoam ab403120: am 26699a07: am 9dd754e1: Merge "Reflect effect of all Wifi editability...
Zoltan Szatmary-Ban [Tue, 23 Jun 2015 10:11:57 +0000 (10:11 +0000)]
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

9 years agoam 26699a07: am 9dd754e1: Merge "Reflect effect of all Wifi editability factors in...
Zoltan Szatmary-Ban [Tue, 23 Jun 2015 10:00:26 +0000 (10:00 +0000)]
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

9 years agoam 9dd754e1: Merge "Reflect effect of all Wifi editability factors in Settings" into...
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

9 years agoMerge "Reflect effect of all Wifi editability factors in Settings" into mnc-dev
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

9 years agoam b43128ab: am 088c6d68: am 2bed3a50: Merge "Align Enlish words to RTL in RTL contex...
Sanket Padawe [Tue, 23 Jun 2015 05:38:48 +0000 (05:38 +0000)]
am b43128ab: am 088c6d68: am 2bed3a50: Merge "Align Enlish words to RTL in RTL context in networkreset Settings." into mnc-dev

* commit 'b43128abd9329eec01016b80ece97a3cad3cae88':
  Align Enlish words to RTL in RTL context in networkreset Settings.

9 years agoam bf4849c8: am a8c6cb5a: am 4044d6cd: Merge "Fix display of "Contact sharing" option...
Sanket Padawe [Tue, 23 Jun 2015 05:38:47 +0000 (05:38 +0000)]
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.

9 years agoam 30552566: am 5dee645c: am d55ddc33: Merge "if do not turn on wifi STA or SAP,...
xinhe [Tue, 23 Jun 2015 04:38:33 +0000 (04:38 +0000)]
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

9 years agoam 088c6d68: am 2bed3a50: Merge "Align Enlish words to RTL in RTL context in networkr...
Sanket Padawe [Tue, 23 Jun 2015 03:20:57 +0000 (03:20 +0000)]
am 088c6d68: am 2bed3a50: Merge "Align Enlish words to RTL in RTL context in networkreset Settings." into mnc-dev

* commit '088c6d68c2ae9560842d66d71a77783c370ac2e3':
  Align Enlish words to RTL in RTL context in networkreset Settings.

9 years agoam a8c6cb5a: am 4044d6cd: Merge "Fix display of "Contact sharing" option in Car kit...
Sanket Padawe [Tue, 23 Jun 2015 03:20:29 +0000 (03:20 +0000)]
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.

9 years agoam 5dee645c: am d55ddc33: Merge "if do not turn on wifi STA or SAP, there is no 5GHz...
xinhe [Tue, 23 Jun 2015 03:12:55 +0000 (03:12 +0000)]
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

9 years agoam 2bed3a50: Merge "Align Enlish words to RTL in RTL context in networkreset Settings...
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.

9 years agoMerge "Align Enlish words to RTL in RTL context in networkreset Settings." into mnc-dev
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

9 years agoAlign Enlish words to RTL in RTL context in networkreset Settings.
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