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
Jeff Davidson
978d2785fb
Suppress WiFi Assistant card until future platform updates.
...
This replaces the previous behavior of an increasing timeout. When the
user dismisses the WiFi Assistant card, either by opting out or
successfully configuring the assistant, the card is suppressed until
the next major platform upgrade (assuming the assistant is not enabled
at the time of the upgrade).
Bug: 16902858
Change-Id: I5373a7a743f21777b7b75a620b5a4e9004e57466
2014-08-18 18:13:43 -07:00
Jon Miranda
0b65294a7a
Added a developer option to save attribute data.
...
After the checkbox for 'Enable view attribute inspection' is checked,
newly constructed Views will save their attribute data.
Change-Id: Ia6d150d0d9991a2341236a9d35055b811038c849
2014-08-18 17:16:23 -07:00
Lifu Tang
b18e242366
Set switch to the correct enabling state
...
- Fix b/16951708
Change-Id: I4f9a2a374a771fd353fca436a0d34644f9bc8320
2014-08-18 16:46:48 -07:00
PauloftheWest
637f1b4e45
Fixed a Bluetooth Scanning issue.
...
+ When refreshing Bluetooth devices, sometimes it took awhile for some
devices to come back up. This is a fix.
Bug: 17049458
Change-Id: Id6233b38585e003e0432707663af4d06b0ce98c2
2014-08-18 15:00:19 -07:00
PauloftheWest
a4ab5a3a2b
am 31584ec3
: Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev
...
* commit '31584ec3e99ded3dd96de06bcb1aa8e4dc408cce':
Fixed a crash when rotating a saved networks dialog.
2014-08-18 20:07:36 +00:00
PauloftheWest
480fcb2432
am 6a2b1a44
: Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev
...
* commit '6a2b1a44d2ed5bc0b5025ec62a51662850499d71':
Fixed a bug were AdvanceWifiSettings would crash on resume.
2014-08-18 20:07:35 +00:00
Lifu Tang
db0b7637fa
Dim the preference icons when its disabled
...
- Fix b/16956979
Change-Id: Idfa3fddf63746dea1db0c75dedab06b57aaf5de7
2014-08-18 11:22:13 -07:00
Alexandra Gherghina
9db8f0aaf3
am 0cad779d
: Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev
...
* commit '0cad779d3e4d7ef361fa972e54879cd6791b467c':
Switch to listening for USER_INITIALIZE broadcast in the Settings app.
2014-08-18 16:56:17 +00:00
Alexandra Gherghina
4b81ebf285
am cd88c2f7
: Fix Account Settings crash
...
* commit 'cd88c2f7c30fe58e523e93469dd1fc7a121320f3':
Fix Account Settings crash
2014-08-18 16:39:54 +00:00
Alexandra Gherghina
cd88c2f7c3
Fix Account Settings crash
...
Bug: 17020198
Change-Id: I9d4a18381ebb0f57a0e9917c3b7579b0a7feeaf4
2014-08-18 14:34:13 +01:00
Zoltan Szatmary-Ban
131b497f58
Put VPN settings under primary profile control
...
Bug:16030111
Change-Id: If9815b8c9486e47bb860ff941ef5469ec6145ad6
2014-08-18 13:48:15 +01:00
Zoltan Szatmary-Ban
1613cb0da4
Update Trusted Credentials screen in settings
...
Trusted credentials for both the primary user and its managed profiles are shown
on the Trusted Credentials fragment. All functionalities (e.g. disabling/enabling
of certificates) remain available.
Bug: 16029580
Change-Id: Id6335d12ec5fbeed0e254f3ded1e715def3e8e04
2014-08-18 12:29:55 +01:00
Baligh Uddin
1f4e0347b9
am f14fa7ed
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'f14fa7ed4e9c61543a10f081027489558c4bc104':
Import translations. DO NOT MERGE
2014-08-17 14:08:30 +00:00
Adam Lesinski
82951de9fe
am a9dc57c1
: Merge "Added Warning dialog when enabling usage access for app" into lmp-dev
...
* commit 'a9dc57c145c91eaa5b43510575eae3e425adc461':
Added Warning dialog when enabling usage access for app
2014-08-16 06:49:40 +00:00
Baligh Uddin
a07fddf183
am 88ee936a
: (-s ours) am 2719eebf
: (-s ours) am b3b64705
: (-s ours) Import translations. DO NOT MERGE
...
* commit '88ee936a94db3dcbecf7089183f740ab184c3907':
Import translations. DO NOT MERGE
2014-08-16 04:38:20 +00:00
John Spurlock
dc79528bf6
Merge "Settings: Remove needless dialogTitle attribute." into lmp-dev
2014-08-16 04:32:18 +00:00
John Spurlock
8b3766de66
Settings: Remove needless dialogTitle attribute.
...
DropDownPreference has no dialog, and therefore no title.
Remove to avoid confusion for future copy-pasters.
Bug:16241745
Change-Id: I1130ed5d90b9b769294b64f02ddbf8f00fabe6b0
2014-08-20 15:37:07 -04:00
Amith Yamasani
d05dd864d6
Merge "Update strings for guest removal affordance and dialog" into lmp-dev
2014-08-16 04:32:18 +00:00
Amith Yamasani
94c0181c8f
Update strings for guest removal affordance and dialog
...
Exit guest -> Remove guest
etc.
Bug: 16495144
Change-Id: Ieb44e886ea537682a6922046c0f63cef1456c6d8
2014-08-18 16:42:43 -07:00
PauloftheWest
31584ec3e9
Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev
2014-08-16 04:32:18 +00:00
PauloftheWest
3280dc144f
Fixed a crash when rotating a saved networks dialog.
...
Bug: 16972819
Change-Id: I83d00df974f8c6692697d59ea71e93f193fa5066
2014-08-18 09:28:21 -07:00
Alexandra Gherghina
0cad779d3e
Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev
2014-08-16 04:29:45 +00:00
Alexandra Gherghina
f2e39f2ee4
Switch to listening for USER_INITIALIZE broadcast in the Settings app.
...
The PRE_BOOT_COMPLETED broadcast is no longer sent when creating a new
profile.
Also, we no longer listen to BOOT_COMPLETED as that adds too much overload.
Bug: 17102460
Change-Id: I05eb56c7a05748e8a91b9717966c20ac586d90ef
2014-08-18 17:42:26 +01:00
Paul Lawrence
d5a497b837
Merge "Change decryption strings" into lmp-dev
2014-08-16 04:03:42 +00:00
Paul Lawrence
c8452ae031
Change decryption strings
...
Bug: 17062716
Change-Id: Ib7d0ee77a4a2bab1fc44c041382bc819035333f1
2014-08-19 08:56:49 -07:00
PauloftheWest
6a2b1a44d2
Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev
2014-08-16 04:03:42 +00:00
PauloftheWest
c2cf256853
Fixed a bug were AdvanceWifiSettings would crash on resume.
...
Bug: 17059286
Change-Id: I9c2b03806a45c739cfb4edf64a1518d60e74cdf5
2014-08-18 11:49:09 -07:00
Baligh Uddin
88ee936a94
am 2719eebf
: (-s ours) am b3b64705
: (-s ours) Import translations. DO NOT MERGE
...
* commit '2719eebfc5e7fcfdac417be9a4ae07e25abcaaea':
Import translations. DO NOT MERGE
2014-08-16 04:02:06 +00:00
Baligh Uddin
f14fa7ed4e
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-16 03:56:00 +00:00
Baligh Uddin
e63747ac7b
Import translations. DO NOT MERGE
...
Change-Id: I988fe5d15b0bc0468a637030be9b77c4ca543979
Auto-generated-cl: translation import
2014-08-16 00:01:16 -07:00
Adam Lesinski
a9dc57c145
Merge "Added Warning dialog when enabling usage access for app" into lmp-dev
2014-08-16 03:52:42 +00:00
Adam Lesinski
e01dfd1a82
Added Warning dialog when enabling usage access for app
...
The user is now thoroughly warned about enabling third party
app access to device history.
Change-Id: If8d49a47cae76e06f19cba117d3ec60075966541
2014-08-15 21:14:28 -07:00
Paul Lawrence
b7b686cadf
Merge "Fix encryption strings" into lmp-dev
2014-08-16 03:51:48 +00:00
Julia Reynolds
7138ed7404
Merge "Supress menu if screen ought to be hidden." into lmp-dev
2014-08-16 03:51:48 +00:00