PauloftheWest
b358f6d0f2
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
2014-08-21 08:18:30 -07:00
vandwalle
500510ad5c
am 10673f1a
: Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev
...
* commit '10673f1a1e330cf20ddab04fbc09cce3f18d111d':
rename ScanResult.status -> autoJoinStatus
2014-08-21 15:02:24 +00:00
vandwalle
10673f1a1e
Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev
2014-08-21 14:55:45 +00:00
Alexandra Gherghina
75783290b6
Modify Spinner so that the arrow is closer to the text
...
Bug: 17137945
Change-Id: I0769b030669a7a57e0be1c03f987bcd1e0f774ca
2014-08-21 12:44:55 +01:00
Jessica Hummel
a477e8910c
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.
2014-08-21 11:35:04 +00:00
Jessica Hummel
ff2da2cdb3
Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev
2014-08-21 11:28:24 +00:00
Tadashi G. Takaoka
d925c9952d
am fe3794a9
: Remove "Choose Keyboards" settings
...
* commit 'fe3794a9372d643afe8cd6d8e70ec4f9e1b47a48':
Remove "Choose Keyboards" settings
2014-08-21 04:15:26 +00:00
Maurice Lam
1677b3e3d4
[WifiSetup] Tablet portrait layout
...
Bug: 17134016
Change-Id: I376797ceeeb467af52f6e0a2e45ad6e2523c7b26
2014-08-20 20:36:03 -07:00
Tadashi G. Takaoka
fe3794a937
Remove "Choose Keyboards" settings
...
Bug: 17109233
Change-Id: Ia3860b12238d9d2233dc270e37a055a9a411b037
2014-08-21 11:41:57 +09:00
Jeff Davidson
b5566ca7a9
am 8a983e43
: Merge "Suppress WiFi Assistant card until future platform updates." into lmp-dev
...
* commit '8a983e438bbc0e851471b9d58f44778584a67075':
Suppress WiFi Assistant card until future platform updates.
2014-08-21 00:56:07 +00:00
Jeff Davidson
a5db8ba5af
am 4e064343
: Merge "Less intrusive VPN dialog." into lmp-dev
...
* commit '4e064343b35cfa6a7615e453c1f6bcf96397e414':
Less intrusive VPN dialog.
2014-08-21 00:09:47 +00:00
Diego Pontoriero
ff9f67dddd
Change CARRIER_SETUP hook in WirelessSettings to use aeroshell
...
for determining carrier app instead of MCC/MNC.
Related WirelessSettings change: http://ag/374330
Related Aeroshell change to SetupWizard: http://ag/520857
Bug: 16457806
Change-Id: I60277b27e9e205041eb3969a110a57da0fb62023
2014-08-20 16:44:46 -07:00
PauloftheWest
8f60bf4cad
am e847e7ef
: Merge "Added a default Bluetooth icon for Bluetooth Preferences." into lmp-dev
...
* commit 'e847e7ef56561bf7ac824d4e5aa742be08f92624':
Added a default Bluetooth icon for Bluetooth Preferences.
2014-08-20 22:10:17 +00:00
Jeff Davidson
4e064343b3
Merge "Less intrusive VPN dialog." into lmp-dev
2014-08-20 21:39:11 +00:00
PauloftheWest
e847e7ef56
Merge "Added a default Bluetooth icon for Bluetooth Preferences." into lmp-dev
2014-08-20 21:39:11 +00:00
PauloftheWest
5badff7622
Added a default Bluetooth icon for Bluetooth Preferences.
...
Bug: 17139683
Change-Id: I7b68950685732a85319a0dca7bd77234d345dbb7
2014-08-20 14:48:38 -07:00
PauloftheWest
98d0f8ca2d
am d251fba2
: Merge "Fixed a Bluetooth Scanning issue." into lmp-dev
...
* commit 'd251fba2fe308ea6aa18002c92506fca9d53848d':
Fixed a Bluetooth Scanning issue.
2014-08-20 21:17:34 +00:00
vandwalle
1dfdcdb470
rename ScanResult.status -> autoJoinStatus
...
This CL is dependent on Id9411c8097337b37ac1ce1a6ac8b28b4bda31ff3
Change-Id: Iec1a1e4718530f149051bd5de5235f0e0e4a438d
2014-08-20 21:11:18 +00:00
Amith Yamasani
6879169fe9
am 23d8742d
: Merge "Update string for profile owner addition warning" into lmp-dev
...
* commit '23d8742df6719f3f20545fc345b9f1cc74c6165a':
Update string for profile owner addition warning
2014-08-20 21:08:26 +00:00
PauloftheWest
27bd00ba27
Entering Bluetooth in Settings will always initiate a scan.
...
Bug: 17060518
Change-Id: I4ba13097f664b4a758ba714f423fa8b34af60ce6
2014-08-20 13:23:49 -07:00
Jeff Davidson
8a983e438b
Merge "Suppress WiFi Assistant card until future platform updates." into lmp-dev
2014-08-20 20:15:45 +00:00
PauloftheWest
0233d732eb
am 2dc11d40
: Merge "Fixed a Settings dialog crash." into lmp-dev
...
* commit '2dc11d40c205432774d4e4bc7ce56407b99eaa3a':
Fixed a Settings dialog crash.
2014-08-20 20:12:08 +00:00
John Spurlock
1bc2ff2b30
am dc79528b
: Merge "Settings: Remove needless dialogTitle attribute." into lmp-dev
...
* commit 'dc79528bf660b9e431141e93a8c1c378af337b7a':
Settings: Remove needless dialogTitle attribute.
2014-08-20 19:53:04 +00:00
Amith Yamasani
23d8742df6
Merge "Update string for profile owner addition warning" into lmp-dev
2014-08-20 18:43:12 +00:00
Amith Yamasani
2e4489d6c3
Update string for profile owner addition warning
...
Bug: 16207721
Change-Id: I561e0fc992f19339ab794dd7dffb9d650da141a0
2014-08-20 13:43:13 -07:00
Jon Miranda
b96f55f060
am 735219be
: Merge "Added a developer option to save attribute data." into lmp-dev
...
* commit '735219be8f85bd1ad41ab91834e5a427bb2ae7fc':
Added a developer option to save attribute data.
2014-08-20 15:30:30 +00:00
Jessica Hummel
fc8cf67df6
Make string for work profile consistent with provisioning and framework strings.
...
Change-Id: Id52937400a2664d25b40649767df5b6723886871
bug:16468412
2014-08-20 15:45:53 +01:00
Jeff Brown
2cd05f7123
am ff0e81eb
: Declare CAST_SETTINGS activity.
...
* commit 'ff0e81eb099dd7fe15c1d444e89a992b0f020a47':
Declare CAST_SETTINGS activity.
2014-08-20 03:19:32 +00:00
Jeff Brown
ff0e81eb09
Declare CAST_SETTINGS activity.
...
Currently this is the same as the WIFI_DISPLAY_SETTINGS activity
although we may eventually split them apart.
Change-Id: I4c4482792abc3d3d22fb50ee9657b536374a618f
2014-08-19 19:44:47 -07:00
Maurice Lam
8904061e66
am e62de59b
: Merge "[WifiSetup] Change illustration aspect ratio" into lmp-dev
...
* commit 'e62de59b947144ded046778b4f4ea0cc4bba12df':
[WifiSetup] Change illustration aspect ratio
2014-08-20 02:22:21 +00:00
Jon Miranda
735219be8f
Merge "Added a developer option to save attribute data." into lmp-dev
2014-08-20 01:43:56 +00:00
Maurice Lam
e62de59b94
Merge "[WifiSetup] Change illustration aspect ratio" into lmp-dev
2014-08-20 01:43:56 +00:00
Alan Viverette
86cd94a3ad
am aaa066b6
: Add "experimental" subtitle to color correction and inversion
...
* commit 'aaa066b66d4c8acf8931e624cf81376ac35d358e':
Add "experimental" subtitle to color correction and inversion
2014-08-20 00:47:11 +00:00
Alan Viverette
aaa066b66d
Add "experimental" subtitle to color correction and inversion
...
BUG: 17112912
Change-Id: I84eaa94e755bfcfbdf014fae09d1b02ae5d2eb4a
2014-08-19 17:37:16 -07:00
PauloftheWest
d251fba2fe
Merge "Fixed a Bluetooth Scanning issue." into lmp-dev
2014-08-19 22:53:25 +00:00
Paul Lawrence
17f213d781
am b7b686ca
: Merge "Fix encryption strings" into lmp-dev
...
* commit 'b7b686cadf6a07c74672d4e1c3aab30e7d24a545':
Fix encryption strings
2014-08-19 20:59:13 +00:00
Paul Lawrence
71894714c9
am d5a497b8
: Merge "Change decryption strings" into lmp-dev
...
* commit 'd5a497b8375444858fb17008a450d3bc26269d1c':
Change decryption strings
2014-08-19 20:59:12 +00:00
Maurice Lam
c73e339b3b
[WifiSetup] Change illustration aspect ratio
...
Change the aspect ratio of the illustration to 20:9 to align with UX
mocks.
Bug: 17111669
Change-Id: I37b2ca7624b7baf156830db53d2cea97a78e2dab
2014-08-19 13:20:27 -07:00
Lorenzo Colitti
d73fc0c8d0
am f1b786d8
: Stop using LinkProperties for static configuration.
...
* commit 'f1b786d8a8dc894904c5edc6e375da0e7ddb7ed4':
Stop using LinkProperties for static configuration.
2014-08-19 19:29:01 +00:00
Lorenzo Colitti
f1b786d8a8
Stop using LinkProperties for static configuration.
...
Bug: 16114392
Bug: 16893413
Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df
2014-08-19 11:59:44 -07:00
Julia Reynolds
51e8febf8c
am 7138ed74
: Merge "Supress menu if screen ought to be hidden." into lmp-dev
...
* commit '7138ed7404f22862ac7e2fdb29d71833dec9b1a3':
Supress menu if screen ought to be hidden.
2014-08-19 18:54:36 +00:00
Lifu Tang
6a86746f98
am 72bd4d25
: Merge "Dim the preference icons when its disabled" into lmp-dev
...
* commit '72bd4d252dc7a706b661f2970396dc0211d7b4de':
Dim the preference icons when its disabled
2014-08-19 17:32:13 +00:00
Sander Alewijnse
1ac37a4199
Add extra to home settings starting intent.
...
If intent contains a specific extra the picker will be
retricted to launchers that support managed profiles
no matter whether there are managed profiles present.
Bug:15099904
Change-Id: I31ab74afee7b5a790cb7aa621fff72f640fcedaf
2014-08-19 18:09:26 +01:00
Lifu Tang
72bd4d252d
Merge "Dim the preference icons when its disabled" into lmp-dev
2014-08-19 15:47:37 +00:00
Amith Yamasani
408943e9aa
am d05dd864
: Merge "Update strings for guest removal affordance and dialog" into lmp-dev
...
* commit 'd05dd864d6f26a1577cbcb25a43ddf9d3e638299':
Update strings for guest removal affordance and dialog
2014-08-19 15:43:40 +00:00
Lifu Tang
47cdb72762
am 081a9162
: Merge "Set switch to the correct enabling state" into lmp-dev
...
* commit '081a9162c959f9cbd0cbd76674501cdb47d516a7':
Set switch to the correct enabling state
2014-08-19 04:29:17 +00:00
PauloftheWest
2dc11d40c2
Merge "Fixed a Settings dialog crash." into lmp-dev
2014-08-19 02:43:23 +00:00
PauloftheWest
b58e2005ab
Fixed a Settings dialog crash.
...
+ Fixed a bug where Settings would crash when trying to open paired bluetooth
device settings after device orientation change.
Bug: 16972564
Change-Id: I0e93551ae7d8f21711d85093756fc33b62f59b24
2014-08-20 11:44:36 -07:00
Lifu Tang
081a9162c9
Merge "Set switch to the correct enabling state" into lmp-dev
2014-08-19 02:08:36 +00:00
Baligh Uddin
9ee4596661
Import translations. DO NOT MERGE
...
Change-Id: I01598edaa725d9a59747e892ba470ee1e876f8eb
Auto-generated-cl: translation import
2014-08-18 18:59:06 -07:00