Alan Viverette
178db4d5f7
Merge "Add option for serif monospace captioning font" into lmp-dev
2014-10-10 23:40:58 +00:00
Amit Mahajan
6f451050a7
am 88b2790d
: Merge "Fix to show signal strength as 0 if out of service." into lmp-dev
...
* commit '88b2790d734504389156111002d8c5bd162d9b9c':
Fix to show signal strength as 0 if out of service.
2014-10-10 22:44:03 +00:00
Amit Mahajan
88b2790d73
Merge "Fix to show signal strength as 0 if out of service." into lmp-dev
2014-10-10 22:41:09 +00:00
Amit Mahajan
4d49e3f5b1
Fix to show signal strength as 0 if out of service.
...
Bug: 17942583
Change-Id: I399e5352b4585cff42ee5c7dd164315c1797110a
2014-10-10 14:40:44 -07:00
Alan Viverette
48dd1bca69
Add option for serif monospace captioning font
...
BUG: 17666124
Change-Id: I57e3938d16e162165caee7ec9373c59c824cd1da
2014-10-10 12:24:45 -07:00
Alan Viverette
0ba89bd54c
Update Settings to use themed Context.getDrawable()
...
Explicit null theme is passed when using Resources.getDrawable() and
no theme is available, e.g. when using getResourcesForApplication().
This fixes an issue with ic_text_dot theming and helps avoid similar
issues in the future.
BUG: 17648301
Change-Id: I3e97c3490b6f2a55744f567b21284f2935ae9af7
2014-10-10 10:58:58 -07:00
Dianne Hackborn
eac414ae23
am 9d49e51c
: am c30661c0
: am 8541206e
: am a4204bde
: Merge "Update to use "real" L codename." into lmp-dev
...
* commit '9d49e51c854bb25d50c2aefd66aeed6aeb942d2c':
Update to use "real" L codename.
2014-10-10 17:01:10 +00:00
Zoltan Szatmary-Ban
ac8a4c0762
am e807e1ea
: am 90625329
: am 95dda800
: am 50263efb
: Remove CA Cert UI item from one list only
...
* commit 'e807e1ead6f78951b8b84d55f8772d0317f09f14':
Remove CA Cert UI item from one list only
2014-10-10 16:59:44 +00:00
Svetoslav
aaeaa9dadc
am a883dbba
: am 39674811
: Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev
...
* commit 'a883dbba7194b19c14c4fff83f94ee852c7bb798':
Update accessibility service toggle switch when resuming.
2014-10-10 16:58:15 +00:00
Sanket Padawe
ce1bfbb04e
resolved conflicts for merge of 61719a80
to lmp-mr1-dev-plus-aosp
...
Change-Id: I3246a5d50f0fa2e324b7c6119a365f8ee9ed2e80
2014-10-09 20:19:59 -07:00
Dianne Hackborn
9d49e51c85
am c30661c0
: am 8541206e
: am a4204bde
: Merge "Update to use "real" L codename." into lmp-dev
...
* commit 'c30661c05d2455d251f8cedddc3a048e78455f6c':
Update to use "real" L codename.
2014-10-09 22:11:49 +00:00
Dianne Hackborn
c30661c05d
am 8541206e
: am a4204bde
: Merge "Update to use "real" L codename." into lmp-dev
...
* commit '8541206e6bbc08f5e5bc7d545fcdce38ff853f8e':
Update to use "real" L codename.
2014-10-09 22:02:02 +00:00
Dianne Hackborn
8541206e6b
am a4204bde
: Merge "Update to use "real" L codename." into lmp-dev
...
* commit 'a4204bde454bbac665c7c1302056c9a64f76ffb1':
Update to use "real" L codename.
2014-10-09 19:29:33 +00:00
Zoltan Szatmary-Ban
e807e1ead6
am 90625329
: am 95dda800
: am 50263efb
: Remove CA Cert UI item from one list only
...
* commit '90625329608c19c3a0b8f7c98bb8710fe346a220':
Remove CA Cert UI item from one list only
2014-10-09 19:28:05 +00:00
Zoltan Szatmary-Ban
9062532960
am 95dda800
: am 50263efb
: Remove CA Cert UI item from one list only
...
* commit '95dda800a988c1ca778dae08563b6875c30d089a':
Remove CA Cert UI item from one list only
2014-10-09 19:22:48 +00:00
Zoltan Szatmary-Ban
95dda800a9
am 50263efb
: Remove CA Cert UI item from one list only
...
* commit '50263efbaf5ce432c7335c1428ca10c1096cce1f':
Remove CA Cert UI item from one list only
2014-10-09 19:11:25 +00:00
Svetoslav
a883dbba71
am 39674811
: Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev
...
* commit '396748110b8e7e761ee1d82827cc4396ecc5ee66':
Update accessibility service toggle switch when resuming.
2014-10-09 18:26:25 +00:00
Svetoslav
396748110b
Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev
2014-10-09 18:21:53 +00:00
Dianne Hackborn
df8683d237
am a4204bde
: Merge "Update to use "real" L codename." into lmp-dev
...
* commit 'a4204bde454bbac665c7c1302056c9a64f76ffb1':
Update to use "real" L codename.
2014-10-09 16:57:19 +00:00
Dianne Hackborn
a4204bde45
Merge "Update to use "real" L codename." into lmp-dev
2014-10-09 16:54:16 +00:00
Sanket Padawe
61719a801c
am 04b8b4c1
: am e4cbb865
: Merge "Removing display number format from SIM UI" into lmp-sprout-dev
...
* commit '04b8b4c1a46dad57923ddbbb1522e8c21d0757f7':
Removing display number format from SIM UI
2014-10-09 13:16:15 +00:00
Sanket Padawe
04b8b4c1a4
am e4cbb865
: Merge "Removing display number format from SIM UI" into lmp-sprout-dev
...
* commit 'e4cbb86596dd55200eb1842b66463a70e59a8ee4':
Removing display number format from SIM UI
2014-10-09 13:03:33 +00:00
Zoltan Szatmary-Ban
4ce8802e41
am 50263efb
: Remove CA Cert UI item from one list only
...
* commit '50263efbaf5ce432c7335c1428ca10c1096cce1f':
Remove CA Cert UI item from one list only
2014-10-09 12:58:13 +00:00
Zoltan Szatmary-Ban
50263efbaf
Remove CA Cert UI item from one list only
...
When removing a CA Cert in TrustedCredentialsSettings the UI item
is now removed from the list of the respective profile only.
Bug: 17926190
Change-Id: I7f7ae3498717cc457cb9e360e59bb365225b0cb6
2014-10-09 13:00:32 +01:00
Sanket Padawe
e4cbb86596
Merge "Removing display number format from SIM UI" into lmp-sprout-dev
2014-10-09 00:33:10 +00:00
Sanket Padawe
770bdd771e
Removing display number format from SIM UI
...
Removed "Display Number" from the SIM settings UI.
Change-Id: Ib2b228931dfac56503ac56ffdf2238e6f416a469
2014-10-08 16:05:36 -07:00
Dianne Hackborn
308c8fdfec
Update to use "real" L codename.
...
Change-Id: If7112bc4a41007bd3dbcb2b4d2c9ff9e44f7cf0c
2014-10-08 15:48:25 -07:00
Svetoslav
17fd600fc6
Update accessibility service toggle switch when resuming.
...
An accessibility service can be enabled via a global gesture
in which case if the settings activity for enabling the service
is running its toggle switch is shown in the wrong state.
bug:16558106
Change-Id: I2821b148475a7afae21e29148ef98db724c817f2
2014-10-08 19:47:55 +00:00
Amith Yamasani
711785f59c
am 436796e4
: am 6b911d59
: am c55c581a
: am 742a6803
: Merge "Set default restrictions for a newly created user" into lmp-dev
...
* commit '436796e4ccf327c09e104a5bda27788a029c85e7':
Set default restrictions for a newly created user
2014-10-07 20:34:51 +00:00
Amith Yamasani
436796e4cc
am 6b911d59
: am c55c581a
: am 742a6803
: Merge "Set default restrictions for a newly created user" into lmp-dev
...
* commit '6b911d59eb2da863c53e5e338dec22974a79b654':
Set default restrictions for a newly created user
2014-10-07 20:08:32 +00:00
Amith Yamasani
6b911d59eb
am c55c581a
: am 742a6803
: Merge "Set default restrictions for a newly created user" into lmp-dev
...
* commit 'c55c581a8a9c7fb777e80498852426a546b1504c':
Set default restrictions for a newly created user
2014-10-07 20:03:26 +00:00
Amith Yamasani
195b15833c
am 742a6803
: Merge "Set default restrictions for a newly created user" into lmp-dev
...
* commit '742a6803c31692f6cf0b36ef934cf1e9bc9b01d8':
Set default restrictions for a newly created user
2014-10-07 19:58:51 +00:00
Amith Yamasani
c55c581a8a
am 742a6803
: Merge "Set default restrictions for a newly created user" into lmp-dev
...
* commit '742a6803c31692f6cf0b36ef934cf1e9bc9b01d8':
Set default restrictions for a newly created user
2014-10-07 19:58:24 +00:00
Amith Yamasani
742a6803c3
Merge "Set default restrictions for a newly created user" into lmp-dev
2014-10-07 17:41:10 +00:00
Amith Yamasani
a766bfa3de
Set default restrictions for a newly created user
...
Call a different createUser version that sets up the defaults.
Make sure any previously created guest also gets the restrictions
as soon as they are changed.
Bug: 17832802
Bug: 17891763
Change-Id: I3eaa9e3da32b2f436699db24bb7be2668f1480b3
2014-10-07 17:13:16 +00:00
Geoff Mendal
4813fcdd98
am c22f63a7
: (-s ours) am a6e09c12
: (-s ours) am 237abb0a
: (-s ours) am 7096c2dd
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c22f63a7b47a51e6818001b1472a7dd863c16df1':
Import translations. DO NOT MERGE
2014-10-07 00:56:05 +00:00
Geoff Mendal
ea11d7007f
am 5df0bf9a
: (-s ours) am c4fd0715
: (-s ours) am c3cd6d95
: (-s ours) Import translations. DO NOT MERGE
...
* commit '5df0bf9a34f2891982eacf0e5aa3119f14326f41':
Import translations. DO NOT MERGE
2014-10-07 00:56:04 +00:00
Geoff Mendal
c22f63a7b4
am a6e09c12
: (-s ours) am 237abb0a
: (-s ours) am 7096c2dd
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a6e09c12d402bc980952ca44648ee0ba5cd50182':
Import translations. DO NOT MERGE
2014-10-07 00:40:13 +00:00
Geoff Mendal
5df0bf9a34
am c4fd0715
: (-s ours) am c3cd6d95
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c4fd0715c06b8197ff6f47da5d55f58cc4b336f6':
Import translations. DO NOT MERGE
2014-10-07 00:40:12 +00:00
Geoff Mendal
a6e09c12d4
am 237abb0a
: (-s ours) am 7096c2dd
: (-s ours) Import translations. DO NOT MERGE
...
* commit '237abb0a373a3f9a9e70e7f11fbc77dd65dcf80f':
Import translations. DO NOT MERGE
2014-10-07 00:32:21 +00:00
Geoff Mendal
c4fd0715c0
am c3cd6d95
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c3cd6d956b2687a99564010b888513250d2ac29d':
Import translations. DO NOT MERGE
2014-10-07 00:32:21 +00:00
Geoff Mendal
6380422d25
am 3a797b8b
: (-s ours) am 78fb9572
: (-s ours) Import translations. DO NOT MERGE
...
* commit '3a797b8bdb3f4d68e7483478030f704688169ea6':
Import translations. DO NOT MERGE
2014-10-07 00:18:58 +00:00
Geoff Mendal
a5569d48dd
am b2bd24f1
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b2bd24f195b523538138a594c0c227004886a94d':
Import translations. DO NOT MERGE
2014-10-07 00:13:09 +00:00
Geoff Mendal
3a797b8bdb
am 78fb9572
: (-s ours) Import translations. DO NOT MERGE
...
* commit '78fb95728d534a7099c220ea21fc13f3b52afd5f':
Import translations. DO NOT MERGE
2014-10-07 00:11:50 +00:00
Geoff Mendal
237abb0a37
am 7096c2dd
: (-s ours) Import translations. DO NOT MERGE
...
* commit '7096c2dd0b1fadabe6f2bcb07ef5045405f2337f':
Import translations. DO NOT MERGE
2014-10-07 00:08:25 +00:00
Geoff Mendal
185e17221a
am 7096c2dd
: (-s ours) Import translations. DO NOT MERGE
...
* commit '7096c2dd0b1fadabe6f2bcb07ef5045405f2337f':
Import translations. DO NOT MERGE
2014-10-07 00:08:13 +00:00
Geoff Mendal
c3cd6d956b
Import translations. DO NOT MERGE
...
Change-Id: I86bdfc2ed82420c69d8123d82c3e376eef9ff2b1
Auto-generated-cl: translation import
2014-10-06 17:04:43 -07:00
Geoff Mendal
b2bd24f195
Import translations. DO NOT MERGE
...
Change-Id: I6c277439d0c0ffb1f36e56fdad5669c7fbc44c56
Auto-generated-cl: translation import
2014-10-06 17:00:54 -07:00
Geoff Mendal
78fb95728d
Import translations. DO NOT MERGE
...
Change-Id: I24a02b89f2baf4a914ff56381e46f8a326b9ddba
Auto-generated-cl: translation import
2014-10-06 16:57:23 -07:00
Geoff Mendal
7096c2dd0b
Import translations. DO NOT MERGE
...
Change-Id: I081acd53e6011744f1fdf01403290172ac9ab96f
Auto-generated-cl: translation import
2014-10-06 16:53:34 -07:00