Commit Graph

1989 Commits

Author SHA1 Message Date
John Spurlock
a8e0a5b5f9 Merge "Settings: Add to the zen alarm string." into lmp-dev 2014-07-23 18:31:55 +00:00
John Spurlock
1b821ffad4 Settings: Add to the zen alarm string.
Bug:16406214
Change-Id: I9112c93fdee847633f9e5fb79129a3b02af4439e
2014-07-24 11:24:18 -04:00
Paul Lawrence
e68f5224e4 Show correct string when prompting for pattern before encrypting
Bug: 16505763
Change-Id: I05d874be7651f68688d6582236541f418ec6afc2
2014-07-24 15:11:16 +00:00
Jim Miller
dfd2c6f261 Change wording in keyguard settings menu.
Fixes bug 15167729

Change-Id: Ie748b25667de3d237da34fc9b6a7bedad3ae1dcc
2014-07-23 23:20:33 +00:00
Maurice Lam
56d781b32b Merge "[WifiSetup] Tablet landscape layout" into lmp-dev 2014-07-23 18:56:15 +00:00
Maurice Lam
068354a1bb [WifiSetup] Tablet landscape layout
Created setup_preference for sw600dp-land, modeled after
template_with_header in Setup Wizard. Copied over wide illustration,
which is again a placeholder and needs real graphics from UX.
Renamed SetupWizardHeader to SetupWizardIllustration. Added
aspectRatio attribute to SetupWizardIllustration that, will set the
aspect ratio of the top padding. If 0 or not specified, padding will
not be set.

Bug: 16349429
Change-Id: Ic2623ee0c0ee8864383d22da006b418b8c371bf0
2014-07-23 14:10:46 -07:00
Dianne Hackborn
f151ea3482 Merge "Work on issue #16135174: Apps page "smoke" gradient footer must be removed" into lmp-dev 2014-07-23 18:44:51 +00:00
Julia Reynolds
1a0297c544 Use restrictionsprovider framework in Settings.
Bug: 15305103

Change-Id: Ib0147e366fe90de3512d0cc06e2a47ee16012dff
2014-07-23 21:06:21 +00:00
Dianne Hackborn
fe9590bb19 Work on issue #16135174: Apps page "smoke" gradient footer must be removed
New header in running services.  Not yet done.

Change-Id: Ibe2f4145796c7863ec80e0ea2d8d87dc910bac7e
2014-07-23 13:50:07 -07:00
Fabrice Di Meglio
289a63f509 Merge "Fix NotificationStation theming" into lmp-dev 2014-07-23 18:44:51 +00:00
Fabrice Di Meglio
9c3f11fa05 Fix NotificationStation theming
- fix padding for the ListView
- fix ActionBar size
- remove non needed switchBarMargins

See bug: #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: I0e3d3116f2ee749a04a8a464b36fa68909edf11d
2014-07-23 13:31:26 -07:00
John Spurlock
d39d731473 Merge "Settings: Wire up Display > Lift to wake." into lmp-dev 2014-07-23 18:31:55 +00:00
John Spurlock
333efe9097 Settings: Wire up Display > Lift to wake.
Bug:15521792
Change-Id: I1a771641ad4fc52599149ac7db4a4fe55a6b9286
2014-07-23 13:12:50 -04:00
Fabrice Di Meglio
d73045db7a Add Home / Launcher apps indexing
- add a BaseSearchIndexProvider to HomeSettings
- use a BroadcastReceiver for tracking add or remove of
Home / Launcher apps
- add "launcher" synonym for "home" too

- also code cleaning for DynamicIndexableContentMonitor

See bug: #16484927 Add "launcher" as a synonym for "home" in settings search

Change-Id: I819f4e5f7bd5e9a7882609206b2733ea1912fc69
2014-07-22 15:13:54 -07:00
John Spurlock
5461239187 Settings: Tweak zen alarm info string.
Use standard styling and remove the bit about timers.

Bug:16487906
Change-Id: I28b8ac61981a2e9956d41768ee1185dc5ad950f3
2014-07-22 19:51:40 -04:00
Jeff Sharkey
e65bb4927f Merge "Data Usage, materialized!" into lmp-dev 2014-07-22 20:40:07 +00:00
PauloftheWest
0da1f8515a Removed WPA PSK from HotSpot Options
Bug: 16380972
Change-Id: I77735ff7a8962d538132bb55ebbf6cc75358f8a1
2014-07-22 23:31:27 +00:00
Jeff Sharkey
b654846300 Data Usage, materialized!
Asset drop so Data Usage matches new Material spec.  Removes time
dimension sweeps, so we now summarize the entire visible axis.  Fix
time axis labels to not draw outside clip bounds.  Remove pie chart.

No more checkboxes in menus.  Telephony items like roaming are moved
back to cellular settings.  Start wiring up multi-SIM support.

Bug: 15760500, 16019700, 16289924, 16303795
Change-Id: Ie8f4821962319bb82ff4bc2f13f1f66ba1bdfe65
2014-07-22 16:24:37 -07:00
Alan Viverette
47d27bd629 Merge "Stop using framework-private switch asset" into lmp-dev 2014-07-22 20:33:22 +00:00
Alan Viverette
09be4b3c87 Stop using framework-private switch asset
BUG: 16467249
Change-Id: I0829c3dea522cf59e0f92046ea7c6092d416ad4c
2014-07-22 16:11:01 -07:00
Alexandra Gherghina
6d839875b7 Revert "Revert "Move global sync settings to AccountSettings.""
This reverts commit 4869faf465.

Change-Id: I58df9b8161d711a9c0187af1f1a1dc279fb9d9ab
2014-07-22 20:25:24 +00:00
Fabrice Di Meglio
3f3426e0d9 Merge "Add Home / Launcher apps indexing" into lmp-dev 2014-07-22 16:21:19 +00:00
PauloftheWest
fb3060378f Character limit updates
Bug: 16322106
Bug: 16321901
Change-Id: I776a86658e03a6bed5554a1020cf2c272cbeb49b
2014-07-23 10:11:43 -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
John Spurlock
de42b8b62e Settings: No really, keep the trailing space.
Bug:16487510
Change-Id: Ic10ace9803c7d488240d819427ffec412a10d81a
2014-07-22 15:17:49 -04:00
Alexandra Gherghina
4869faf465 Revert "Move global sync settings to AccountSettings."
This reverts commit 64fde6f4e9.

Change-Id: I61940b6e2936c7c7f048af222602226e5588c268
2014-07-22 12:01:54 +00:00
Alexandra Gherghina
64fde6f4e9 Move global sync settings to AccountSettings.
It also makes AccountSettings respond to the SYNC_SETTINGS intent, which
it is currently triggered by Calendar and could be triggered by Gmail.

Bug: 16076571
Change-Id: I2c55262a87e46ba88f36a90a2f8f27d08f88e851
2014-07-22 12:00:10 +00:00
Dianne Hackborn
ff795ffba8 Unify voice interactor and recognizer settings.
There is now one settings UI to select both the new
voice interactor and old voice recognizer.

There are still a few wonky things about this that won't
be resolved until we start requiring that all interactors
specify an associated recognizer service.

Change-Id: Ib702ff717fb28bcb244cb30e49577066ddc9f197
2014-07-21 20:14:43 -07:00
Jason Monk
27d7ea56f3 Add Screen pinning back to settings
Adds a basic screen for screen pinning (previously lock-to-app) to
settings that describes the feature and allows it to be turned on
and off.

Bug: 16378448
Depends on Ide333463f86310eacb7a1d8b6dc7b1aea8722713 for Settings
constant
Change-Id: Id3ef8471794aa01de20efeb947bed95c50d6b954
2014-07-21 09:01:43 -04: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
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
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
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
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
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
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
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
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
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