Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,484 Commits 1 Branch 0 Tags
a99ef8871e204a04bc2b6436eede2078f8001b98
Commit Graph

6819 Commits

Author SHA1 Message Date
Daniel Sandler
16c276a1ff Follow API change. 
Depends on change Icbc09bfc in f/b.

Bug: 15022240
Change-Id: Icbc09bfc5ce78964272def66934fe4a7c848e12b
 2014-06-09 16:53:02 +00:00
Robert Greenwalt
51d898fd02 Apply LinkProperties changes. 
bug:15142362
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
 2014-06-08 08:58:42 -07:00
Fabrice Di Meglio
c6dacf5e56 am c9548c17: Merge "Fix bug #15460001 "Cell broadcasts" setting search suggested in wifi only device though setting is not present" into lmp-preview-dev 
* commit 'c9548c17471ff7d7826a769593250ca3467a2ba5':
  Fix bug #15460001 "Cell broadcasts" setting search suggested in wifi only device though setting is not present
 2014-06-07 10:01:14 +00:00
Fabrice Di Meglio
c9548c1747 Merge "Fix bug #15460001 "Cell broadcasts" setting search suggested in wifi only device though setting is not present" into lmp-preview-dev 2014-06-06 23:38:11 +00:00
Fabrice Di Meglio
dba577f8f0 Fix bug #15460001 "Cell broadcasts" setting search suggested in wifi only device though setting is not present 
- implement a BaseSearchIndexProvider for WirelessSettings
- fix Context passed to the Index: now use an ApplicationContext
- also use the correct Context when dealing with Settings SearchIndexProvider
- also makes impossible a rogue BaseSearchIndexProvider to crash Settings
if not well behaving
- last, fix icon used for "NFC & more" search results

Change-Id: I8b5cc999fa57a9e1977ee57394801d54cf3dbabb
 2014-06-06 16:35:41 -07:00
Amith Yamasani
34766441f7 am fd1710bf: Merge "Show user management UI if a managed profile exists" into lmp-preview-dev 
* commit 'fd1710bf9e163962ecbbe97e4663978230818a7f':
  Show user management UI if a managed profile exists
 2014-06-06 22:08:30 +00:00
Amith Yamasani
4093e40e18 Show user management UI if a managed profile exists 
Show UI even if flags to show multiuser UI are off, if there's a
second user on the device. This way there's an affordance to remove
the user.

Don't show the "Add user" item though.

Bug: 15447068
Change-Id: I40273005d6d8d66aed486328615acdab71d51fa4
 2014-06-06 14:31:37 -07:00
Fabrice Di Meglio
c56acc5f3c am 3d35ec72: Fix bug #15469483 Search menu should not be present when Settings is launched as a Shortcut 
* commit '3d35ec729256d4a1e1796be3e9d858eefedda23d':
  Fix bug #15469483 Search menu should not be present when Settings is launched as a Shortcut
 2014-06-06 20:57:22 +00:00
e12b2f047a Merge "Update the settings due to a framework API change." 2014-06-06 20:37:20 +00:00
Fabrice Di Meglio
3d35ec7292 Fix bug #15469483 Search menu should not be present when Settings is launched as a Shortcut 
- create the Search menu only for non shortcut launch

Change-Id: I8f83fb6c199509f2b2215a20b19f92e3d736b733
 2014-06-06 12:13:29 -07:00
Fabrice Di Meglio
2b552ac0dd am 132652c5: Do not show the Preference summary in Search results 
* commit '132652c5576462f036ed9437720b15b0c31430e4':
  Do not show the Preference summary in Search results
 2014-06-06 02:22:41 +00:00
Fabrice Di Meglio
132652c557 Do not show the Preference summary in Search results 
- as the summary was sometimes showing "Unknown" or even not the
real Preference value (we dont have right now the capability to
know the current value of a Preference), so it is better to be
safe than sorry.

Change-Id: I009c31fc41ad35a630f4b34aa0ef998932f65263
 2014-06-05 19:15:02 -07:00
Alan Viverette
1d4b3122f1 am a83a532d: Add defaults for caption colors and edge type, fix preview size 
* commit 'a83a532dde44341319810958d67aabb02ff7aea6':
  Add defaults for caption colors and edge type, fix preview size
 2014-06-05 22:22:43 +00:00
Alan Viverette
a83a532dde Add defaults for caption colors and edge type, fix preview size 
BUG: 15116066
BUG: 8151470
Change-Id: Ieca00f0da209138bdfa691715720263ef5406773
 2014-06-05 13:51:58 -07:00
Paul Lawrence
b15c68fbf1 Show time to go while encrypting drive 
Bug: 15159008
Change-Id: I9bb6f86c2941cbd93572c25716d21691a4fefbef
 2014-06-05 20:15:37 +00:00
Jean Chalard
2d444968a5 Merge "Allow multiple shortcuts for a personal dictionary word" 2014-06-05 04:10:01 +00:00
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