Fabrice Di Meglio
1301b50e32
am b5b35fa1
: Merge "Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again" into lmp-dev
...
* commit 'b5b35fa1cf8122dca0f10392e6bfb6ee88f1d7f1':
Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again
2014-07-17 17:02:07 +00:00
Lifu Tang
cc1c788a8a
am 569abb0c
: Merge "Avoid removing switch even listener multiple times" into lmp-dev
...
* commit '569abb0c25708d4e7fc2cb4b3fe08839e253e211':
Avoid removing switch even listener multiple times
2014-07-17 17:01:00 +00:00
PauloftheWest
43f001100a
am f3282c50
: Merge "Corrected mispelling in strings.xml" into lmp-dev
...
* commit 'f3282c500141023508bd1e08fd5cb6913a8e32df':
Corrected mispelling in strings.xml
2014-07-17 17:00:59 +00:00
PauloftheWest
32e77410c7
am b64a1f2f
: Merge "Added Wifi Assistant Card" into lmp-dev
...
* commit 'b64a1f2fde227153510bd9147c05fb31bddd5a14':
Added Wifi Assistant Card
2014-07-17 17:00:59 +00:00
Paul Lawrence
9d17fc34a5
am 41eb8522
: Merge "Make crypt dialogs material" into lmp-dev
...
* commit '41eb85226ceaba16a635eb6b9818231008466f24':
Make crypt dialogs material
2014-07-17 17:00:58 +00:00
Fabrice Di Meglio
b5b35fa1cf
Merge "Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again" into lmp-dev
2014-07-16 23:42:05 +00:00
Fabrice Di Meglio
a874180fbe
Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again
...
- regression from 9717fab53d
- add the missing dashboardBackgroundColor attribute to the DialogWhenLarge Themes
Change-Id: I9f7e21d33851966350726e4b3bf79a5a4d12a37f
2014-07-16 17:02:41 -07:00
PauloftheWest
4de665314a
am 55245894
: Merge "Added strings for PBAP and MultiSim" into lmp-dev
...
* commit '552458940450d509185a5d6857175f7d606d6366':
Added strings for PBAP and MultiSim
2014-07-16 17:50:03 +00:00
Maurice Lam
e6080819b0
am ca1ad092
: Merge "[WifiSetup] Make illustration header not clickable" into lmp-dev
...
* commit 'ca1ad0928064a92b92d72fd1900bde644c398f27':
[WifiSetup] Make illustration header not clickable
2014-07-16 17:14:41 +00:00
PauloftheWest
b64a1f2fde
Merge "Added Wifi Assistant Card" into lmp-dev
2014-07-16 16:25:13 +00:00
PauloftheWest
060e01a93e
Added Wifi Assistant Card
...
+ Show Wi-Fi Assistant card above network list that scroll under the action bar with the rest of the list
+ Display a promo image and text
+ Clicking "Setup" should link to the selected Wi-Fi assistant app (must be open to 3rd parties)
+ Touching "No, Thanks" should snooze this card for 30 days / 2nd time 90 / 3rd time 180 days / then forever
Bug: 15703202
Change-Id: If74101bea630246c6bda2de3ed79fee72eca4c0c
2014-07-16 15:46:09 -07:00
PauloftheWest
f3282c5001
Merge "Corrected mispelling in strings.xml" into lmp-dev
2014-07-16 13:12:22 +00:00
PauloftheWest
7a18c4c4ce
Corrected mispelling in strings.xml
...
Bug: 16345771
Bug: 16337577
Change-Id: I63912c51b5483d4adbfc70668318cd14c344d244
2014-07-16 16:13:09 -07:00
Narayan Kamath
023406a374
am 2abbacb7
: Merge "Get rid of duplicated code in accessibility settings."
...
* commit '2abbacb7d46657e5863eb2ef0035521ffc41a0a8':
Get rid of duplicated code in accessibility settings.
2014-07-16 13:08:24 +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
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
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
Jeff Davidson
eda4acbb49
Fix excessively long logtag.
...
Change-Id: Idb0846269623550d891d8e98765d630a17da7d14
2014-07-16 01:51:55 +00:00
Chris Wren
62a8aa7ac9
Merge "Implement application-level high priority setting." into lmp-dev
2014-07-15 16:05:17 +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
PauloftheWest
55edbae88f
Numerous additional strings needed for translation.
...
Bug: 16288110
Change-Id: I0701f90f4444700a12f68a2f44598326e94a08ec
2014-07-15 07:27:24 -07:00
PauloftheWest
d74c812140
Merge "Adding strings for Call Manager do not merge" into lmp-dev
2014-07-15 00:17:34 +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
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
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
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
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
Jason Monk
f43bbeb247
Revert "Add lock-to-app to settings"
...
This reverts commit 315070d58b
.
Change-Id: Id78311a4e0f371a87c975cc97587a404e0dfdb7f
2014-07-14 16:44:56 +00:00
Christoph Studer
9717fab53d
NotificationStation: Fix crash, use dark theme
...
Bug: 15899979
Change-Id: Ieaa65e300cdc9cbed83b601b7a972a1e245c4961
2014-07-14 17:20:17 +02:00
Alexandra Gherghina
cfc7f9d960
Remove old accounts tile, replaced by a separate screen
...
Bug: 15815948
Bug: 15819268
Change-Id: I3b6978cff346c73cca1d6a2c209ffe4c71808244
2014-07-14 10:02:14 +01:00