Commit Graph

6303 Commits

Author SHA1 Message Date
Russell Brenner
38583c7328 Merge "Don't advance when recreating from bundle" 2014-06-05 03:38:57 +00:00
Fabrice Di Meglio
7eceb9369d am 35a2c0d6: Merge "Fix bug #15434475 Developer Options do not show immediately after activating them" into lmp-preview-dev
* commit '35a2c0d6381181082b8723f38a8f606dbca1d674':
  Fix bug #15434475 Developer Options do not show immediately after activating them
2014-06-05 01:46:01 +00:00
Fabrice Di Meglio
35a2c0d638 Merge "Fix bug #15434475 Developer Options do not show immediately after activating them" into lmp-preview-dev 2014-06-05 00:42:08 +00:00
Fabrice Di Meglio
bb05178dba Fix bug #15434475 Developer Options do not show immediately after activating them
- allow Dashboard categories reloading

Change-Id: I02d9f1e8ed4d8b8b670835a8d717c6c08b49fe05
2014-06-04 17:33:25 -07:00
Russell Brenner
c56c8c99e9 Don't advance when recreating from bundle
The fragment is recreated from a bundle when returning from finished
activities, like the OTA and walled garden checks. Telling
WizardManager to advance to the next screen causes a duplicate
activity because WizardManager has already responded to the other
finished activity.

Bug: 15393012
Change-Id: I9817e106a0b243b3943bff6edafc228e9e002232
2014-06-04 17:32:22 -07:00
Amith Yamasani
8b0ff9ac9c Fix compile error in Settings
Change-Id: I2fab97a3a2ed99d2c24e67990be1ea21987af3db
2014-06-04 17:31:51 -07:00
Adrian Roos
988348c67b Merge "Ensure trust agents are only provided by platform packages" 2014-06-04 21:53:56 +00:00
Adrian Roos
fe8572a056 Merge "Ensure trust agents are only provided by platform packages - DO NOT MERGE" into lmp-preview-dev 2014-06-04 21:43:47 +00:00
John Spurlock
5525cf4daf am 6430ac5c: Merge "ZenSettings: Hide the settings-specific condition picker." into lmp-preview-dev
* commit '6430ac5c1eeca8c67e99b820bcfa641e002e537f':
  ZenSettings: Hide the settings-specific condition picker.
2014-06-04 21:31:54 +00:00
John Spurlock
f8ecb30715 am fe002e21: Settings: Remove quick settings options for daltonizer.
* commit 'fe002e21a8870ece95516be99e42a130db2068c4':
  Settings: Remove quick settings options for daltonizer.
2014-06-04 20:52:16 +00:00
24a746b958 Update the settings due to a framework API change.
Change-Id: I5248b2a6c9f6d9ac60e9b21a0f5377b19c9a3b36
2014-06-04 13:14:09 -07:00
Fabrice Di Meglio
53ac1e2717 am 302f75d6: Tune Search Results layout
* commit '302f75d6e6005e46e4500f3419bf1010202765e1':
  Tune Search Results layout
2014-06-04 18:44:39 +00:00
Alan Viverette
7385ad9ac2 am 1eb52831: Fix theme resolution in account preferences
* commit '1eb528318cdeb5c5ff1be469435538dad133882b':
  Fix theme resolution in account preferences
2014-06-04 18:44:39 +00:00
John Spurlock
6430ac5c1e Merge "ZenSettings: Hide the settings-specific condition picker." into lmp-preview-dev 2014-06-04 18:37:30 +00:00
John Spurlock
c65bd0c940 ZenSettings: Hide the settings-specific condition picker.
Bug:15424280
Change-Id: Iacfce340d070bf9873603865d59552709a329de9
2014-06-04 14:35:43 -04:00
Dianne Hackborn
1666d47fa2 am a4e854fa: Merge "Tweak battery usage to match red lines." into lmp-preview-dev
* commit 'a4e854fa5b9f5adc4898088f6d454dd92f4238a5':
  Tweak battery usage to match red lines.
2014-06-04 18:08:33 +00:00
Fabrice Di Meglio
475f5b73c2 am 6ba7075a: Merge "Entire Switch bar should be a touch state" into lmp-preview-dev
* commit '6ba7075ae8afb1edc5cb7864bc71121c9992903f':
  Entire Switch bar should be a touch state
2014-06-04 18:08:32 +00:00
Adrian Roos
f7c460d8d6 am 4e2104b1: Merge "Follow up to "A better brightness"" into lmp-preview-dev
* commit '4e2104b1191e5c3a049ebc159150fbb9a7bc2d03':
  Follow up to "A better brightness"
2014-06-04 18:08:32 +00:00
Fabrice Di Meglio
252ba19c8a am 4c448734: Merge "Push Local Printer Search action to the ActionMenu" into lmp-preview-dev
* commit '4c44873435b96b127454272e9a8bf0490b268ed7':
  Push Local Printer Search action to the ActionMenu
2014-06-04 18:08:32 +00:00
John Spurlock
fe002e21a8 Settings: Remove quick settings options for daltonizer.
Bug:15424806
Change-Id: I91a9cd974d9e370f899e7573d00f6d27fe2e5538
2014-06-04 11:12:30 -04:00
Adrian Roos
4c8fd9e0cf Ensure trust agents are only provided by platform packages - DO NOT MERGE
Ensures that Settings only shows TrustAgentServices from
platform packages.

Bug: 15287044
Change-Id: I6c7f62e61f9dd63cbcf4d2f8eb75986b0a314a46
2014-06-04 13:55:48 +00:00
Adrian Roos
da11363812 Ensure trust agents are only provided by platform packages
Ensures that Settings only shows TrustAgentServices from
platform packages.

Bug: 15287044
Change-Id: I62c131d99c7266f8617ec32a50a4f5549a07b4b7
2014-06-04 15:55:29 +02:00
Jean Chalard
976d0ce7f1 Allow multiple shortcuts for a personal dictionary word
Bug: 13869301

Change-Id: I040613bdddc9f18875e29f3382418476262b00ce
2014-06-04 22:00:00 +09:00
Alexandra Gherghina
ba63597d5a Move personal account settings to a new screen.
This does not include work account settings.

Bug: 13656853
Change-Id: I105044f8261b1c656ed5053b3c02c02cfaae90d1
2014-06-04 08:44:39 +01:00
Fabrice Di Meglio
302f75d6e6 Tune Search Results layout
- make the summary view as GONE when its text is empty

See bug: #12910134 Implement Search into the Settings App

Change-Id: Iafd680706b937137eaa30692e1c57a77cb5d7fc8
2014-06-03 15:29:08 -07:00
Alan Viverette
1eb528318c Fix theme resolution in account preferences
BUG: 13341461
Change-Id: Idb42ad4026d63900b62f911782e07092216d906e
2014-06-03 11:15:54 -07:00
Dianne Hackborn
a4e854fa5b Merge "Tweak battery usage to match red lines." into lmp-preview-dev 2014-06-03 00:21:30 +00:00
Dianne Hackborn
7158e62992 Tweak battery usage to match red lines.
Most of this is done, the main thing missing is the color
of the bars which seems like a framework issue.

Note that this introduces a change to the global theme
making colorControlActivated the specified blue color,
which impacts all of the settings UI.  (Except apparently
progress bars, and thus the bug.)

Change-Id: I4a5ca8c3b94dc23b8f065f60fe697ee0e76ff47d
2014-06-02 17:21:13 -07:00
Fabrice Di Meglio
6ba7075ae8 Merge "Entire Switch bar should be a touch state" into lmp-preview-dev 2014-06-02 23:30:30 +00:00
Fabrice Di Meglio
e9cb75c636 Entire Switch bar should be a touch state
- add click listener for toggling the Switch and its text
- add Ripple background to the SwitchBar to make a nice Ripple
when there is a click/touch

See bug #15385724 Entire Switch bar should be a touch state

Change-Id: I26ef77ace596029e9c3e1e17b153b54df4a9110e
2014-06-02 16:29:18 -07:00
Adrian Roos
4e2104b119 Merge "Follow up to "A better brightness"" into lmp-preview-dev 2014-06-02 23:19:53 +00:00
Fabrice Di Meglio
11a67c14a2 Push Local Printer Search action to the ActionMenu
See bug #14325350 Printing > CloudPrint ActionBar is overcrowded

Change-Id: I9c7ca08ecbcf2a918239d952dc8c23315c46f152
2014-06-02 15:38:45 -07:00
Adrian Roos
8ab0954a24 Follow up to "A better brightness"
Original change I122e1218dd0072c979a59bdafd3e0b6f4eec99ab was missing
search provider logic adjustments and length limits on the added strings.

Bug: 15313133
Change-Id: I8910dd60111c87f5494db7bac76a351e89c1a99b
2014-06-03 00:00:11 +02:00
Paul Lawrence
f5ca71751e Adding comment
To enable marquee'ing, you have to call setSelected on the relevant control.
Comment added to explain this. Also see defect 15327172 filed against
SDK documentation to properly explain this.

Change-Id: If8f70baa1b682070b312fa689b2edd77b50d2d6e
2014-06-02 09:33:13 -07:00
Russell Brenner
4ad687a0d8 Merge "Refactor setup wizard-related code" 2014-06-02 04:33:42 +00:00
Fabrice Di Meglio
23c6666a88 Add Indexing and Search for ChooseLockGenericFragment - DO NOT MERGE
Manual report of 0897f975c1

 - clean some imports
- add key and title to security_settings_picker.xml
- add ChooseLockGenericFragment in SearchIndexableResources

Change-Id: I3ab77677f3d926b0a3eb9be5d77ee23b568856aa
2014-05-30 17:59:00 -07:00
Fabrice Di Meglio
90be51d539 Fix the build
- somewhat LMP Previe and Master has diverged
- fix the missing symbol
- add the missing ChooseLockGeneric.ChooseLockGenericFragment in the
ranking Map

Change-Id: Ib978763b5bb093d8192749604a62bb15f6904289
2014-05-30 16:58:07 -07:00
Russell Brenner
d3446c5708 Refactor setup wizard-related code
Extracted setup-related code from WifiSettings, putting it into a new
derived class, WifiSettingsForSetupWizard.

Set taskAffinity to com.android.wizard, for alignment with other
setup wizard-related tasks.

Change-Id: If371f219dac5d3eff8f7899c16cc6f9475be47cf
2014-05-30 16:16:30 -07:00
John Spurlock
789b3e8fc0 am a391d9c6: Merge "ZenSettings: Only show "next day" if start >= end time." into lmp-preview-dev
* commit 'a391d9c6acdd76a50ce7b2982bca15e569bc97e0':
  ZenSettings: Only show "next day" if start >= end time.
2014-05-30 23:13:16 +00:00
John Spurlock
a391d9c6ac Merge "ZenSettings: Only show "next day" if start >= end time." into lmp-preview-dev 2014-05-30 23:08:13 +00:00
John Spurlock
c2f06e06c2 ZenSettings: Only show "next day" if start >= end time.
Bug:15345316
Change-Id: Ic1130dc639f63ae6026f7c7ba2a0ad9402557ce7
2014-05-30 19:04:53 -04:00
Fabrice Di Meglio
b438c13265 am 2aa32299: Merge "Fix bug #15335840 "Safety information" search suggestion shown though ..."Safety information" setting is not available in settings app" into lmp-preview-dev
* commit '2aa322991da364b9be74a6e13a4de314765eadd1':
  Fix bug #15335840 "Safety information" search suggestion shown though ..."Safety information" setting is not available in settings app
2014-05-30 22:39:53 +00:00
Fabrice Di Meglio
2aa322991d Merge "Fix bug #15335840 "Safety information" search suggestion shown though ..."Safety information" setting is not available in settings app" into lmp-preview-dev 2014-05-30 22:36:05 +00:00
Fabrice Di Meglio
b2385ea462 Fix bug #15335840 "Safety information" search suggestion shown though
..."Safety information" setting is not available in settings app

- implement a SearchIndexProvider for DeviceInfoSettings and
remove some Preference indexing depending on the device state
and configuration
- remove old non used Preferences
- some code cleaning

Change-Id: I3b2c9dc7cb9f1137b553fed9330aeea4020bd2f8
2014-05-30 15:35:06 -07:00
Chris Wren
2221cb6f6a am d711b221: Merge "Support audience filtering in the Zen Mode settings." into lmp-preview-dev
* commit 'd711b22130cbe97c63b8f7475720c1b5098f38ed':
  Support audience filtering in the Zen Mode settings.
2014-05-30 21:43:43 +00:00
Chris Wren
d711b22130 Merge "Support audience filtering in the Zen Mode settings." into lmp-preview-dev 2014-05-30 21:37:56 +00:00
Fabrice Di Meglio
cac94ba246 am 2bc41e29: Merge "Fix bug #15342475 Settings search ranking improvement" into lmp-preview-dev
* commit '2bc41e29b99961cbb3d879b1b45e4b14d8a5f3e1':
  Fix bug #15342475 Settings search ranking improvement
2014-05-30 21:33:47 +00:00
Santos Cordon
5a1233e7df am 3afbdf00: Update showCallScreen to use Telecomm (6/6)
* commit '3afbdf006057c93f930694e26306a3cc9cea34e4':
  Update showCallScreen to use Telecomm (6/6)
2014-05-30 21:32:50 +00:00
Fabrice Di Meglio
2bc41e29b9 Merge "Fix bug #15342475 Settings search ranking improvement" into lmp-preview-dev 2014-05-30 21:09:17 +00:00
Fabrice Di Meglio
eed44c9d5f Fix bug #15342475 Settings search ranking improvement
- introduce the "base rank" concept. All SearchIndexablesProvider
will have a base rank and the Settings one will get a "0" base rank.
- use a map whose key is the authority name for the provider to get
and store the base rank
- if a base rank is not defined, use the current max defined one and
increment it to define the new one.

Then we will compute the real rank this way:

rank = (providerRank > 0) ? baseRank + providerRank : baseRank

Change-Id: Ifa82bfcdfc07f25c4a5f304f47550686f7d4c13d
2014-05-30 14:05:32 -07:00