OSDN Git Service

android-x86/packages-apps-Settings.git
10 years agoam fbda0b3a: am 320dc051: Merge "Add extra to home settings starting intent." into...
Sander Alewijnse [Tue, 26 Aug 2014 17:14:15 +0000 (17:14 +0000)]
am fbda0b3a: am 320dc051: Merge "Add extra to home settings starting intent." into lmp-dev

* commit 'fbda0b3a81fe35060bbcd9ec121af08d935c07e8':
  Add extra to home settings starting intent.

10 years agoam 320dc051: Merge "Add extra to home settings starting intent." into lmp-dev
Sander Alewijnse [Tue, 26 Aug 2014 17:07:18 +0000 (17:07 +0000)]
am 320dc051: Merge "Add extra to home settings starting intent." into lmp-dev

* commit '320dc05125c0db44c1182c4f5568bef440f643c8':
  Add extra to home settings starting intent.

10 years agoMerge "Add extra to home settings starting intent." into lmp-dev
Sander Alewijnse [Tue, 26 Aug 2014 16:59:23 +0000 (16:59 +0000)]
Merge "Add extra to home settings starting intent." into lmp-dev

10 years agoam ea7c8dcb: am c61aabfa: Merge "Update material colors" into lmp-dev
Alan Viverette [Tue, 26 Aug 2014 04:56:08 +0000 (04:56 +0000)]
am ea7c8dcb: am c61aabfa: Merge "Update material colors" into lmp-dev

* commit 'ea7c8dcbdaa7f32d6741125c6701a0a1824a0567':
  Update material colors

10 years agoam 19bcfd6e: am e352845e: Merge "Fix toggle button clickability in app restrictions...
Amith Yamasani [Tue, 26 Aug 2014 04:56:07 +0000 (04:56 +0000)]
am 19bcfd6e: am e352845e: Merge "Fix toggle button clickability in app restrictions" into lmp-dev

* commit '19bcfd6e4380d63521daf74d5bf81a2f849ace40':
  Fix toggle button clickability in app restrictions

10 years agoam 64e68657: am a1ca4ed1: Merge "API Review PhoneManager -> TelecommManager. Rename...
Nancy Chen [Tue, 26 Aug 2014 04:55:35 +0000 (04:55 +0000)]
am 64e68657: am a1ca4ed1: Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev

* commit '64e686570c6f71bae6d2bec0c1b72f7732e48a7b':
  API Review PhoneManager -> TelecommManager. Rename methods (3/6)

10 years agoam ef0a4938: am ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev
Paul Lawrence [Tue, 26 Aug 2014 04:54:05 +0000 (04:54 +0000)]
am ef0a4938: am ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev

* commit 'ef0a4938a01f4d553d7513df33fa097c56543b7e':
  Honor hide pattern on crypto screen

10 years agoam c61aabfa: Merge "Update material colors" into lmp-dev
Alan Viverette [Mon, 25 Aug 2014 23:29:01 +0000 (23:29 +0000)]
am c61aabfa: Merge "Update material colors" into lmp-dev

* commit 'c61aabfa22e972a5173d2edc2aa5fd77fb37bdf9':
  Update material colors

10 years agoam e352845e: Merge "Fix toggle button clickability in app restrictions" into lmp-dev
Amith Yamasani [Mon, 25 Aug 2014 23:29:00 +0000 (23:29 +0000)]
am e352845e: Merge "Fix toggle button clickability in app restrictions" into lmp-dev

* commit 'e352845ecad452823bb2c3ba1b0eb1abf2e9a442':
  Fix toggle button clickability in app restrictions

10 years agoMerge "Update material colors" into lmp-dev
Alan Viverette [Mon, 25 Aug 2014 23:18:33 +0000 (23:18 +0000)]
Merge "Update material colors" into lmp-dev

10 years agoMerge "Fix toggle button clickability in app restrictions" into lmp-dev
Amith Yamasani [Mon, 25 Aug 2014 22:51:09 +0000 (22:51 +0000)]
Merge "Fix toggle button clickability in app restrictions" into lmp-dev

10 years agoUpdate material colors
Alan Viverette [Mon, 25 Aug 2014 23:05:50 +0000 (16:05 -0700)]
Update material colors

BUG: 17212898
Change-Id: Idb1c391de3c1fb150f06c3cf744780be1404d2e5

10 years agoam a1ca4ed1: Merge "API Review PhoneManager -> TelecommManager. Rename methods (3...
Nancy Chen [Mon, 25 Aug 2014 22:47:23 +0000 (22:47 +0000)]
am a1ca4ed1: Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev

* commit 'a1ca4ed14d12cd3daa8bb5db5527676ca78c1850':
  API Review PhoneManager -> TelecommManager. Rename methods (3/6)

10 years agoMerge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev
Nancy Chen [Mon, 25 Aug 2014 22:24:14 +0000 (22:24 +0000)]
Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev

10 years agoFix toggle button clickability in app restrictions
Amith Yamasani [Mon, 25 Aug 2014 22:20:34 +0000 (15:20 -0700)]
Fix toggle button clickability in app restrictions

Also fix side padding

Bug: 17159406
Change-Id: Ic1d61d9a4a7ae6f3f7c451405a6e127791edbdaf

10 years agoam ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev
Paul Lawrence [Mon, 25 Aug 2014 22:09:41 +0000 (22:09 +0000)]
am ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev

* commit 'ee2a85c7c8a91db3067d9908b4b04d329a40ba71':
  Honor hide pattern on crypto screen

10 years agoMerge "Honor hide pattern on crypto screen" into lmp-dev
Paul Lawrence [Mon, 25 Aug 2014 21:59:26 +0000 (21:59 +0000)]
Merge "Honor hide pattern on crypto screen" into lmp-dev

10 years agoam 87d8074a: am aa5c7565: Merge "Updated Tethering and portable hotspot to use switch...
PauloftheWest [Mon, 25 Aug 2014 17:04:47 +0000 (17:04 +0000)]
am 87d8074a: am aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev

* commit '87d8074a1480d10804ada3507c5536be362b77c1':
  Updated Tethering and portable hotspot to use switches.

10 years agoam aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into...
PauloftheWest [Mon, 25 Aug 2014 16:55:21 +0000 (16:55 +0000)]
am aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev

* commit 'aa5c7565e42efdfa5ae5506a0a9dfd4f05461034':
  Updated Tethering and portable hotspot to use switches.

10 years agoam d9960178: (-s ours) am cef6b220: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 25 Aug 2014 16:51:07 +0000 (16:51 +0000)]
am d9960178: (-s ours) am cef6b220: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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

10 years agoMerge "Updated Tethering and portable hotspot to use switches." into lmp-dev
PauloftheWest [Mon, 25 Aug 2014 16:44:25 +0000 (16:44 +0000)]
Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev

10 years agoam cef6b220: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Mon, 25 Aug 2014 16:32:55 +0000 (16:32 +0000)]
am cef6b220: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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

10 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Mon, 25 Aug 2014 16:21:03 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

10 years agoam 1c649f7f: am 7560e22d: Merge "Tapping a connected Bluetooth device now presents...
PauloftheWest [Mon, 25 Aug 2014 16:12:08 +0000 (16:12 +0000)]
am 1c649f7f: am 7560e22d: Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev

* commit '1c649f7f9b9d85861c57d4d898b5fbe0e989d8b3':
  Tapping a connected Bluetooth device now presents its settings dialog.

10 years agoam 7560e22d: Merge "Tapping a connected Bluetooth device now presents its settings...
PauloftheWest [Mon, 25 Aug 2014 15:58:29 +0000 (15:58 +0000)]
am 7560e22d: Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev

* commit '7560e22d7602250172f6e6ca16fdea0063348d15':
  Tapping a connected Bluetooth device now presents its settings dialog.

10 years agoMerge "Tapping a connected Bluetooth device now presents its settings dialog." into...
PauloftheWest [Mon, 25 Aug 2014 15:48:15 +0000 (15:48 +0000)]
Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev

10 years agoUpdated Tethering and portable hotspot to use switches.
PauloftheWest [Sun, 24 Aug 2014 18:59:35 +0000 (11:59 -0700)]
Updated Tethering and portable hotspot to use switches.

Bug: 17020102
Change-Id: I5da1745d4ea9545f8960c015ca6858fb0a34de0d

10 years agoTapping a connected Bluetooth device now presents its settings dialog.
PauloftheWest [Sun, 24 Aug 2014 21:04:18 +0000 (14:04 -0700)]
Tapping a connected Bluetooth device now presents its settings dialog.

Bug: 14184769
Change-Id: I1de3110dd7460e0329dbe6df99abf3451d3041cc

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 24 Aug 2014 20:07:11 +0000 (13:07 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam b1391d84: am c436b159: Merge "Tweak voice settings strings." into lmp-dev
Dianne Hackborn [Sun, 24 Aug 2014 19:09:24 +0000 (19:09 +0000)]
am b1391d84: am c436b159: Merge "Tweak voice settings strings." into lmp-dev

* commit 'b1391d84fe181e64f486cd176d58d835b0fe6a5e':
  Tweak voice settings strings.

10 years agoam c436b159: Merge "Tweak voice settings strings." into lmp-dev
Dianne Hackborn [Sun, 24 Aug 2014 18:59:46 +0000 (18:59 +0000)]
am c436b159: Merge "Tweak voice settings strings." into lmp-dev

* commit 'c436b159534240c64281447860a81e519bf7c07d':
  Tweak voice settings strings.

10 years agoMerge "Tweak voice settings strings." into lmp-dev
Dianne Hackborn [Sun, 24 Aug 2014 18:53:16 +0000 (18:53 +0000)]
Merge "Tweak voice settings strings." into lmp-dev

10 years agoTweak voice settings strings.
Dianne Hackborn [Sat, 23 Aug 2014 21:11:12 +0000 (14:11 -0700)]
Tweak voice settings strings.

Change-Id: I4cb6badaf2d013d43d87bc8ecdc0763c4e5d6b50

10 years agoam 77287101: am 8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into...
Amith Yamasani [Sat, 23 Aug 2014 06:19:09 +0000 (06:19 +0000)]
am 77287101: am 8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into lmp-dev

* commit '7728710183de887be3bb68c4f95509659a950428':
  Don't index the ChooseLockGeneric screen

10 years agoam fc24d0a7: am 8e6edba5: Merge "Restore legacy VPN stats dialog." into lmp-dev
Jeff Davidson [Sat, 23 Aug 2014 02:49:04 +0000 (02:49 +0000)]
am fc24d0a7: am 8e6edba5: Merge "Restore legacy VPN stats dialog." into lmp-dev

* commit 'fc24d0a78071f6e441f236ab69be6642f650f253':
  Restore legacy VPN stats dialog.

10 years agoam 8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into lmp-dev
Amith Yamasani [Sat, 23 Aug 2014 01:21:51 +0000 (01:21 +0000)]
am 8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into lmp-dev

* commit '8fe710682ad3f5a5ac0ed1393f3d934bea122bc5':
  Don't index the ChooseLockGeneric screen

10 years agoam 8e6edba5: Merge "Restore legacy VPN stats dialog." into lmp-dev
Jeff Davidson [Sat, 23 Aug 2014 01:12:46 +0000 (01:12 +0000)]
am 8e6edba5: Merge "Restore legacy VPN stats dialog." into lmp-dev

* commit '8e6edba5606fd717a631aabcc4c5702bdd509033':
  Restore legacy VPN stats dialog.

10 years agoMerge "Don't index the ChooseLockGeneric screen" into lmp-dev
Amith Yamasani [Sat, 23 Aug 2014 01:07:02 +0000 (01:07 +0000)]
Merge "Don't index the ChooseLockGeneric screen" into lmp-dev

10 years agoMerge "Restore legacy VPN stats dialog." into lmp-dev
Jeff Davidson [Sat, 23 Aug 2014 00:55:38 +0000 (00:55 +0000)]
Merge "Restore legacy VPN stats dialog." into lmp-dev

10 years agoam 86e9f7cd: am 1351b0fb: Merge "Show trust agent entries as disabled rather than...
Jim Miller [Fri, 22 Aug 2014 22:44:56 +0000 (22:44 +0000)]
am 86e9f7cd: am 1351b0fb: Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev

* commit '86e9f7cd668441dff2a35b046a99ebe8fd0548d9':
  Show trust agent entries as disabled rather than removing them.

10 years agoDon't index the ChooseLockGeneric screen
Amith Yamasani [Fri, 22 Aug 2014 22:38:16 +0000 (15:38 -0700)]
Don't index the ChooseLockGeneric screen

This avoids indexing face unlock, which may not always exist or might
be disabled by policy.

Instead, add some of the relevant keywords up one level in Security
settings.

Bug: 17185326
Change-Id: I4fbae1c0384a97383707104a6fe283075edbf341

10 years agoam 1351b0fb: Merge "Show trust agent entries as disabled rather than removing them...
Jim Miller [Fri, 22 Aug 2014 22:34:45 +0000 (22:34 +0000)]
am 1351b0fb: Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev

* commit '1351b0fbcddea9cc66941e8af1de148142b92201':
  Show trust agent entries as disabled rather than removing them.

10 years agoMerge "Show trust agent entries as disabled rather than removing them." into lmp-dev
Jim Miller [Fri, 22 Aug 2014 22:25:15 +0000 (22:25 +0000)]
Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev

10 years agoAPI Review PhoneManager -> TelecommManager. Rename methods (3/6)
Nancy Chen [Fri, 22 Aug 2014 05:53:05 +0000 (22:53 -0700)]
API Review PhoneManager -> TelecommManager. Rename methods (3/6)

PhoneManager
- handlePinMMI docs should explain what a Pin is and what MMI is
- rename isInAPhoneCall to isInCall
- rename showCallScreen to showInCallScreen
- merge this class into TelecommManager, we don't need both

Bug: 16960458

Change-Id: I8285f15747b66fdfad93d203d848d4a62c0f9b2a

10 years agoam 21fc35c1: am d5ee3bc8: Merge "Settings psuedolocalization fixes." into lmp-dev
Elliott Hughes [Fri, 22 Aug 2014 20:57:16 +0000 (20:57 +0000)]
am 21fc35c1: am d5ee3bc8: Merge "Settings psuedolocalization fixes." into lmp-dev

* commit '21fc35c128b126a9052c6dca3fbd61d121d646dc':
  Settings psuedolocalization fixes.

10 years agoam d5ee3bc8: Merge "Settings psuedolocalization fixes." into lmp-dev
Elliott Hughes [Fri, 22 Aug 2014 20:51:00 +0000 (20:51 +0000)]
am d5ee3bc8: Merge "Settings psuedolocalization fixes." into lmp-dev

* commit 'd5ee3bc858f2e3c7e4dee6887c982c768c355c7a':
  Settings psuedolocalization fixes.

10 years agoMerge "Settings psuedolocalization fixes." into lmp-dev
Elliott Hughes [Fri, 22 Aug 2014 20:42:37 +0000 (20:42 +0000)]
Merge "Settings psuedolocalization fixes." into lmp-dev

10 years agoRestore legacy VPN stats dialog.
Jeff Davidson [Fri, 22 Aug 2014 20:12:01 +0000 (13:12 -0700)]
Restore legacy VPN stats dialog.

Was originally removed in ag/522961, but restoring to keep legacy VPN
behavior the same from within VpnSettings. This dialog is only
accesible from VpnSettings and so should only ever be shown for legacy
VPNs.

Bug: 17164793
Change-Id: I06c4e136e1023b8f84edfd15a15264d2e41d325b

10 years agoam cf4e004e: am 8802ccf8: Merge "Switch user on clicking on a user in User Settings...
Amith Yamasani [Fri, 22 Aug 2014 19:46:53 +0000 (19:46 +0000)]
am cf4e004e: am 8802ccf8: Merge "Switch user on clicking on a user in User Settings" into lmp-dev

* commit 'cf4e004e7dda4bace3ffba1ed6fb53f49c23df06':
  Switch user on clicking on a user in User Settings

10 years agoam 8802ccf8: Merge "Switch user on clicking on a user in User Settings" into lmp-dev
Amith Yamasani [Fri, 22 Aug 2014 19:41:59 +0000 (19:41 +0000)]
am 8802ccf8: Merge "Switch user on clicking on a user in User Settings" into lmp-dev

* commit '8802ccf853b86ba56816ddd06346812b61e58220':
  Switch user on clicking on a user in User Settings

10 years agoMerge "Switch user on clicking on a user in User Settings" into lmp-dev
Amith Yamasani [Fri, 22 Aug 2014 19:37:09 +0000 (19:37 +0000)]
Merge "Switch user on clicking on a user in User Settings" into lmp-dev

10 years agoSwitch user on clicking on a user in User Settings
Amith Yamasani [Fri, 22 Aug 2014 19:33:23 +0000 (12:33 -0700)]
Switch user on clicking on a user in User Settings

This slipped out of the code somehow.

Bug: 15761405
Change-Id: I89c47221f999d5ef23aa7910d31a95bfa730353c

10 years agoSettings psuedolocalization fixes.
Elliott Hughes [Fri, 22 Aug 2014 19:06:23 +0000 (12:06 -0700)]
Settings psuedolocalization fixes.

We don't need -c zz_ZZ any more, and LocalePicker now checks
the global developer options settings itself.

Also remove some dead code now zz_ZY and zz_ZZ are gone.

Bug: 17190407
Change-Id: I27f9f5bc8b27457004e7e4996ec76b76a17523eb

10 years agoam 79ace565: (-s ours) am 3723625f: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Fri, 22 Aug 2014 17:49:55 +0000 (17:49 +0000)]
am 79ace565: (-s ours) am 3723625f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '79ace565651e2b220ca60de0f6bcf39d4e4263fd':
  Import translations. DO NOT MERGE

10 years agoam 3723625f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Fri, 22 Aug 2014 17:32:04 +0000 (17:32 +0000)]
am 3723625f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '3723625fecf9d1402e4d1747d9342ed12235184e':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Fri, 22 Aug 2014 17:24:31 +0000 (17:24 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

10 years agoam 1da99d2b: am 2e9e044e: Final tweaks to work profile strings
Jessica Hummel [Fri, 22 Aug 2014 14:54:27 +0000 (14:54 +0000)]
am 1da99d2b: am 2e9e044e: Final tweaks to work profile strings

* commit '1da99d2b45f76422b4ca2ab47fa77e32d249dec4':
  Final tweaks to work profile strings

10 years agoam 2e9e044e: Final tweaks to work profile strings
Jessica Hummel [Fri, 22 Aug 2014 14:42:05 +0000 (14:42 +0000)]
am 2e9e044e: Final tweaks to work profile strings

* commit '2e9e044ed2c3dbbcd7ce01d2c8b6e00f452cf31b':
  Final tweaks to work profile strings

10 years agoFinal tweaks to work profile strings
Jessica Hummel [Fri, 22 Aug 2014 10:28:51 +0000 (11:28 +0100)]
Final tweaks to work profile strings

Change-Id: Icd8f3ac2e8e3fb7f0368cdf40bcd42b4f275258b
bug:15744182

10 years agoam 70a7c59d: am 9239d6d0: Merge "Update strings for removing work profile" into lmp-dev
Alexandra Gherghina [Fri, 22 Aug 2014 13:12:02 +0000 (13:12 +0000)]
am 70a7c59d: am 9239d6d0: Merge "Update strings for removing work profile" into lmp-dev

* commit '70a7c59daaac5b7bf06191443ebb81fe65f06054':
  Update strings for removing work profile

10 years agoam dfe2f709: am 9c4d5dd8: Merge "Modify Spinner so that the arrow is closer to the...
Alexandra Gherghina [Fri, 22 Aug 2014 13:12:01 +0000 (13:12 +0000)]
am dfe2f709: am 9c4d5dd8: Merge "Modify Spinner so that the arrow is closer to the text" into lmp-dev

* commit 'dfe2f709c631bf2e819c3f87084948917e920eed':
  Modify Spinner so that the arrow is closer to the text

10 years agoam 9239d6d0: Merge "Update strings for removing work profile" into lmp-dev
Alexandra Gherghina [Fri, 22 Aug 2014 13:01:59 +0000 (13:01 +0000)]
am 9239d6d0: Merge "Update strings for removing work profile" into lmp-dev

* commit '9239d6d0a2fd01170b6188a6b92bd716ca962c65':
  Update strings for removing work profile

10 years agoam 9c4d5dd8: Merge "Modify Spinner so that the arrow is closer to the text" into...
Alexandra Gherghina [Fri, 22 Aug 2014 13:01:58 +0000 (13:01 +0000)]
am 9c4d5dd8: Merge "Modify Spinner so that the arrow is closer to the text" into lmp-dev

* commit '9c4d5dd86b250dbb0ce9fe5dc9339a7fd7798981':
  Modify Spinner so that the arrow is closer to the text

10 years agoMerge "Update strings for removing work profile" into lmp-dev
Alexandra Gherghina [Fri, 22 Aug 2014 12:53:28 +0000 (12:53 +0000)]
Merge "Update strings for removing work profile" into lmp-dev

10 years agoMerge "Modify Spinner so that the arrow is closer to the text" into lmp-dev
Alexandra Gherghina [Fri, 22 Aug 2014 12:53:18 +0000 (12:53 +0000)]
Merge "Modify Spinner so that the arrow is closer to the text" into lmp-dev

10 years agoUpdate strings for removing work profile
Alexandra Gherghina [Fri, 22 Aug 2014 10:17:29 +0000 (11:17 +0100)]
Update strings for removing work profile

Bug: 17139301
Change-Id: I524946ab7856b10ed68a2e90c7f488d20731b169

10 years agoam 103c3314: am 8be27595: Merge "[WifiSetup] Tablet portrait layout" into lmp-dev
Maurice Lam [Fri, 22 Aug 2014 03:00:08 +0000 (03:00 +0000)]
am 103c3314: am 8be27595: Merge "[WifiSetup] Tablet portrait layout" into lmp-dev

* commit '103c33145c7aa4c784b9e4318e16db8e2aa803bf':
  [WifiSetup] Tablet portrait layout

10 years agoShow trust agent entries as disabled rather than removing them.
Jim Miller [Fri, 22 Aug 2014 02:24:47 +0000 (19:24 -0700)]
Show trust agent entries as disabled rather than removing them.

Fixes bug 17108810

Change-Id: I646f5c299cd680d5c3a4978610f3852eba4b116b

10 years agoam 8be27595: Merge "[WifiSetup] Tablet portrait layout" into lmp-dev
Maurice Lam [Fri, 22 Aug 2014 01:34:31 +0000 (01:34 +0000)]
am 8be27595: Merge "[WifiSetup] Tablet portrait layout" into lmp-dev

* commit '8be27595766a632da8ef78a0a8eaa8dc041232d8':
  [WifiSetup] Tablet portrait layout

10 years agoMerge "[WifiSetup] Tablet portrait layout" into lmp-dev
Maurice Lam [Fri, 22 Aug 2014 01:22:24 +0000 (01:22 +0000)]
Merge "[WifiSetup] Tablet portrait layout" into lmp-dev

10 years agoHonor hide pattern on crypto screen
Paul Lawrence [Wed, 20 Aug 2014 14:43:32 +0000 (07:43 -0700)]
Honor hide pattern on crypto screen

Also clear pattern a little more quickly, and show owner info
even from before encrypting (since we're fixing pattern visible,
we should fix owner info too in the same way)

Bug: 17059314

Change-Id: Ie9ccd4a892a1dec32ebe60567d3b72dd6fe25060

10 years agoam 8cf1ec35: am 2534be37: Merge "Fix layout of Apn Settings screen" into lmp-dev
Amith Yamasani [Thu, 21 Aug 2014 21:13:16 +0000 (21:13 +0000)]
am 8cf1ec35: am 2534be37: Merge "Fix layout of Apn Settings screen" into lmp-dev

* commit '8cf1ec351f9d1c666219878f2f753fc738e44bc2':
  Fix layout of Apn Settings screen

10 years agoam 2534be37: Merge "Fix layout of Apn Settings screen" into lmp-dev
Amith Yamasani [Thu, 21 Aug 2014 21:03:27 +0000 (21:03 +0000)]
am 2534be37: Merge "Fix layout of Apn Settings screen" into lmp-dev

* commit '2534be37462f9ab5c98ca07758d71f98019eddf4':
  Fix layout of Apn Settings screen

10 years agoMerge "Fix layout of Apn Settings screen" into lmp-dev
Amith Yamasani [Thu, 21 Aug 2014 20:51:44 +0000 (20:51 +0000)]
Merge "Fix layout of Apn Settings screen" into lmp-dev

10 years agoFix layout of Apn Settings screen
Amith Yamasani [Thu, 21 Aug 2014 20:30:35 +0000 (13:30 -0700)]
Fix layout of Apn Settings screen

Bug: 14081992
Change-Id: I64c458e1585d469434efafd942876f64508723a1

10 years agoam 100d45ec: am 66b0d9e8: Merge "Disable non-permitted accessibility services and...
Kenny Guy [Thu, 21 Aug 2014 18:05:51 +0000 (18:05 +0000)]
am 100d45ec: am 66b0d9e8: Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev

* commit '100d45ec09da85055c7f5e2019c5aba54e986f37':
  Disable non-permitted accessibility services and IMEs

10 years agoam 66b0d9e8: Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev
Kenny Guy [Thu, 21 Aug 2014 17:57:32 +0000 (17:57 +0000)]
am 66b0d9e8: Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev

* commit '66b0d9e809a67689daf9b060e5464b4cc196169f':
  Disable non-permitted accessibility services and IMEs

10 years agoMerge "Disable non-permitted accessibility services and IMEs" into lmp-dev
Kenny Guy [Thu, 21 Aug 2014 17:44:24 +0000 (17:44 +0000)]
Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev

10 years agoam ab3da46a: am dbfd04d8: Merge "Change CARRIER_SETUP hook in WirelessSettings to...
Diego Pontoriero [Thu, 21 Aug 2014 16:52:19 +0000 (16:52 +0000)]
am ab3da46a: am dbfd04d8: Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC." into lmp-dev

* commit 'ab3da46ac1ee1ec3bdfe0d58b510095f9626b1b5':
  Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC.

10 years agoam e0a0fa7c: am 98f61b71: Merge "Fixed a crash when sharing video through Bluetooth...
PauloftheWest [Thu, 21 Aug 2014 16:41:58 +0000 (16:41 +0000)]
am e0a0fa7c: am 98f61b71: Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev

* commit 'e0a0fa7cec8a91a15c72468f6fa42bbe67a31493':
  Fixed a crash when sharing video through Bluetooth.

10 years agoam dbfd04d8: Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell...
Diego Pontoriero [Thu, 21 Aug 2014 16:41:56 +0000 (16:41 +0000)]
am dbfd04d8: Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC." into lmp-dev

* commit 'dbfd04d80abb4bb605ebd517d52137108cc24d6d':
  Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC.

10 years agoMerge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining...
Diego Pontoriero [Thu, 21 Aug 2014 16:34:37 +0000 (16:34 +0000)]
Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC." into lmp-dev

10 years agoam 98f61b71: Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev
PauloftheWest [Thu, 21 Aug 2014 16:31:05 +0000 (16:31 +0000)]
am 98f61b71: Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev

* commit '98f61b71ac182d87256ea21e770b57c1168d1472':
  Fixed a crash when sharing video through Bluetooth.

10 years agoMerge "Fixed a crash when sharing video through Bluetooth." into lmp-dev
PauloftheWest [Thu, 21 Aug 2014 16:24:10 +0000 (16:24 +0000)]
Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev

10 years agoDisable non-permitted accessibility services and IMEs
Kenny Guy [Thu, 21 Aug 2014 12:20:21 +0000 (13:20 +0100)]
Disable non-permitted accessibility services and IMEs

Bug: 14469005
Change-Id: I4986f035318854c27ecb92bbe2f0c977d53b6361

10 years agoFixed a crash when sharing video through Bluetooth.
PauloftheWest [Wed, 20 Aug 2014 22:10:56 +0000 (15:10 -0700)]
Fixed a crash when sharing video through Bluetooth.

+ Fixed an issue where Settings would crash when the user tries to share a
youtube video through Bluetooth and rotates the screen.

Bug: 17023413
Change-Id: Ied284da736cf9bfc7424982a516c8305c700dd0b

10 years agoam 500510ad: am 10673f1a: Merge "rename ScanResult.status -> autoJoinStatus" into...
vandwalle [Thu, 21 Aug 2014 15:11:21 +0000 (15:11 +0000)]
am 500510ad: am 10673f1a: Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev

* commit '500510ad5c6cf60b078c61fc7831c31bd5e521be':
  rename ScanResult.status -> autoJoinStatus

10 years agoam 10673f1a: Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev
vandwalle [Thu, 21 Aug 2014 15:02:24 +0000 (15:02 +0000)]
am 10673f1a: Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev

* commit '10673f1a1e330cf20ddab04fbc09cce3f18d111d':
  rename ScanResult.status -> autoJoinStatus

10 years agoMerge "rename ScanResult.status -> autoJoinStatus" into lmp-dev
vandwalle [Thu, 21 Aug 2014 14:55:45 +0000 (14:55 +0000)]
Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev

10 years agoModify Spinner so that the arrow is closer to the text
Alexandra Gherghina [Thu, 21 Aug 2014 11:35:31 +0000 (12:35 +0100)]
Modify Spinner so that the arrow is closer to the text

Bug: 17137945
Change-Id: I0769b030669a7a57e0be1c03f987bcd1e0f774ca

10 years agoam a477e891: am ff2da2cd: Merge "Make string for work profile consistent with provisi...
Jessica Hummel [Thu, 21 Aug 2014 11:44:48 +0000 (11:44 +0000)]
am a477e891: am ff2da2cd: Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev

* commit 'a477e8910c948ce53b9069e214e51b2a38d69d2f':
  Make string for work profile consistent with provisioning and framework strings.

10 years agoam ff2da2cd: Merge "Make string for work profile consistent with provisioning and...
Jessica Hummel [Thu, 21 Aug 2014 11:35:04 +0000 (11:35 +0000)]
am ff2da2cd: Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev

* commit 'ff2da2cdb332be35bc94e3e66a10d55fe7bb0105':
  Make string for work profile consistent with provisioning and framework strings.

10 years agoMerge "Make string for work profile consistent with provisioning and framework string...
Jessica Hummel [Thu, 21 Aug 2014 11:28:23 +0000 (11:28 +0000)]
Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev

10 years agoam d925c995: am fe3794a9: Remove "Choose Keyboards" settings
Tadashi G. Takaoka [Thu, 21 Aug 2014 04:26:38 +0000 (04:26 +0000)]
am d925c995: am fe3794a9: Remove "Choose Keyboards" settings

* commit 'd925c9952dad2302d30b91ddb1dbe0fedd756f7e':
  Remove "Choose Keyboards" settings

10 years agoam fe3794a9: Remove "Choose Keyboards" settings
Tadashi G. Takaoka [Thu, 21 Aug 2014 04:15:26 +0000 (04:15 +0000)]
am fe3794a9: Remove "Choose Keyboards" settings

* commit 'fe3794a9372d643afe8cd6d8e70ec4f9e1b47a48':
  Remove "Choose Keyboards" settings

10 years ago[WifiSetup] Tablet portrait layout
Maurice Lam [Thu, 21 Aug 2014 03:34:07 +0000 (20:34 -0700)]
[WifiSetup] Tablet portrait layout

Bug: 17134016
Change-Id: I376797ceeeb467af52f6e0a2e45ad6e2523c7b26

10 years agoam b5566ca7: am 8a983e43: Merge "Suppress WiFi Assistant card until future platform...
Jeff Davidson [Thu, 21 Aug 2014 03:06:21 +0000 (03:06 +0000)]
am b5566ca7: am 8a983e43: Merge "Suppress WiFi Assistant card until future platform updates." into lmp-dev

* commit 'b5566ca7a9b8c099cc71aedbbb2719dc35c23852':
  Suppress WiFi Assistant card until future platform updates.

10 years agoam a5db8ba5: am 4e064343: Merge "Less intrusive VPN dialog." into lmp-dev
Jeff Davidson [Thu, 21 Aug 2014 03:02:10 +0000 (03:02 +0000)]
am a5db8ba5: am 4e064343: Merge "Less intrusive VPN dialog." into lmp-dev

* commit 'a5db8ba5afd669de607cc7db2578927476aed12a':
  Less intrusive VPN dialog.

10 years agoam 8f60bf4c: am e847e7ef: Merge "Added a default Bluetooth icon for Bluetooth Prefere...
PauloftheWest [Thu, 21 Aug 2014 02:56:27 +0000 (02:56 +0000)]
am 8f60bf4c: am e847e7ef: Merge "Added a default Bluetooth icon for Bluetooth Preferences." into lmp-dev

* commit '8f60bf4cadc7381deeb553150a1705b3b31e116b':
  Added a default Bluetooth icon for Bluetooth Preferences.

10 years agoam 98d0f8ca: am d251fba2: Merge "Fixed a Bluetooth Scanning issue." into lmp-dev
PauloftheWest [Thu, 21 Aug 2014 02:48:15 +0000 (02:48 +0000)]
am 98d0f8ca: am d251fba2: Merge "Fixed a Bluetooth Scanning issue." into lmp-dev

* commit '98d0f8ca2d38ba9cc6fd14eee728abed41431038':
  Fixed a Bluetooth Scanning issue.