Alexandra Gherghina
9ce0da9cf1
Add account for managed user
...
Bug: 16056552
Change-Id: I225a1b447d9b4024703b82be8a1fa66359d9e9a1
2014-07-17 21:18:34 +01:00
Alexandra Gherghina
c42d4059b5
Remove account for a managed user
...
Bug: 16056552
Change-Id: Iad24856cab908ed40c32af799ca2c41fe85b6b45
2014-07-17 19:57:43 +00:00
PauloftheWest
08ee22cb35
Merge "Removed extraneous string from strings.xml" into lmp-dev
2014-07-17 02:29:54 +00:00
PauloftheWest
44b6f51042
Removed extraneous string from strings.xml
...
Change-Id: I68db708eed866f644a2443bdc90582ae3e5c85eb
2014-07-17 12:49:19 -07:00
Alexandra Gherghina
7c81c1d1af
Handle managing accounts for a managed profile
...
Bug: 15466880
Change-Id: Icf0e06c954269426b500f0e5fbcdf3346c59eb9d
2014-07-17 19:42:46 +00:00
Alan Viverette
5427b9a799
Update new TimePicker widget to match Settings theme
...
BUG: 11218747
Change-Id: I093e16df14832502af0ac28e19e3ad672a51e1d6
2014-07-17 04:36:55 +00:00
Alexandra Gherghina
b8fff27ce3
Merge "Handle choosing and adding accounts for a managed profile" into lmp-dev
2014-07-17 00:15:07 +00:00
Alexandra Gherghina
7d748c0267
Handle choosing and adding accounts for a managed profile
...
The user id can now be passed through the app as a fragment argument.
Bug: 15466880
Change-Id: I0e2be20551b4ec8c9226640ac74ea74115156ccd
2014-07-17 19:05:57 +00:00
Amith Yamasani
d888b543b2
Revert "Update Location Settings for Enterprise" due to
...
build breakage.
This reverts commit ca153c55dd
.
Change-Id: Id6d6c98e8504f50b1764bcb87052eb567b6284a1
2014-07-17 18:26:38 +00:00
Dianne Hackborn
be875db541
Merge "Battery chart fixes." into lmp-dev
2014-07-17 17:59:02 +00:00
Dianne Hackborn
c19eb361a4
Battery chart fixes.
...
When there is no data to show, don't make a crazy collapsed chart.
Also avoid re-creating the chart when scrolling.
And fix various other things.
Change-Id: Ia1895bc7c46e6d830e66f66e66f17726e1e23e3f
2014-07-17 12:09:54 -07:00
Zoltan Szatmary-Ban
ca153c55dd
Update Location Settings for Enterprise
...
Find packages of the corporate user and show them
with badged icon on the "Recent location requests" list.
Bug: 15467321
Change-Id: Ib0fdb9f0c811307875296c37bab6d1fbab919022
2014-07-17 18:47:17 +01:00
Amith Yamasani
f1d56ebb11
Merge "Follow split of DISALLOW_TELEPHONY" into lmp-dev
2014-07-17 02:40:09 +00:00
Amith Yamasani
920c57d499
Follow split of DISALLOW_TELEPHONY
...
Save both DISALLOW_OUTGOING_CALLS and DISALLOW_SMS together.
Change-Id: I06dd23b3fb4a21f3a22661da17491fc5b0bce4ed
2014-07-17 11:03:41 -07:00
Fabrice Di Meglio
9b435f29d7
Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev
2014-07-16 23:30:53 +00:00
Fabrice Di Meglio
e817a66e83
Fix bug #15702424 add-wifi setting screen has no title
...
- pass the missing EXTRA_SHOW_FRAGMENT_TITLE_RESID
- define a new string for the Activity title
- code cleaning: remove a non needed call to getIntent()
Change-Id: I430d59c0225c6e7f23e78edf5644d07ef33a9d98
2014-07-16 19:51:06 -07: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
Baligh Uddin
a1ed7f2f77
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-07-16 23:30:53 +00:00
Baligh Uddin
c2befed25d
Import translations. DO NOT MERGE
...
Change-Id: I2e49081933e98dc3109219c21bd737c3e22fd6f7
Auto-generated-cl: translation import
2014-07-16 18:46:36 -07: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
Chris Craik
7babd05509
Merge "Accessibility text contrast control" into lmp-dev
2014-07-16 22:04:55 +00:00
Chris Craik
fc72424cd7
Accessibility text contrast control
...
b/14624452
Change-Id: I0f6708680eb37cf8e7dc63cae56b639eaf7c8dbd
2014-07-16 18:04:26 -07:00
Andres Morales
0128374aae
Increase oem_unlock_enable char limit for translation
...
Bug: 16220494
Change-Id: I3974b241bc57130e518dab4b20348e698a276854
2014-07-17 01:03:02 +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
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
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
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
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
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
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