Sanket Padawe
fc0d674e7a
Merge "Fix crash while trying to connect to network in WiFi Settings."
2015-03-19 17:26:40 +00:00
Pavel Zhamaitsiak
e8d640f178
Remove WFC roaming from search keywords
...
automerge: 71a6922
* commit '71a692225efed6ac3b318441bc31e637204561f6':
Remove WFC roaming from search keywords
2015-03-19 02:58:55 +00:00
Alan Viverette
55eaa96fe4
Clean up usage of theme colors, deprecated Resources.getColor* methods
...
Change-Id: I34e11e0773c9f8e00e3eab422781094e19a16d3d
2015-03-18 18:10:52 -07:00
Sanket Padawe
b5f4a2c86e
Fix crash while trying to connect to network in WiFi Settings.
...
Bug: 19535465
Change-Id: Ibfc40a08e6c648681df5fd16e2334d9ec45b10f4
2015-03-18 16:20:40 -07:00
Geoff Mendal
ad56c0af02
am 7adbdd5b
: (-s ours) am b9b1124c
: (-s ours) am ac8641ed
: (-s ours) Import translations. DO NOT MERGE
...
* commit '7adbdd5b00efa5cde1b3d446888a9b3142051bf7':
Import translations. DO NOT MERGE
2015-03-18 22:33:25 +00:00
John Spurlock
9a23adf69d
Settings: Remove all unused imports.
...
Change-Id: Iebfa52cb849d69974c94902b0b020893cf5618a3
2015-03-18 15:51:15 -04:00
Pavel Zhamaitsiak
71a692225e
Remove WFC roaming from search keywords
...
Bug: 19682545
Change-Id: I8606d75a70d2ad3fb646472f8baddbe12e5bac21
2015-03-18 12:49:59 -07:00
Jason Monk
dff06ccbf3
Only show 2 buttons in app info screen
...
They are disable or uninstall and force stop. When there is a third
action it gets pushed to the overflow menu.
Bug: 19511439
Change-Id: I1a0ee71662c09f191fd15524f1a123877eabbe90
2015-03-18 14:46:35 -04:00
Pavel Zhamaitsiak
035619826b
Disable Wi-Fi Calling when getting "registration error" intent.
...
automerge: e861691
* commit 'e8616913b43d9356b5556dd0f2cab72d8ab4e875':
Disable Wi-Fi Calling when getting "registration error" intent.
2015-03-18 18:45:15 +00:00
Pavel Zhamaitsiak
ad68507072
Remove WFC Roaming setting
...
automerge: 1e034fe
* commit '1e034fe79a164a12385b077e2aad9ebfaab5e389':
Remove WFC Roaming setting
2015-03-18 18:44:48 +00:00
Stuart Scott
7df81615b1
Merge "Add option to reset network settings to factory"
2015-03-18 18:28:24 +00:00
Geoff Mendal
7adbdd5b00
am b9b1124c
: (-s ours) am ac8641ed
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b9b1124cd7cd1109068d8bba1cf3a35c1626f32f':
Import translations. DO NOT MERGE
2015-03-18 18:24:08 +00:00
Geoff Mendal
b9b1124cd7
am ac8641ed
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ac8641ede6c0c4d4062789ed019954c7e1f77d9b':
Import translations. DO NOT MERGE
2015-03-18 16:54:53 +00:00
Jason Monk
5774e865d2
Merge "Fix crash in app info"
2015-03-18 15:14:02 +00:00
Jason Monk
337996a485
Fix crash in app info
...
Bug: 19653600
Change-Id: Iddd2da2fcab284e34d40afe493c72bb469648380
2015-03-18 11:01:35 -04:00
Jason Monk
6e311dfaeb
Merge "Add data item to app info screen"
2015-03-18 14:44:43 +00:00
Jason Monk
4bb075bc4f
Add data item to app info screen
...
Add link from app info to directly viewing data usage for that app.
Also do some minor tweaks to get ordering and summaries right on
the app info screen.
Bug: 19511439
Change-Id: Ic50dc24bf9a5c1fe6a7aa076772915ba61168fac
2015-03-18 10:41:21 -04:00
Geoff Mendal
ed00ff3898
Merge "Import translations. DO NOT MERGE"
2015-03-18 13:56:37 +00:00
Geoff Mendal
1aa836f73f
Import translations. DO NOT MERGE
...
Change-Id: I8ad128a937bfdcee9af796b930c5f316ecbb9154
Auto-generated-cl: translation import
2015-03-18 06:52:00 -07:00
Geoff Mendal
bcf3e7a2b0
am a6b490e2
: (-s ours) am a03c39aa
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a6b490e21d7987371484b01e1b82caa964b381f1':
Import translations. DO NOT MERGE
2015-03-18 12:57:04 +00:00
Geoff Mendal
ac8641ede6
Import translations. DO NOT MERGE
...
Change-Id: Ia82339bdeddcb2be2864732de532c5d669d9a286
Auto-generated-cl: translation import
2015-03-18 05:56:44 -07:00
Geoff Mendal
a6b490e21d
am a03c39aa
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a03c39aae8309416364d6d0ccbb0ec89c009b05d':
Import translations. DO NOT MERGE
2015-03-18 12:50:58 +00:00
Geoff Mendal
a03c39aae8
Import translations. DO NOT MERGE
...
Change-Id: I13ef4dce2edd63600d99c7234274f5b2daafd943
Auto-generated-cl: translation import
2015-03-18 05:45:01 -07:00
John Spurlock
e8de915a8e
Merge "Settings: Add a 'Cast' entry point under Sound & notification."
2015-03-17 19:47:14 +00:00
John Spurlock
cfe4aedc47
Settings: Add a 'Cast' entry point under Sound & notification.
...
Bug: 19779557
Change-Id: I2d2a9e366eabfbc17f706813c9018275746d89b7
2015-03-17 15:44:57 -04:00
John Spurlock
3b5c945aa7
Merge "Settings: 'Cast screen' -> 'Cast'."
2015-03-17 19:24:42 +00:00
John Spurlock
04806d8f49
Settings: 'Cast screen' -> 'Cast'.
...
Bug: 19773357
Change-Id: Ie222166e4d7a0bd27ea2f34ac6a7e6ba759edd7e
2015-03-17 14:24:33 -04:00
Lorenzo Colitti
8fc9341b38
Add a developer settings checkbox to use the legacy DHCP client.
...
Change-Id: I18471bdf137fbb128d7e4ae6b9b1a4675f5e7fbc
2015-03-17 19:47:41 +09:00
Yohei Yukawa
f9b806e5e9
Stop using InputMethodUtils.isValidSystemDefaultIme
...
This is a follow up CL for a recent attempt to minimize
the number of default enabled IMEs.
- part1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3
- part2: Ife93d909fb8a24471c425c903e2b7048826e17a3
- part3: I6571d464a46453934f0a8f5e79018a67a9a3c845
- part4: I871ccda787eb0f1099ba3574356c1da4b33681f3
In the above changes,
InputMethodUtils.isValidSystemDefaultIme was deprecated in favor
of InputMethodUtils.isSystemImeThatHasSubtypeOf.
With this CL, InputMethodUtils.isValidSystemDefaultIme is not
used by the setting app anymore and we can remove that method
from InputMethodUtils finally.
This is a pure code refactoring with preserving the current
logic. Hence no behavior change is intended.
Change-Id: Ie96b0d17745735db63eebe6fe1654f32d9b9a170
2015-03-17 10:26:52 +00:00
Jason Monk
e535e5cbe0
Merge "Merge profiles apps into app list"
2015-03-16 19:45:07 +00:00
Jason Monk
0702589168
Merge profiles apps into app list
...
Remove the spinner and add all apps into one list and badge the managed
items.
Bug: 19443900
Change-Id: I9ccacc1b503da2663b9a3945f4fd6051ae95e328
2015-03-16 11:05:33 -04:00
Geoff Mendal
3528c66022
Merge "Import translations. DO NOT MERGE"
2015-03-16 14:03:00 +00:00
Geoff Mendal
11c9156f99
Import translations. DO NOT MERGE
...
Change-Id: I2a5e2c22d16914aaaed29701a8a84efbf3dfe9e1
Auto-generated-cl: translation import
2015-03-16 06:39:11 -07:00
Geoff Mendal
3788ec2384
am 7e760e5f
: (-s ours) am d28b6bae
: (-s ours) am 01492de4
: (-s ours) Import translations. DO NOT MERGE
...
* commit '7e760e5f9c08555c9abeafcc3ab988710df238b4':
Import translations. DO NOT MERGE
2015-03-16 13:18:24 +00:00
Narayan Kamath
4fa74486db
Fix build harder.
...
The first build fix removed a missing comma due to a bad conflict
resolution. This one removes a reference to a non-existent
class.
Change-Id: Ie2fd7ac8141f3ec6c34ed5f09e08842d02e7e650
2015-03-16 13:15:56 +00:00
Geoff Mendal
7e760e5f9c
am d28b6bae
: (-s ours) am 01492de4
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd28b6bae2491145241eb4e3a3384ed059f615234':
Import translations. DO NOT MERGE
2015-03-16 13:10:47 +00:00
Geoff Mendal
d28b6bae24
am 01492de4
: (-s ours) Import translations. DO NOT MERGE
...
* commit '01492de48d374833e8b4d304308e5fd394eeafcc':
Import translations. DO NOT MERGE
2015-03-16 13:03:30 +00:00
Geoff Mendal
9ee5171330
am 79e7d174
: (-s ours) am d1e37422
: (-s ours) Import translations. DO NOT MERGE
...
* commit '79e7d1747ffde2a70fc709915c55f6e149d879e4':
Import translations. DO NOT MERGE
2015-03-16 12:56:34 +00:00
Geoff Mendal
79e7d1747f
am d1e37422
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd1e37422b255a9417dfa5c6cb30e03e177fed5ad':
Import translations. DO NOT MERGE
2015-03-16 12:49:26 +00:00
Narayan Kamath
33acb15e03
Fix Settings build.
...
Broken due to a bogus merge conflict resolution.
Change-Id: Id4e3215ac964ebac792e29f50741b020c06d11f4
2015-03-16 12:48:05 +00:00
Geoff Mendal
01492de48d
Import translations. DO NOT MERGE
...
Change-Id: I785caae50a0df960b25d862e06b2fa8010c1bd26
Auto-generated-cl: translation import
2015-03-16 05:44:27 -07:00
Geoff Mendal
d1e37422b2
Import translations. DO NOT MERGE
...
Change-Id: Ie8486278c1326c35e32e3c87323de45e7225c83e
Auto-generated-cl: translation import
2015-03-16 05:32:21 -07:00
Vinit Deshpande
3b84208212
Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'
...
Change-Id: I6c9de433a224925961b484b400a89edf9059d2bd
2015-03-16 00:55:25 -07:00
Wale Ogunwale
66f1543690
Merge "Remove multi-window developer setting from search index if disabled."
2015-03-13 15:52:36 +00:00
Zoltan Szatmary-Ban
61743f2210
Merge "Make default user icons retrievable as cached bitmaps"
2015-03-13 09:28:47 +00:00
Pavel Zhamaitsiak
e8616913b4
Disable Wi-Fi Calling when getting "registration error" intent.
...
Bug: 19698057
Change-Id: I403417e08f84014fb9bd9f213fd2b8644e2a6541
2015-03-12 16:44:14 -07:00
Jim Miller
5ee3105917
Merge "Add flag to hide disabled keyguard options."
2015-03-12 21:21:05 +00:00
Jim Miller
3fb2fb8ac3
Add flag to hide disabled keyguard options.
...
Normally keyguard options are disabled by things like credential
storage and device admins, so we show the reason in ChooseLockGeneric.
However, in the case of fingerprint we want to limit the scope
to just those options that have security (pin,password,pattern).
Bug 19592835
Change-Id: I6832ff692bad538adeec2f2575fca4f8f04f40cf
2015-03-12 14:13:45 -07:00
Pavel Zhamaitsiak
1e034fe79a
Remove WFC Roaming setting
...
Bug 19682545
Change-Id: I0adc7a20c411dd1fea3e2b79bcd5e159537a65c0
2015-03-12 12:36:17 -07:00
Wale Ogunwale
77dab4be64
Remove multi-window developer setting from search index if disabled.
...
Bug: 19494313
Change-Id: I6339d06a4b2ffe712ff8a2a3e72ddfdc63244d28
2015-03-12 12:10:13 -07:00