Commit Graph

14354 Commits

Author SHA1 Message Date
Fabrice Di Meglio
39a2cbb32c Merge "Fix the way we select and apply Themes" into lmp-dev 2014-07-18 18:24:25 +00:00
Fabrice Di Meglio
712df6cb70 Fix the way we select and apply Themes
- do not override the DialogWhenLarge ones (they have their purpose)
- apply the correct Theme to SubSettings and then as a consequence
to the SwitchBar

Change-Id: I83adabf72da03051f03fbd2121e1e71217fc0c6a
2014-07-18 17:44:37 -07:00
Fabrice Di Meglio
d40dd45c18 Fix overdraw and do some layout optimizations
- use a specific layout for the Dashboard and for the Preferences
- use a specific background for the Dashboard and for the Preferences

The main idea here is that you cannot have the same layout / background
because the Dashboard is using the "Z elevation" for having its card
"poping up"

Change-Id: I42b7c91efea14315b8a60cf3876938a7f1d1e0b3
2014-07-18 16:33:32 -07:00
Fabrice Di Meglio
84dfc0b5d6 Merge "Fix overdraw and do some layout optimizations" into lmp-dev 2014-07-18 18:24:25 +00:00
Adam Lesinski
8d7be7b738 Update Settings to use new UsageStats API
Change-Id: I89740d9b0c21f1ac6aa68feedc7730dd98b244c9
2014-07-18 14:35:54 -07:00
Fabrice Di Meglio
3bd0515242 Fix alignment of ActionBar title and Preferences for tablet UI
- use the correct start/end padding

See bug: #15439371 Visual add white BG for Settings Detail

Change-Id: I391fb3c75c51349ffbc17295b3aac6f432f91b58
2014-07-17 19:36:14 -07:00
Jeff Davidson
878ca0edb9 Merge "Link WifiAssistant card with actual settings." into lmp-dev 2014-07-17 21:04:20 +00:00
Paul Lawrence
312927abd7 Material fixes for tablets
Remove wireframe Android from pattern screen
Remove tablet specific password entry - we don't have one for PIN, and
the password one looks awful.

Bug: 15328359
Change-Id: I3d73a346166641ab72ecf520f9fbe2ee1379fe8a
2014-07-18 19:49:26 +00:00
Maurice Lam
b3f69cd104 Merge "[WifiSetup] Mechanism for suspending auto finish" into lmp-dev 2014-07-17 21:58:28 +00:00
Maurice Lam
6a627652cb [WifiSetup] Mechanism for suspending auto finish
We have been using forget() to prevent auto-reconnection when the
user hits back to Wifi setup. This has the side effect of forgetting
networks, which is undesirable especially for password protected APs.

The new mechanism keeps a flag on whether the user has selected a
connection. Only auto-advance if the user has picked a network and
there is a valid WiFi connection.

The new EXTRA_REQUIRE_USER_SELECTION can specify whether a user
selection is required initially. That is, whether to auto finish if
the system connected to a network without user input. The default is
false so WiFi can be skipped if the user started setup wizard with
a valid WiFi connection (e.g. after System Update). Note that a user
selection is always required when the user goes back from the next
screen.

Since the new AP dialog does not have a connect button, the SKIP
button in the navigation bar also changes to NEXT when there is a
valid WiFi connection, so the user can hit NEXT if they decided not
to change the network.

Bug: 15333554
Bug: 15999487
Change-Id: I98e935b8e09e470a0c49c44bc299bb2eced98634
2014-07-17 20:47:04 -07:00
PauloftheWest
772cf20616 Merge "Minor string fixes for translation" into lmp-dev 2014-07-17 21:58:28 +00:00
PauloftheWest
60105a966a Minor string fixes for translation
Bug: 16321903
Bug: 16321706
Bug: 16321066
Bug: 16321704
Change-Id: I65d0d8c89a8d0e7bf2ff2280aab32cd63b9fe369
2014-07-18 11:04:13 -07:00
Andres Morales
7ab8929cc6 On factory reset, wipe the stored account challenges
Each time a user adds an account, a challenge gets
stored to the persistent data block service.

If a user factory resets *from Settings*, this is
considered a "secure wipe" and thus we must wipe
the account challenges as well.

No other factory reset mechanism must be permitted
to wipe this data.

Bug: 14288780
Change-Id: Ibe48ccae2d7b5f8d736717a27b7c4f44bed0fba7
2014-07-18 16:40:37 +00:00
Alexandra Gherghina
89265a3026 Hide Settings launcher icon for a managed profile
This makes the Settings icon disappear at the next reboot.

Bug: 16369104
Change-Id: Ic0a394413a0f2dc573d340394d2cd24388535856
2014-07-18 11:39:29 +01:00
Fabrice Di Meglio
c08c67be88 Merge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev 2014-07-17 21:58:28 +00:00
Tadashi G. Takaoka
3ac7802ee6 Fix duplicate string resources
Change-Id: I33fd2e236f7462fc8a8fd14f56226e21d74a0311
2014-07-17 18:07:26 -07:00
Michael Wright
b8a90e5042 Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev 2014-07-17 21:04:20 +00:00
Jeff Davidson
873fa4f2ba Link WifiAssistant card with actual settings.
Only show the card if we haven't already enabled an assistant, and if
there's one available on the device to enable. (For now, we enable the
first one; in the future, we can offer a selection between
assistants).

When the user opts in, we either show the standard system activity or
the custom opt-in activity if the assistant has defined one. In either
case, we only dismiss the card if the child activity indicates that
opt-in was successful.

Bug: 16376277
Change-Id: Ic92c7676c563ab8c8fb695117a053004f15f7d25
2014-07-17 13:48:50 -07:00
Alexandra Gherghina
ccdc369e47 Merge "Add account for managed user" into lmp-dev 2014-07-17 19:51:18 +00:00
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
Paul Lawrence
eb0628bb02 Merge "Final touches to material theme for phones" into lmp-dev 2014-07-17 19:13:40 +00:00
Paul Lawrence
aa05738cd2 Final touches to material theme for phones
Fix layout
Improve text color/size
Improve edit box look
Hide status bar at top

Bug: 15328359
Change-Id: Ia0ea75c74b352963ccf47db0ff7c9684adc1f2a3
2014-07-17 13:29:23 -07:00
Zoltan Szatmary-Ban
cda76822c4 Merge "Update Location Settings for Enterprise" into lmp-dev 2014-07-17 19:45:26 +00:00
Zoltan Szatmary-Ban
925560e9a2 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: Ic52ed3d01a0816288d4818190e82befa5235f28b
2014-07-17 21:11:48 +01:00
Amith Yamasani
d0a057ccc8 Merge "Improvements to user settings" into lmp-dev 2014-07-17 17:59:02 +00:00
Amith Yamasani
c16b73e92b Improvements to user settings
Exiting guest mode from within guest user.
Updated assets and cleaned up/optimized some asset clipping code.

Bug: 15761851
Bug: 16355550
Change-Id: I431e92bac3cbedd46bd1e33cffc4d9f0c576ca69
2014-07-17 20:22:08 -07: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
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
Chris Craik
dd82be9c70 Merge "Access high contrast setting directly" into lmp-dev 2014-07-17 02:34:24 +00:00
Chris Craik
22c7f58b65 Access high contrast setting directly
Change-Id: I6dd6359a9a0ed26955bbe7a9f24e460f85a17383
2014-07-17 11:15:49 -07: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
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
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
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
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