Russell Brenner
cc145c628d
Merge "Setup fontsize change"
2013-06-25 22:20:33 +00:00
Baligh Uddin
77e0923839
Merge "Import translations. DO NOT MERGE"
2013-06-25 19:47:35 +00:00
Baligh Uddin
877a4db124
Import translations. DO NOT MERGE
...
Change-Id: Id325314bba55c1c01716745c50337d92cfbb266f
Auto-generated-cl: translation import
2013-06-24 19:10:28 -07:00
Dianne Hackborn
c911bbe247
Merge "Use FastPrintWriter."
2013-06-25 01:19:25 +00:00
Dianne Hackborn
6e28a4d70a
Use FastPrintWriter.
...
Change-Id: If7f77185d7a76f14ac63f9c2af9911fb67ad97d9
2013-06-24 17:54:06 -07:00
Svetoslav
51a671c3f2
Fix broken strings in Settings
...
Change-Id: I97b3b140b96894982d5d7753b6b3fc6dde2994a8
2013-06-24 17:49:38 -07:00
Svetoslav Ganov
d4c7b497fb
Print - Settings
...
Change-Id: Id662a41fb189823c6d06aafc7e98996f3ef6c930
2013-06-21 17:46:37 -07:00
The Android Open Source Project
fb0c7c703c
am 11f5f984
: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '11f5f98482e8cf1f237488aef6fef5cea8f9a900':
2013-06-21 12:02:15 -07:00
The Android Open Source Project
11f5f98482
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: Ide168995c4998dc00d65ced6e3187985566f8f49
2013-06-21 11:57:15 -07:00
The Android Automerger
623bb0c79e
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-21 11:35:55 -07:00
Dianne Hackborn
ef2cfa7ad3
am 7f74dea7
: am 67571084
: am 5da4c907
: Merge "Fix issue #9486022 : Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev
...
* commit '7f74dea7a833b7c9c0370ce81decc21d44bda7b3':
Fix issue #9486022 : Disabled Apps column doesn't always show up in Manage Apps
2013-06-20 14:42:18 -07:00
Dianne Hackborn
7f74dea7a8
am 67571084
: am 5da4c907
: Merge "Fix issue #9486022 : Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev
...
* commit '675710849a1209f929e387b19e3a7705f702f5bd':
Fix issue #9486022 : Disabled Apps column doesn't always show up in Manage Apps
2013-06-20 14:40:57 -07:00
Dianne Hackborn
675710849a
am 5da4c907
: Merge "Fix issue #9486022 : Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev
...
* commit '5da4c9079cc06c4ff4117cf6021d2e0800c99f37':
Fix issue #9486022 : Disabled Apps column doesn't always show up in Manage Apps
2013-06-20 14:39:39 -07:00
Dianne Hackborn
5da4c9079c
Merge "Fix issue #9486022 : Disabled Apps column doesn't always show up in Manage Apps" into jb-mr2-dev
2013-06-20 21:38:30 +00:00
cecarrol
2a0affe499
Setup fontsize change
...
Changed the title font unit from sp to dp on setup screens.
Bug: 7680955
Change-Id: I2f5776d155a6ce1cec92622025f4434e2ae72aba
2013-06-20 10:14:58 -07:00
Baligh Uddin
02cc36b31f
am 793ed6e0
: (-s ours) am 178baecf
: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
...
* commit '793ed6e051e96b4188ec3d7bd384fa0d47c6c85c':
Import translations. DO NOT MERGE
2013-06-20 09:33:38 -07:00
Baligh Uddin
793ed6e051
am 178baecf
: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
...
* commit '178baecf987e3aee0c29edfdf0b9ea5c3de1ec1d':
Import translations. DO NOT MERGE
2013-06-20 09:31:52 -07:00
Baligh Uddin
7ae4ec5df1
Merge "Import translations. DO NOT MERGE"
2013-06-20 16:27:54 +00:00
Baligh Uddin
178baecf98
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
2013-06-20 16:27:38 +00:00
Baligh Uddin
dfa983ee58
am 86d2f720
: (-s ours) am e0878e35
: am 80a0d9a3
: Import translations. DO NOT MERGE
...
* commit '86d2f720fbd464053d6506bf7b5291fcffe1b600':
Import translations. DO NOT MERGE
2013-06-20 08:37:36 -07:00
Baligh Uddin
86d2f720fb
am e0878e35
: am 80a0d9a3
: Import translations. DO NOT MERGE
...
* commit 'e0878e357023c260ed41dec8b20da7e9a265b2fa':
Import translations. DO NOT MERGE
2013-06-20 08:36:12 -07:00
Baligh Uddin
e0878e3570
am 80a0d9a3
: Import translations. DO NOT MERGE
...
* commit '80a0d9a37c4c70c538bce0ae7bc2fd83339e15ac':
Import translations. DO NOT MERGE
2013-06-20 08:33:56 -07:00
The Android Open Source Project
0e635252ad
am 9b78ee91
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '9b78ee911303a9b9564f7225d02c0193f02b6aba':
Fix NullPointerException at RunningState
2013-06-20 07:20:14 -07:00
The Android Open Source Project
9b78ee9113
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I4e1415d265b543bcfb24dc7b520162fee1f48806
2013-06-20 07:18:40 -07:00
Satoshi Kataoka
71c915b672
Show subtype locales in the personal dictionary
...
...and change the destination of the intent
Bug: 9117704
Bug: 8856930
Change-Id: I39e55d2c5ca9a602f9a586625dcf25d5fb065a0a
2013-06-20 19:28:34 +09:00
Dianne Hackborn
f5f08628cc
Fix issue #9486022 : Disabled Apps column doesn't always show up in Manage Apps
...
We need to resume the current tab before checking to see if
there are any disabled apps and deciding from that the number
of tabs to show.
Change-Id: I95037f15ff7a97f0234143d10ebcee79224a3114
2013-06-19 17:01:51 -07:00
Baligh Uddin
db1fd820eb
Import translations. DO NOT MERGE
...
Change-Id: Ia1f1524bc2a0acef53267e9ec4a0531cbed48285
Auto-generated-cl: translation import
2013-06-19 12:44:45 -07:00
Baligh Uddin
ac7a28288c
Import translations. DO NOT MERGE
...
Change-Id: Ie094379c6e1458b839192420b31291372b09dfda
Auto-generated-cl: translation import
2013-06-19 12:41:33 -07:00
Baligh Uddin
80a0d9a37c
Import translations. DO NOT MERGE
...
Change-Id: Ia1811e28f847bc50278d40cfe989e2fa284d0f12
Auto-generated-cl: translation import
2013-06-19 12:40:06 -07:00
Johan Redestig
9b70a21960
Fix NullPointerException at RunningState
...
getServiceInfo returns null if you have a service defined in the
manifest as: <service android:name=".Xxx" android:exported="false" />
or and in an <application> with no label or icon.
Dont crash the Settings application because of that.
Change-Id: I6f9f69c130e610b7e4ab66426177b7bade1e1515
2013-06-18 19:11:30 -07:00
Christopher Tate
1d6dde80e3
Merge "The Settings app needs privileged permissions"
2013-06-17 20:02:01 +00:00
Baligh Uddin
b87fb43bc8
am 94496184
: (-s ours) am 7a42c809
: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
...
* commit '94496184577381503d4771f13fc9d862d4b213db':
Import translations. DO NOT MERGE
2013-06-17 12:06:39 -07:00
Baligh Uddin
9449618457
am 7a42c809
: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
...
* commit '7a42c80935c41b5db3151354f4a70d5a46413b74':
Import translations. DO NOT MERGE
2013-06-17 12:03:54 -07:00
Baligh Uddin
5ba48c1ee1
Merge "Import translations. DO NOT MERGE"
2013-06-17 19:02:51 +00:00
Baligh Uddin
7a42c80935
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
2013-06-17 19:01:51 +00:00
Christopher Tate
992b4fceb3
The Settings app needs privileged permissions
...
Bug 8765951
Change-Id: I42cfc32d961967b0a52027cbfb7c80b628715577
2013-06-17 11:43:23 -07:00
Baligh Uddin
c0d2ffbff8
am 44789f92
: (-s ours) am f7c2889c
: am 7f37c30b
: (-s ours) Import translations. DO NOT MERGE
...
* commit '44789f922bafbce8c818f2eaddbfb9c3fd77c5aa':
Import translations. DO NOT MERGE
2013-06-17 09:32:27 -07:00
Baligh Uddin
44789f922b
am f7c2889c
: am 7f37c30b
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f7c2889c451474eab1b4b86013e04b720eacc68e':
Import translations. DO NOT MERGE
2013-06-17 09:30:03 -07:00
Baligh Uddin
f7c2889c45
am 7f37c30b
: (-s ours) Import translations. DO NOT MERGE
...
* commit '7f37c30b713e29494f00c85916fc4fee246f2936':
Import translations. DO NOT MERGE
2013-06-17 09:27:45 -07:00
Baligh Uddin
25459a3872
Import translations. DO NOT MERGE
...
Change-Id: I87b579873e8290e3ccbf69ad9ecd9d2b1e2b49a5
Auto-generated-cl: translation import
2013-06-17 09:19:19 -07:00
Baligh Uddin
e8d4b1a32c
Import translations. DO NOT MERGE
...
Change-Id: I37d7ec7d90da8ac2f9b4b48e75ddbaea44f02ae1
Auto-generated-cl: translation import
2013-06-17 09:15:49 -07:00
Baligh Uddin
7f37c30b71
Import translations. DO NOT MERGE
...
Change-Id: I7da4461fe8f9c64191a5e0c46ae6d5ad4d7293a1
Auto-generated-cl: translation import
2013-06-17 09:14:19 -07:00
Dianne Hackborn
d55de16354
Merge "Following renaming of battery stats."
2013-06-15 00:39:49 +00:00
Chong Zhang
8d42ac22de
Merge "wifi-display: use new getDisplays() method of WifiDisplayStatus"
2013-06-15 00:36:34 +00:00
Chong Zhang
94417b41c0
wifi-display: use new getDisplays() method of WifiDisplayStatus
...
which returns a list of all displays including currently availabe
and remembered ones, each display has properties indicating it's
availability, remembered and canConnect status
Bug 9229799
Change-Id: I1f74b9c41abdfecc10e7bc1853929e982c44be2f
2013-06-14 15:48:02 -07:00
Dianne Hackborn
b05bc1454a
Following renaming of battery stats.
...
Change-Id: I889680dddf18fb2a480017199cc072a2d1469c27
2013-06-14 15:22:18 -07:00
Jean Chalard
d4d98e3e3d
Merge "Fix a bug where a user dict entry is too long"
2013-06-14 08:59:23 +00:00
Jean Chalard
8385f1c622
Fix a bug where a user dict entry is too long
...
Since there is a maxLength attribute to the text field, if the
requested entry is too long for the text field it will be truncated,
then setSelection will crash with an IOOB exception.
Bug: 9410958
Change-Id: I7e916b4d77d338f49db7d3dab4e536d27ec76bc1
2013-06-14 13:10:07 +09:00
Baligh Uddin
8c2f42e7dd
Merge "Import translations. DO NOT MERGE"
2013-06-13 16:01:53 +00:00
The Android Open Source Project
93420eeb38
am bb3a943d
: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit 'bb3a943d1bd9cb8f7cca76850d432cfb2a6307e1':
2013-06-13 08:25:38 -07:00