Fabrice Di Meglio
5c66753359
am 7d79e418: Fix OwnerInfos
...
* commit '7d79e41877440f8447f92652ce7cdc386b214523':
Fix OwnerInfos
2014-07-16 03:04:47 +00:00
Fabrice Di Meglio
1ecfa6e336
am fd1415d2: Merge "Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash" into lmp-dev
...
* commit 'fd1415d204e4a11a26fe2d550709c0fe42df46ab':
Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash
2014-07-16 03:04:46 +00:00
Jeff Davidson
7d4481dbd0
am eda4acbb: Fix excessively long logtag.
...
* commit 'eda4acbb499c7e310bcf5e5465a0f0cd1c773204':
Fix excessively long logtag.
2014-07-16 03:04:46 +00:00
Fabrice Di Meglio
7d79e41877
Fix OwnerInfos
...
- use a white background for being in line with the Material Theme
- fix padding so that the edge effect is showing full width
See bug: #13140648 Settings needs to support the new Quantum Paper theme
Change-Id: Iea1cf6b104ee8bf5f311f7d3485d0500884dc57a
2014-07-15 18:55:27 -07:00
Jeff Davidson
eda4acbb49
Fix excessively long logtag.
...
Change-Id: Idb0846269623550d891d8e98765d630a17da7d14
2014-07-16 01:51:55 +00:00
Narayan Kamath
2abbacb7d4
Merge "Get rid of duplicated code in accessibility settings."
2014-07-16 01:07:54 +00:00
Narayan Kamath
26edbccb58
Get rid of duplicated code in accessibility settings.
...
Has the side effect of picking up changes to LocalePicker
that added support for 3 letter language codes.
bug: 10090157
Change-Id: I20b357c8a3e76c7cecdf623d9ed39c3751d07645
2014-07-16 12:54:45 +00:00
Alexandra Gherghina
6f877156e0
Merge "Only show AccountSyncSettings when we have an account" into lmp-dev
2014-07-16 00:46:50 +00:00
Alexandra Gherghina
defdfc54bb
Only show AccountSyncSettings when we have an account
...
Also removes useless list of accounts
Bug: 16295803
Change-Id: Ida3c1846327874af9f97695a485b12ec689fd343
2014-07-16 13:27:26 +01:00
Chris Wren
80898f0618
am 62a8aa7a: Merge "Implement application-level high priority setting." into lmp-dev
...
* commit '62a8aa7ac90ad28e8f524011480b8b379d0bb50a':
Implement application-level high priority setting.
2014-07-15 22:03:32 +00:00
Lifu Tang
569abb0c25
Merge "Avoid removing switch even listener multiple times" into lmp-dev
2014-07-15 20:35:01 +00:00
Lifu Tang
42fa973457
Avoid removing switch even listener multiple times
...
- Fix b/16118646
Change-Id: I36cdc5c8d98dfb63924737af40efff35b9ca2e66
2014-07-16 23:12:03 +00:00
Paul Lawrence
41eb85226c
Merge "Make crypt dialogs material" into lmp-dev
2014-07-15 20:35:01 +00:00
Paul Lawrence
89c7570dd4
Make crypt dialogs material
...
White on black material theme
Center text
Remove fade to black task
Fix emergency call button
Note - does not implement all requirements of frames in the defect. More
to follow.
Bug: 15328359
Change-Id: I878e59dccffff366ba2484bb77482e168cbd2b81
2014-07-16 08:07:35 -07:00
PauloftheWest
5524589404
Merge "Added strings for PBAP and MultiSim" into lmp-dev
2014-07-15 20:35:01 +00:00
PauloftheWest
95619db072
Added strings for PBAP and MultiSim
...
Bug: 16345619
Change-Id: If7165312723316d5fd90a441562617e03023b015
2014-07-16 10:38:44 -07:00
Maurice Lam
ca1ad09280
Merge "[WifiSetup] Make illustration header not clickable" into lmp-dev
2014-07-15 20:35:01 +00:00
Maurice Lam
5aee7d5c68
[WifiSetup] Make illustration header not clickable
...
No more "pop" sound when the illustration is tapped on.
Bug: 16331851
Change-Id: Ib528e1d6f669f71e0c2f24164726cee47b06700b
2014-07-15 18:24:18 -07:00
Fabrice Di Meglio
fd1415d204
Merge "Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash" into lmp-dev
2014-07-15 20:35:01 +00:00
Fabrice Di Meglio
1b18665dbc
Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash
...
- fix the way we are passing switchBarMarginStart / switchBarMarginEnd
Change-Id: Ic6e67643be10877a74ae68075460fa5fd4cc5da1
2014-07-15 18:52:37 -07:00
PauloftheWest
e60b6a8c18
am 97ed6faa: Merge "Changed text "NFC & More" to "More" and other minor text changes" into lmp-dev
...
* commit '97ed6faa702201d2173bf2199805659080b83112':
Changed text "NFC & More" to "More" and other minor text changes
2014-07-15 17:05:53 +00:00
PauloftheWest
0a0f2a5876
am d74c8121: (-s ours) Merge "Adding strings for Call Manager do not merge" into lmp-dev
...
* commit 'd74c8121407960d9821de9bff899977fd4db6763':
Adding strings for Call Manager do not merge
2014-07-15 17:05:52 +00:00
PauloftheWest
24377a2780
am 55edbae8: Numerous additional strings needed for translation.
...
* commit '55edbae88f3dca9da9b3de676a62ddd614f9a291':
Numerous additional strings needed for translation.
2014-07-15 17:05:52 +00:00
Christoph Studer
764c81d9eb
am bc188907: Merge "NotificationStation: Fix crash, use dark theme" into lmp-dev
...
* commit 'bc1889071ff0ecfe79cbc070b57c3301863cf26d':
NotificationStation: Fix crash, use dark theme
2014-07-15 17:05:51 +00:00
Chris Wren
62a8aa7ac9
Merge "Implement application-level high priority setting." into lmp-dev
2014-07-15 16:05:17 +00:00
PauloftheWest
55edbae88f
Numerous additional strings needed for translation.
...
Bug: 16288110
Change-Id: I0701f90f4444700a12f68a2f44598326e94a08ec
2014-07-15 07:27:24 -07:00
Tadashi G. Takaoka
d30ac9307b
am fc820246: (-s ours) (DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler to separate loops
...
* commit 'fc8202463e64d9e85af3c99c1d8552d4bb74b7dc':
(DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler to separate loops
2014-07-15 03:12:40 +00:00
Tadashi G. Takaoka
2173d050b7
am 989c364f: (-s ours) (DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler a bit
...
* commit '989c364f2de3eeb2c92fa6713b8e0f137e8d971a':
(DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler a bit
2014-07-15 03:05:26 +00:00
Tadashi G. Takaoka
fc8202463e
(DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler to separate loops
...
Change-Id: I1b7d26c37293e03dc20f87d60eb146017a574c47
(cherry picked from commit 61d97ddda8 )
2014-07-15 02:51:57 +00:00
Tadashi G. Takaoka
989c364f2d
(DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler a bit
...
Change-Id: Id91b62ed084f98e3a6dc724aac9d926d89a96201
(cherry picked from commit a5db65fe11 )
2014-07-15 02:49:36 +00:00
Russell Brenner
94364f9c16
am 6ecd6aa8: Merge "Setup Wizard string refresh" into lmp-dev
...
* commit '6ecd6aa8cba6b6b578606a1aa274e6960b7f0b79':
Setup Wizard string refresh
2014-07-15 02:35:41 +00:00
Amith Yamasani
82ed2f5c68
am 04b550e2: Merge "Handle android.settings.HOME_SETTINGS intent" into lmp-dev
...
* commit '04b550e27a6fb22bf967be43f6e2b741e9ddd67c':
Handle android.settings.HOME_SETTINGS intent
2014-07-15 02:35:40 +00:00
Russell Brenner
6ecd6aa8cb
Merge "Setup Wizard string refresh" into lmp-dev
2014-07-15 00:41:06 +00:00
Russell Brenner
dbe1283da0
Setup Wizard string refresh
...
Update strings from UX flows in time for string freeze deadline.
Bug: 16299032
Change-Id: I37e8ccc7197ff08d5f7eba835276c745f13e5487
2014-07-15 01:10:53 +00:00
PauloftheWest
97ed6faa70
Merge "Changed text "NFC & More" to "More" and other minor text changes" into lmp-dev
2014-07-15 00:22:01 +00:00
PauloftheWest
4181d73b02
Changed text "NFC & More" to "More" and other minor text changes
...
Bug: 16298245
Change-Id: Id2bf3fc10523372a4f22d1298b57d62a2cc781cc
2014-07-15 07:44:37 -07:00
Amith Yamasani
04b550e27a
Merge "Handle android.settings.HOME_SETTINGS intent" into lmp-dev
2014-07-15 00:22:01 +00:00
Amith Yamasani
3033ce0723
Handle android.settings.HOME_SETTINGS intent
...
Launch the Home picker activity for the new public intent.
Bug: 16303152
Change-Id: I91cfffdec6c8ed13d3b0e57d7903b4a06dcbb6e6
2014-07-14 18:03:15 -07:00
PauloftheWest
d74c812140
Merge "Adding strings for Call Manager do not merge" into lmp-dev
2014-07-15 00:17:34 +00:00
Jay Civelli
c0610b1736
Merge "Adding an activity that asks users to confirm their pattern."
2014-07-15 00:17:34 +00:00
PauloftheWest
99fb7b876d
am 6c5ef391: (-s ours) Numerous additional strings needed for translation. do not merge
...
* commit '6c5ef39135e095330ace69154420b0637be0f789':
Numerous additional strings needed for translation. do not merge
2014-07-14 23:46:07 +00:00
PauloftheWest
2b4cf0561c
Adding strings for Call Manager do not merge
...
Bug: 16300328
Change-Id: Iac23de5a8668e9f5a4e96225ab48330f10cb1499
(cherry picked from commit da43612e4b )
2014-07-14 23:41:20 +00:00
PauloftheWest
6c5ef39135
Numerous additional strings needed for translation. do not merge
...
Bug: 16288110
Change-Id: I84621b00da52dcee9eb8c24e92a41ccc7f7a6bd1
(cherry picked from commit 90887e656c )
2014-07-14 23:27:29 +00:00
PauloftheWest
3d009cad14
Changed wording from "Mobile" to "Cellular" do not merge
...
Bug: 15720445
Change-Id: Ibfd196d80be030b694473faa24b746536daa3107
(cherry picked from commit 7325abcd62 )
2014-07-14 22:39:15 +00:00
Christoph Studer
bc1889071f
Merge "NotificationStation: Fix crash, use dark theme" into lmp-dev
2014-07-14 21:09:14 +00:00
Lifu Tang
218f99c0e5
Register the listener for switch during onResume
...
- Fix b/16118646
Change-Id: I9ec87422ecc4e05ca332e116af71c07f06c6c65a
2014-07-14 21:06:26 +00:00
Chris Wren
a7d0062efd
Implement application-level high priority setting.
...
Bug: 15080024
Change-Id: I87a68cf89a643096ae374d0a808f820814e0b81b
Depends-On: Ib1d3b0b5ca4fcfdc52c2cb6838a009b9addf1094
2014-07-14 18:52:02 +00:00
PauloftheWest
1c263bde5b
Merge "Adding strings for Call Manager"
2014-07-14 18:37:52 +00:00
PauloftheWest
da43612e4b
Adding strings for Call Manager
...
Bug: 16300328
Change-Id: Iac23de5a8668e9f5a4e96225ab48330f10cb1499
2014-07-14 16:37:58 -07:00
PauloftheWest
3f65725460
am 3d009cad: (-s ours) Changed wording from "Mobile" to "Cellular" do not merge
...
* commit '3d009cad144f9c2f7a5d6e95b2afb207a7e596da':
Changed wording from "Mobile" to "Cellular" do not merge
2014-07-14 23:30:38 +00:00