OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into...
John Spurlock [Thu, 4 Jun 2015 16:04:13 +0000 (16:04 +0000)]
am afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev

* commit 'afa64f45ab40457af9a2a70f9aa795e65167693d':
  Settings: Add zen rule name warning text.

9 years agoam 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev
John Spurlock [Thu, 4 Jun 2015 15:51:05 +0000 (15:51 +0000)]
am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev

* commit '1a1181edde0d8d941161e941f12e6783f25ae43d':
  Settings: Add zen rule name warning text.

9 years agoam 06840b31: am cd5b97df: Merge "Fix updates of the enable/disable button" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 15:44:35 +0000 (15:44 +0000)]
am 06840b31: am cd5b97df: Merge "Fix updates of the enable/disable button" into mnc-dev

* commit '06840b31f65e4972c24b7716b29831904d9ee694':
  Fix updates of the enable/disable button

9 years agoMerge "Settings: Add zen rule name warning text." into mnc-dev
John Spurlock [Thu, 4 Jun 2015 15:41:58 +0000 (15:41 +0000)]
Merge "Settings: Add zen rule name warning text." into mnc-dev

9 years agoSettings: Add zen rule name warning text.
John Spurlock [Thu, 4 Jun 2015 15:37:36 +0000 (11:37 -0400)]
Settings: Add zen rule name warning text.

Bug: 21307309
Change-Id: Id08e3bdebb9a87dc474f2551f17268d655c8b4ea

9 years agoam cd5b97df: Merge "Fix updates of the enable/disable button" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 15:33:07 +0000 (15:33 +0000)]
am cd5b97df: Merge "Fix updates of the enable/disable button" into mnc-dev

* commit 'cd5b97dfad920ca5f84e42f3e0dbb648550637e6':
  Fix updates of the enable/disable button

9 years agoMerge "Fix updates of the enable/disable button" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 15:24:27 +0000 (15:24 +0000)]
Merge "Fix updates of the enable/disable button" into mnc-dev

9 years agoam 3cce5d37: am bdf3ddad: Merge "Fix crash in battery screen" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 15:21:04 +0000 (15:21 +0000)]
am 3cce5d37: am bdf3ddad: Merge "Fix crash in battery screen" into mnc-dev

* commit '3cce5d3798f6140b40ac645d4bd8b66b3f960078':
  Fix crash in battery screen

9 years agoam bdf3ddad: Merge "Fix crash in battery screen" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 15:09:08 +0000 (15:09 +0000)]
am bdf3ddad: Merge "Fix crash in battery screen" into mnc-dev

* commit 'bdf3ddadd51daef78434351d341954a0ae3fc56e':
  Fix crash in battery screen

9 years agoam c72cfc8a: am 34a78be5: Merge "Settings: Enable "ok" dialog button for no-op change...
John Spurlock [Thu, 4 Jun 2015 15:08:27 +0000 (15:08 +0000)]
am c72cfc8a: am 34a78be5: Merge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules." into mnc-dev

* commit 'c72cfc8a97562999f9ed8292cedfd7132691cb1c':
  Settings: Enable "ok" dialog button for no-op changes to existing zen rules.

9 years agoMerge "Fix crash in battery screen" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 14:58:57 +0000 (14:58 +0000)]
Merge "Fix crash in battery screen" into mnc-dev

9 years agoam 34a78be5: Merge "Settings: Enable "ok" dialog button for no-op changes to existing...
John Spurlock [Thu, 4 Jun 2015 14:58:01 +0000 (14:58 +0000)]
am 34a78be5: Merge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules." into mnc-dev

* commit '34a78be5844f3e12fb6abccef12646d3c800fe7a':
  Settings: Enable "ok" dialog button for no-op changes to existing zen rules.

9 years agoFix updates of the enable/disable button
Jason Monk [Thu, 4 Jun 2015 14:57:31 +0000 (10:57 -0400)]
Fix updates of the enable/disable button

Make the entire ApplicationsState resume and do way too much work
so that we can get a little bit of state.

ApplicationsState could use some refactoring.

Bug: 21518528
Change-Id: Ibb6a2c15948f9bc69490426d4004dc83582087b4

9 years agoFix crash in battery screen
Jason Monk [Thu, 4 Jun 2015 14:50:25 +0000 (10:50 -0400)]
Fix crash in battery screen

Also add a fake app item

Bug: 21624653
Change-Id: I1a8598472e014f773d2396a9a08fd03e8e32b400

9 years agoMerge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules...
John Spurlock [Thu, 4 Jun 2015 14:48:01 +0000 (14:48 +0000)]
Merge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules." into mnc-dev

9 years agoSettings: Enable "ok" dialog button for no-op changes to existing zen rules.
John Spurlock [Thu, 4 Jun 2015 14:44:45 +0000 (10:44 -0400)]
Settings: Enable "ok" dialog button for no-op changes to existing zen rules.

Bug: 21307309
Change-Id: Ic7a9cc124e26340e93a08da45c9f1a0043beee76

9 years agoam 1b53d0c2: am 41012d5e: Merge "Disable owner info when no lock screen" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 13:32:56 +0000 (13:32 +0000)]
am 1b53d0c2: am 41012d5e: Merge "Disable owner info when no lock screen" into mnc-dev

* commit '1b53d0c25be74260dc654b481876a5e2d9ad18a8':
  Disable owner info when no lock screen

9 years agoam 41012d5e: Merge "Disable owner info when no lock screen" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 13:20:27 +0000 (13:20 +0000)]
am 41012d5e: Merge "Disable owner info when no lock screen" into mnc-dev

* commit '41012d5e7b37fe5c2373f3215612d26331f40ba0':
  Disable owner info when no lock screen

9 years agoam 2ee08cd9: am 58148481: Merge "Protect against monkey crash" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 13:19:49 +0000 (13:19 +0000)]
am 2ee08cd9: am 58148481: Merge "Protect against monkey crash" into mnc-dev

* commit '2ee08cd9623403948e8d88345426372f213e135d':
  Protect against monkey crash

9 years agoMerge "Disable owner info when no lock screen" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 13:08:48 +0000 (13:08 +0000)]
Merge "Disable owner info when no lock screen" into mnc-dev

9 years agoam 58148481: Merge "Protect against monkey crash" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 13:07:02 +0000 (13:07 +0000)]
am 58148481: Merge "Protect against monkey crash" into mnc-dev

* commit '58148481a53381cff75ed74421716690055a2f1d':
  Protect against monkey crash

9 years agoMerge "Protect against monkey crash" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 12:55:44 +0000 (12:55 +0000)]
Merge "Protect against monkey crash" into mnc-dev

9 years agoam dddca46b: am 471da569: Merge "Revert "Fix some dark theme issues"" into mnc-dev
Jim Miller [Thu, 4 Jun 2015 03:11:42 +0000 (03:11 +0000)]
am dddca46b: am 471da569: Merge "Revert "Fix some dark theme issues"" into mnc-dev

* commit 'dddca46b581e0c40868242cb3952da8b409cc9c6':
  Revert "Fix some dark theme issues"

9 years agoam 471da569: Merge "Revert "Fix some dark theme issues"" into mnc-dev
Jim Miller [Thu, 4 Jun 2015 02:59:20 +0000 (02:59 +0000)]
am 471da569: Merge "Revert "Fix some dark theme issues"" into mnc-dev

* commit '471da56938c2ca8102f7740b3eb5704f48d86aff':
  Revert "Fix some dark theme issues"

9 years agoMerge "Revert "Fix some dark theme issues"" into mnc-dev
Jim Miller [Thu, 4 Jun 2015 02:52:11 +0000 (02:52 +0000)]
Merge "Revert "Fix some dark theme issues"" into mnc-dev

9 years agoRevert "Fix some dark theme issues"
Jim Miller [Thu, 4 Jun 2015 02:45:40 +0000 (02:45 +0000)]
Revert "Fix some dark theme issues"

This breaks the pattern entry screens of SecuritySettings.  Reverting until we can take a closer look.

This reverts commit cb8ccbb3b5907eb6deb9fbc74fb3b3de141028fb.

Change-Id: Ifb3c46198de30914aff3a33df84971b1b31ab227

9 years agoam ec3f6e29: am 215e3f03: Merge "Display softKeyboard when entering pin for pairing...
Sanket Padawe [Thu, 4 Jun 2015 02:12:48 +0000 (02:12 +0000)]
am ec3f6e29: am 215e3f03: Merge "Display softKeyboard when entering pin for pairing BT device." into mnc-dev

* commit 'ec3f6e297c28b4a1b774b46a66fe969ebd30f0fa':
  Display softKeyboard when entering pin for pairing BT device.

9 years agoam 215e3f03: Merge "Display softKeyboard when entering pin for pairing BT device...
Sanket Padawe [Thu, 4 Jun 2015 01:58:07 +0000 (01:58 +0000)]
am 215e3f03: Merge "Display softKeyboard when entering pin for pairing BT device." into mnc-dev

* commit '215e3f03766de0b72aed471d0b22c06e48ab03b2':
  Display softKeyboard when entering pin for pairing BT device.

9 years agoMerge "Display softKeyboard when entering pin for pairing BT device." into mnc-dev
Sanket Padawe [Thu, 4 Jun 2015 01:47:49 +0000 (01:47 +0000)]
Merge "Display softKeyboard when entering pin for pairing BT device." into mnc-dev

9 years agoDisplay softKeyboard when entering pin for pairing BT device.
Sanket Padawe [Thu, 4 Jun 2015 01:47:25 +0000 (18:47 -0700)]
Display softKeyboard when entering pin for pairing BT device.

Bug: 18784238
Change-Id: I73bec83aa099a4f63fa055cb67afb095f37dee28

9 years agoam 01a6351f: am fcf64237: Merge "Re-add a string which was accidently removed." into...
Stuart Scott [Thu, 4 Jun 2015 01:14:18 +0000 (01:14 +0000)]
am 01a6351f: am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev

* commit '01a6351f7afd4af10538a0b1cf4ed48cd2d7396a':
  Re-add a string which was accidently removed.

9 years agoam fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev
Stuart Scott [Thu, 4 Jun 2015 01:03:15 +0000 (01:03 +0000)]
am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev

* commit 'fcf64237b72b506d6f45717d8f7252fb656c5fa4':
  Re-add a string which was accidently removed.

9 years agoMerge "Re-add a string which was accidently removed." into mnc-dev
Stuart Scott [Thu, 4 Jun 2015 00:51:13 +0000 (00:51 +0000)]
Merge "Re-add a string which was accidently removed." into mnc-dev

9 years agoRe-add a string which was accidently removed.
Stuart Scott [Thu, 4 Jun 2015 00:01:42 +0000 (17:01 -0700)]
Re-add a string which was accidently removed.

bug:20051165
Change-Id: I43214f30650565499ffbdddb3819e96ac957ebf1

9 years agoam 91ec04bd: am 41dbc14e: Merge "In Settings, don\'t allow to disable an app which...
Nicolas Prevot [Wed, 3 Jun 2015 22:38:24 +0000 (22:38 +0000)]
am 91ec04bd: am 41dbc14e: Merge "In Settings, don\'t allow to disable an app which is profile/device owner." into mnc-dev

* commit '91ec04bdce32f24056613f15041c905bf119c533':
  In Settings, don't allow to disable an app which is profile/device owner.

9 years agoam 41dbc14e: Merge "In Settings, don\'t allow to disable an app which is profile...
Nicolas Prevot [Wed, 3 Jun 2015 22:25:16 +0000 (22:25 +0000)]
am 41dbc14e: Merge "In Settings, don\'t allow to disable an app which is profile/device owner." into mnc-dev

* commit '41dbc14eda952203320bc9a64c3d42d98bacee9f':
  In Settings, don't allow to disable an app which is profile/device owner.

9 years agoam ab0ea0a2: am 3d32af26: Fix Wifi Settings crash on continuous wifi toggling.
Sanket Padawe [Wed, 3 Jun 2015 22:18:53 +0000 (22:18 +0000)]
am ab0ea0a2: am 3d32af26: Fix Wifi Settings crash on continuous wifi toggling.

* commit 'ab0ea0a24f062485113de60c76a97a239ece6065':
  Fix Wifi Settings crash on continuous wifi toggling.

9 years agoMerge "In Settings, don't allow to disable an app which is profile/device owner....
Nicolas Prevot [Wed, 3 Jun 2015 22:17:10 +0000 (22:17 +0000)]
Merge "In Settings, don't allow to disable an app which is profile/device owner." into mnc-dev

9 years agoam 3d32af26: Fix Wifi Settings crash on continuous wifi toggling.
Sanket Padawe [Wed, 3 Jun 2015 22:06:01 +0000 (22:06 +0000)]
am 3d32af26: Fix Wifi Settings crash on continuous wifi toggling.

* commit '3d32af264254660150c5f2d63a64b3462a9378dd':
  Fix Wifi Settings crash on continuous wifi toggling.

9 years agoIn Settings, don't allow to disable an app which is profile/device owner.
Nicolas Prevot [Wed, 3 Jun 2015 21:36:35 +0000 (14:36 -0700)]
In Settings, don't allow to disable an app which is profile/device owner.

In the App Info section of Settings:
If the app is device owner or profile owner of at least one user, disable the
disable button.

BUG: 20831525

Change-Id: Iff00314108caf8c0b209f66060e6655ef06f2aa0

9 years agoFix Wifi Settings crash on continuous wifi toggling.
Sanket Padawe [Wed, 3 Jun 2015 21:16:13 +0000 (14:16 -0700)]
Fix Wifi Settings crash on continuous wifi toggling.

Bug: 21591640
Change-Id: I17aa385a1e5fb3edfdb054234ab20b3dbc6fea60

9 years agoDisable owner info when no lock screen
Jason Monk [Wed, 3 Jun 2015 20:37:07 +0000 (16:37 -0400)]
Disable owner info when no lock screen

Bug: 20514900
Change-Id: I10108d7300e5aa9379c8e8cc7d1b1bb11b8f121e

9 years agoProtect against monkey crash
Jason Monk [Wed, 3 Jun 2015 19:43:46 +0000 (15:43 -0400)]
Protect against monkey crash

Bug: 19541028
Change-Id: Ia8e477b3c2843b2e841c429ce090ff388958bfcb

9 years agoam 04e1d51a: am fb619a87: Merge "Fix Wifi Signal strength icon issues in WifiSettings...
Sanket Padawe [Wed, 3 Jun 2015 19:24:11 +0000 (19:24 +0000)]
am 04e1d51a: am fb619a87: Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev

* commit '04e1d51a6467ae41df6604423500e864e0ec7721':
  Fix Wifi Signal strength icon issues in WifiSettings.

9 years agoam 01145a14: (-s ours) am 26e8b0bf: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 3 Jun 2015 19:18:16 +0000 (19:18 +0000)]
am 01145a14: (-s ours) am 26e8b0bf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '01145a14304c9837f8ecd578ac60c2660a69b70f':
  Import translations. DO NOT MERGE

9 years agoam fb619a87: Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev
Sanket Padawe [Wed, 3 Jun 2015 19:09:08 +0000 (19:09 +0000)]
am fb619a87: Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev

* commit 'fb619a8726cf912e9c9156d8ca06760b641c5171':
  Fix Wifi Signal strength icon issues in WifiSettings.

9 years agoMerge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev
Sanket Padawe [Wed, 3 Jun 2015 18:57:39 +0000 (18:57 +0000)]
Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev

9 years agoFix Wifi Signal strength icon issues in WifiSettings.
Sanket Padawe [Wed, 3 Jun 2015 18:54:41 +0000 (11:54 -0700)]
Fix Wifi Signal strength icon issues in WifiSettings.

Bug: 21591392
Bug: 21592509
Change-Id: I6612ef62c17e6279b06f80a67bee345e913f1927

9 years agoam 84cd3bfb: am 0732a646: Merge "Fix some dark theme issues" into mnc-dev
Jason Monk [Wed, 3 Jun 2015 18:48:01 +0000 (18:48 +0000)]
am 84cd3bfb: am 0732a646: Merge "Fix some dark theme issues" into mnc-dev

* commit '84cd3bfb43174215abb8648e14e0481380b27828':
  Fix some dark theme issues

9 years agoam ff9098dd: am bc9a3630: Merge "Don\'t allow secondary users apps to start restricte...
Nicolas Prevot [Wed, 3 Jun 2015 18:48:00 +0000 (18:48 +0000)]
am ff9098dd: am bc9a3630: Merge "Don\'t allow secondary users apps to start restricted Settings fragment." into mnc-dev

* commit 'ff9098ddc6905ccd9e102b762df283887456da16':
  Don't allow secondary users apps to start restricted Settings fragment.

9 years agoam 748c9381: am e6d7623c: Merge "Reorder device category" into mnc-dev
Jason Monk [Wed, 3 Jun 2015 18:47:59 +0000 (18:47 +0000)]
am 748c9381: am e6d7623c: Merge "Reorder device category" into mnc-dev

* commit '748c938135c73ef6fa3c5d5777d4dd4cf8a8b0e3':
  Reorder device category

9 years agoam fc32d510: am ef0b4362: Merge "Fix TTS for Zen mode voice activity." into mnc-dev
Barnaby James [Wed, 3 Jun 2015 18:46:07 +0000 (18:46 +0000)]
am fc32d510: am ef0b4362: Merge "Fix TTS for Zen mode voice activity." into mnc-dev

* commit 'fc32d5101dfdf38dbe7c1da4382cedc1015208a5':
  Fix TTS for Zen mode voice activity.

9 years agoam 3bab71f8: am d9e92ea5: Merge "Use accessibilityLiveRegion for ConfirmLockPassword...
Xiyuan Xia [Wed, 3 Jun 2015 18:46:05 +0000 (18:46 +0000)]
am 3bab71f8: am d9e92ea5: Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev

* commit '3bab71f843e713f1325ae043668442ee9387258f':
  Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText

9 years agoam 26e8b0bf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 3 Jun 2015 18:32:09 +0000 (18:32 +0000)]
am 26e8b0bf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '26e8b0bf7d62c0a9baed5c1b72b5c992d8209377':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 3 Jun 2015 18:18:43 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoam 0732a646: Merge "Fix some dark theme issues" into mnc-dev
Jason Monk [Wed, 3 Jun 2015 18:12:58 +0000 (18:12 +0000)]
am 0732a646: Merge "Fix some dark theme issues" into mnc-dev

* commit '0732a646020d97ab38c247cce21674838715c322':
  Fix some dark theme issues

9 years agoam bc9a3630: Merge "Don\'t allow secondary users apps to start restricted Settings...
Nicolas Prevot [Wed, 3 Jun 2015 18:12:54 +0000 (18:12 +0000)]
am bc9a3630: Merge "Don\'t allow secondary users apps to start restricted Settings fragment." into mnc-dev

* commit 'bc9a3630bc6dac8f1ba7ecfbb2ec65589519d437':
  Don't allow secondary users apps to start restricted Settings fragment.

9 years agoam e6d7623c: Merge "Reorder device category" into mnc-dev
Jason Monk [Wed, 3 Jun 2015 18:12:53 +0000 (18:12 +0000)]
am e6d7623c: Merge "Reorder device category" into mnc-dev

* commit 'e6d7623ca704e0d42d433e573423611a82d7cd5c':
  Reorder device category

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Jun 2015 18:04:23 +0000 (11:04 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam ef0b4362: Merge "Fix TTS for Zen mode voice activity." into mnc-dev
Barnaby James [Wed, 3 Jun 2015 17:42:34 +0000 (17:42 +0000)]
am ef0b4362: Merge "Fix TTS for Zen mode voice activity." into mnc-dev

* commit 'ef0b43625c8aa3e8519888e4e185daa77b33dc2a':
  Fix TTS for Zen mode voice activity.

9 years agoam d9e92ea5: Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern error...
Xiyuan Xia [Wed, 3 Jun 2015 17:41:16 +0000 (17:41 +0000)]
am d9e92ea5: Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev

* commit 'd9e92ea551af6b65deb88ea68a229fac03030d03':
  Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText

9 years agoMerge "Fix some dark theme issues" into mnc-dev
Jason Monk [Wed, 3 Jun 2015 17:30:54 +0000 (17:30 +0000)]
Merge "Fix some dark theme issues" into mnc-dev

9 years agoFix some dark theme issues
Jason Monk [Wed, 3 Jun 2015 14:53:03 +0000 (10:53 -0400)]
Fix some dark theme issues

Bug: 21117509
Bug: 21077345
Bug: 21480587
Change-Id: I61bcd6631288b0e51204ac8bf134c44b2800e0fe

9 years agoMerge "Don't allow secondary users apps to start restricted Settings fragment." into...
Nicolas Prevot [Wed, 3 Jun 2015 17:28:34 +0000 (17:28 +0000)]
Merge "Don't allow secondary users apps to start restricted Settings fragment." into mnc-dev

9 years agoMerge "Reorder device category" into mnc-dev
Jason Monk [Wed, 3 Jun 2015 17:21:59 +0000 (17:21 +0000)]
Merge "Reorder device category" into mnc-dev

9 years agoReorder device category
Jason Monk [Wed, 3 Jun 2015 17:18:07 +0000 (13:18 -0400)]
Reorder device category

Bug: 21588753
Change-Id: Ie01ad44b3bc9d2d3cac165e25b72a112896d4d2c

9 years agoMerge "Fix TTS for Zen mode voice activity." into mnc-dev
Barnaby James [Wed, 3 Jun 2015 17:09:45 +0000 (17:09 +0000)]
Merge "Fix TTS for Zen mode voice activity." into mnc-dev

9 years agoMerge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into...
Xiyuan Xia [Wed, 3 Jun 2015 16:07:41 +0000 (16:07 +0000)]
Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev

9 years agoam 21c43016: Merge "Dont crash if there is no spellchecker"
Jason Monk [Wed, 3 Jun 2015 13:56:51 +0000 (13:56 +0000)]
am 21c43016: Merge "Dont crash if there is no spellchecker"

* commit '21c430160fe6d9a6e53600ac350e3661802b85aa':
  Dont crash if there is no spellchecker

9 years agoMerge "Dont crash if there is no spellchecker"
Jason Monk [Wed, 3 Jun 2015 13:28:58 +0000 (13:28 +0000)]
Merge "Dont crash if there is no spellchecker"

9 years agoam 9b190d18: am fb32790a: Merge "Fix Bluetooth device Settings checkbox issue on...
Sanket Padawe [Wed, 3 Jun 2015 02:21:30 +0000 (02:21 +0000)]
am 9b190d18: am fb32790a: Merge "Fix Bluetooth device Settings checkbox issue on clicking "Input device"" into mnc-dev

* commit '9b190d1879174c937a26e8bfff3187902543872c':
  Fix Bluetooth device Settings checkbox issue on clicking "Input device"

9 years agoam 62bb4227: am 6a051168: Merge "Hide search from everywhere but the dashboard" into...
Jason Monk [Wed, 3 Jun 2015 02:21:00 +0000 (02:21 +0000)]
am 62bb4227: am 6a051168: Merge "Hide search from everywhere but the dashboard" into mnc-dev

* commit '62bb4227da8962642fb9f34161a016c80ab74c0b':
  Hide search from everywhere but the dashboard

9 years agoDon't allow secondary users apps to start restricted Settings fragment.
Nicolas Prevot [Tue, 2 Jun 2015 21:27:49 +0000 (22:27 +0100)]
Don't allow secondary users apps to start restricted Settings fragment.

On a secondary user, the fragments ApnSettings, TetherSettings and VpnSettings
should not be started.

But an app can still send an intent to start these fragments.
Prevent this by checkin the userId in these fragments.

BUG:15313261
BUG:15312781
BUG:15312494

Change-Id: I2a36bb89a8e37e4440aa28372d7a1800b33dae37

9 years agoam fb32790a: Merge "Fix Bluetooth device Settings checkbox issue on clicking "Input...
Sanket Padawe [Tue, 2 Jun 2015 23:15:42 +0000 (23:15 +0000)]
am fb32790a: Merge "Fix Bluetooth device Settings checkbox issue on clicking "Input device"" into mnc-dev

* commit 'fb32790adc9ed647ad4e77c9613a860f9b76e855':
  Fix Bluetooth device Settings checkbox issue on clicking "Input device"

9 years agoMerge "Fix Bluetooth device Settings checkbox issue on clicking "Input device"" into...
Sanket Padawe [Tue, 2 Jun 2015 23:04:23 +0000 (23:04 +0000)]
Merge "Fix Bluetooth device Settings checkbox issue on clicking "Input device"" into mnc-dev

9 years agoFix Bluetooth device Settings checkbox issue on clicking "Input device"
Sanket Padawe [Tue, 2 Jun 2015 23:00:43 +0000 (16:00 -0700)]
Fix Bluetooth device Settings checkbox issue on clicking "Input device"

Bug: 19937357
Change-Id: I6f74577a062df407e50972b84dd4e5d7d2da529b

9 years agoam 6a051168: Merge "Hide search from everywhere but the dashboard" into mnc-dev
Jason Monk [Tue, 2 Jun 2015 22:48:49 +0000 (22:48 +0000)]
am 6a051168: Merge "Hide search from everywhere but the dashboard" into mnc-dev

* commit '6a05116804c9b849bf3aa634df3e90cc216abc88':
  Hide search from everywhere but the dashboard

9 years agoMerge "Hide search from everywhere but the dashboard" into mnc-dev
Jason Monk [Tue, 2 Jun 2015 22:39:07 +0000 (22:39 +0000)]
Merge "Hide search from everywhere but the dashboard" into mnc-dev

9 years agoUse accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText
Xiyuan Xia [Tue, 2 Jun 2015 22:21:51 +0000 (15:21 -0700)]
Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText

- Revert previous "Add announceForAccessibility to ConfirmLockPattern";
- Add android:accessibilityLiveRegion="polite" for errorText in
  ConfirmLockPassword/Pattern;

Bug:20282779
Change-Id: I4b9c0d461d0dd0504bd88a8a2144e09a42d5f64e

9 years agoam 63a885d3: am 96e25b8d: Merge "Only show emergency app preference if enabled" into...
Adrian Roos [Tue, 2 Jun 2015 21:16:29 +0000 (21:16 +0000)]
am 63a885d3: am 96e25b8d: Merge "Only show emergency app preference if enabled" into mnc-dev

* commit '63a885d39f2acdf59a348d9d9f558327ff0b5780':
  Only show emergency app preference if enabled

9 years agoam 8c48a9b1: am 0d7d9272: Change DeviceProfilesSettings to DialogFragment
Jason Monk [Tue, 2 Jun 2015 21:16:28 +0000 (21:16 +0000)]
am 8c48a9b1: am 0d7d9272: Change DeviceProfilesSettings to DialogFragment

* commit '8c48a9b11961d41c8a090d38daeb972462dcec45':
  Change DeviceProfilesSettings to DialogFragment

9 years agoam 84abde71: am 1b7bff11: Merge "Fix battery usage screen issues" into mnc-dev
Jason Monk [Tue, 2 Jun 2015 21:10:27 +0000 (21:10 +0000)]
am 84abde71: am 1b7bff11: Merge "Fix battery usage screen issues" into mnc-dev

* commit '84abde71471b6631d7f12f47ef9c92360cbdbafc':
  Fix battery usage screen issues

9 years agoam 3e3ff42a: am 6a6ae2dc: Merge "Fix UI checkbox issue while disabling "Phone Audio...
Sanket Padawe [Tue, 2 Jun 2015 21:08:58 +0000 (21:08 +0000)]
am 3e3ff42a: am 6a6ae2dc: Merge "Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings." into mnc-dev

* commit '3e3ff42a811576d73f215434baa0cf8138e7c6f4':
  Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings.

9 years agoam 96e25b8d: Merge "Only show emergency app preference if enabled" into mnc-dev
Adrian Roos [Tue, 2 Jun 2015 20:55:01 +0000 (20:55 +0000)]
am 96e25b8d: Merge "Only show emergency app preference if enabled" into mnc-dev

* commit '96e25b8d938082715f93bd071eb386a2174b910d':
  Only show emergency app preference if enabled

9 years agoam 0d7d9272: Change DeviceProfilesSettings to DialogFragment
Jason Monk [Tue, 2 Jun 2015 20:54:59 +0000 (20:54 +0000)]
am 0d7d9272: Change DeviceProfilesSettings to DialogFragment

* commit '0d7d927216e536ead911f4949134ca362af345ab':
  Change DeviceProfilesSettings to DialogFragment

9 years agoMerge "Only show emergency app preference if enabled" into mnc-dev
Adrian Roos [Tue, 2 Jun 2015 20:50:34 +0000 (20:50 +0000)]
Merge "Only show emergency app preference if enabled" into mnc-dev

9 years agoHide search from everywhere but the dashboard
Jason Monk [Tue, 2 Jun 2015 20:46:34 +0000 (16:46 -0400)]
Hide search from everywhere but the dashboard

Because it is too confusing what it does/doesn't search.

Bug: 21556767
Change-Id: Ib162177ce3eea816344d8d0fd5d71f85bfc94183

9 years agoChange DeviceProfilesSettings to DialogFragment
Jason Monk [Tue, 2 Jun 2015 18:05:55 +0000 (14:05 -0400)]
Change DeviceProfilesSettings to DialogFragment

This makes the lifecycle simpler to fix a crash after rotation.
Also do some adjusting of alignment while here.

Bug: 21444336
Bug: 21205689
Change-Id: I67eccf4833f53b5e5088ae5e6038d041e8653565

9 years agoam 1b7bff11: Merge "Fix battery usage screen issues" into mnc-dev
Jason Monk [Tue, 2 Jun 2015 20:22:17 +0000 (20:22 +0000)]
am 1b7bff11: Merge "Fix battery usage screen issues" into mnc-dev

* commit '1b7bff11af6eba5e16dc4ef37dd18d4360c0e03f':
  Fix battery usage screen issues

9 years agoMerge "Fix battery usage screen issues" into mnc-dev
Jason Monk [Tue, 2 Jun 2015 20:09:16 +0000 (20:09 +0000)]
Merge "Fix battery usage screen issues" into mnc-dev

9 years agoFix battery usage screen issues
Jason Monk [Tue, 2 Jun 2015 17:03:24 +0000 (13:03 -0400)]
Fix battery usage screen issues

Tint icons properly
Bug: 21077770

Show better icons for wifi and bt (remove the old ones)
Bug: 21172936

Also add a way to show fake items in power list for testing.

Change-Id: I6b6804673a68190ebc3f2ea32802e30811a7f5b2

9 years agoam 6a6ae2dc: Merge "Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth...
Sanket Padawe [Tue, 2 Jun 2015 18:22:48 +0000 (18:22 +0000)]
am 6a6ae2dc: Merge "Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings." into mnc-dev

* commit '6a6ae2dc8401eafdb1710c97c4b07aa53c797ba1':
  Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings.

9 years agoMerge "Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings...
Sanket Padawe [Tue, 2 Jun 2015 18:14:30 +0000 (18:14 +0000)]
Merge "Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings." into mnc-dev

9 years agoFix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings.
Sanket Padawe [Tue, 2 Jun 2015 18:13:01 +0000 (11:13 -0700)]
Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings.

Bug: 18048121
Change-Id: If837a58a4840be3d5b9f3cc16ecb261d9ab4420a

9 years agoam 4fe4d1e6: am 279c7ad7: Merge "Add announceForAccessibility to ConfirmLockPattern...
Xiyuan Xia [Tue, 2 Jun 2015 16:15:35 +0000 (16:15 +0000)]
am 4fe4d1e6: am 279c7ad7: Merge "Add announceForAccessibility to ConfirmLockPattern" into mnc-dev

* commit '4fe4d1e63e15051f887a8bba58302797c51b2c62':
  Add announceForAccessibility to ConfirmLockPattern

9 years agoam 32096856: am 81ae7913: Merge "Clear connected legacy VPN during rescan" into mnc-dev
Robin Lee [Tue, 2 Jun 2015 16:15:34 +0000 (16:15 +0000)]
am 32096856: am 81ae7913: Merge "Clear connected legacy VPN during rescan" into mnc-dev

* commit '320968561d6c8d4b4ec1797ff4a2028713b8cc8e':
  Clear connected legacy VPN during rescan

9 years agoam 279c7ad7: Merge "Add announceForAccessibility to ConfirmLockPattern" into mnc-dev
Xiyuan Xia [Tue, 2 Jun 2015 15:50:28 +0000 (15:50 +0000)]
am 279c7ad7: Merge "Add announceForAccessibility to ConfirmLockPattern" into mnc-dev

* commit '279c7ad7f02d466ac0959dcd90cbd4102afff4fb':
  Add announceForAccessibility to ConfirmLockPattern

9 years agoam 81ae7913: Merge "Clear connected legacy VPN during rescan" into mnc-dev
Robin Lee [Tue, 2 Jun 2015 15:50:27 +0000 (15:50 +0000)]
am 81ae7913: Merge "Clear connected legacy VPN during rescan" into mnc-dev

* commit '81ae79132f022fe93be24aa419ad1dd28ba86fd7':
  Clear connected legacy VPN during rescan

9 years agoMerge "Add announceForAccessibility to ConfirmLockPattern" into mnc-dev
Xiyuan Xia [Tue, 2 Jun 2015 15:45:17 +0000 (15:45 +0000)]
Merge "Add announceForAccessibility to ConfirmLockPattern" into mnc-dev

9 years agoMerge "Clear connected legacy VPN during rescan" into mnc-dev
Robin Lee [Tue, 2 Jun 2015 15:37:19 +0000 (15:37 +0000)]
Merge "Clear connected legacy VPN during rescan" into mnc-dev