Fabrice Di Meglio
0f3ab8b4b7
am a13e40f4
: Merge "Add icon for Search Recents" into lmp-preview-dev
...
* commit 'a13e40f4ce6c9435ba4d014319c371bfa96f252e':
Add icon for Search Recents
2014-06-10 17:21:34 +00:00
Fabrice Di Meglio
1e2ac9efd3
am 66220ba8
: Merge "Tune Recents Search and Search Results" into lmp-preview-dev
...
* commit '66220ba8491bd479f859fcb054268b7aedef93ef':
Tune Recents Search and Search Results
2014-06-10 14:55:41 +00:00
Fabrice Di Meglio
904a744c15
Add icon for Search Recents
...
- per UX request
See bug: #12910134 Implement Search into the Settings App
Change-Id: I91082292fd6a84f503b61b19d1a74bd89da8e209
2014-06-09 17:52:32 -07:00
Fabrice Di Meglio
04cde98538
Tune Recents Search and Search Results
...
- add the capability to scroll recents and results with their
header (old request from UX)
See bug: #12910134 Implement Search into the Settings App
Change-Id: If3c4a23b928b189803f2ef8e13a61746c2790b4b
2014-06-09 17:07:04 -07:00
Julia Reynolds
c92af83b0c
Merge "Settings user restriction changes: wireless & networks changes."
2014-06-09 19:22:19 +00:00
Alan Viverette
80814f5314
Material theme
...
BUG; 15467097
Change-Id: Ifeda3f6cc1554c4d31357d5010df6958113df964
2014-06-06 15:27:32 -07:00
Alan Viverette
5c8f1352e4
DO NOT MERGE Material theme
...
BUG; 15467097
Change-Id: Ifeda3f6cc1554c4d31357d5010df6958113df964
2014-06-06 14:33:10 -07:00
Fabrice Di Meglio
113c4c03ee
am b76de1d4
: Tune Dashboard layouts following UX spec - part 3
...
* commit 'b76de1d4fabf8381d73df22439e6fac839bd33e7':
Tune Dashboard layouts following UX spec - part 3
2014-06-06 20:57:23 +00:00
Fabrice Di Meglio
b76de1d4fa
Tune Dashboard layouts following UX spec - part 3
...
- remove this ugly 12dp at the bottom of the Dashboard and
use 1dp instead
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: I07695b2084a389552fb8a0e89663304c0c29cf58
2014-06-06 12:22:32 -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
Fabrice Di Meglio
5f546fbb1d
am 21d26574
: Tune Search layouts following UX spec
...
* commit '21d26574eb1ddd61aea9775c57dafbcaaf2ef77a':
Tune Search layouts following UX spec
2014-06-06 01:55:19 +00:00
Fabrice Di Meglio
21d26574eb
Tune Search layouts following UX spec
...
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: Ia7839459b3d67529db55e70c0ecda3da9b37d840
2014-06-05 18:32:44 -07:00
Fabrice Di Meglio
303b7780ae
am 1b526607
: Merge "Tune Dashboard layouts following UX spec - part 2" into lmp-preview-dev
...
* commit '1b5266070b6ab84976158f6f0fb213bfb5ba8fb7':
Tune Dashboard layouts following UX spec - part 2
2014-06-06 00:42:01 +00:00
Fabrice Di Meglio
1b5266070b
Merge "Tune Dashboard layouts following UX spec - part 2" into lmp-preview-dev
2014-06-06 00:39:47 +00:00
Fabrice Di Meglio
eb072e125b
Tune Dashboard layouts following UX spec - part 2
...
- set a fixed size for the Dashboard icons (and thus fix the
Account type icons size isssue)
- tune layout for N7 tablet
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: I0306f1ec2309e859e044e8490cef468def8d38fb
2014-06-05 17:36:45 -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
Fabrice Di Meglio
d417a0ce5b
am bf088b5f
: Merge "Tune Dashboard layouts following UX spec" into lmp-preview-dev
...
* commit 'bf088b5f5d1dc9452ffc57d70c6591aa39371bc5':
Tune Dashboard layouts following UX spec
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
John Spurlock
23efadfdd9
am 72d3c27d
: Settings: Notification string tweaks.
...
* commit '72d3c27d6aa7436244a23bad429644649f919ea8':
Settings: Notification string tweaks.
2014-06-05 20:19:13 +00:00
Fabrice Di Meglio
bf088b5f5d
Merge "Tune Dashboard layouts following UX spec" into lmp-preview-dev
2014-06-05 20:15:29 +00:00
Fabrice Di Meglio
c3febdf02f
Tune Dashboard layouts following UX spec
...
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: I2554fa73ca293e10490982df58a42d293b48d311
2014-06-05 13:12:30 -07:00
John Spurlock
72d3c27d6a
Settings: Notification string tweaks.
...
- Sounds & Notifications -> Sound & Notifications
- Notification station title -> Notification log
- Use dark theme for station to ensure icon is visible, boost
all text to theme's primary color.
Bug:15435289
Change-Id: I8a3b999a42ad4cb09e190bf887ae854f8a288d40
2014-06-05 12:04:02 -04:00
John Spurlock
864c31a131
am 8f847cb6
: Merge "Settings: Use standard small text for subtitle." into lmp-preview-dev
...
* commit '8f847cb6bdf6209e2528dd98f35eda215cd6d5e0':
Settings: Use standard small text for subtitle.
2014-06-04 20:52:39 +00:00
Fabrice Di Meglio
9d858c9562
am 9b9c97e7
: Merge "Update Recents Searches and Search Results padding" into lmp-preview-dev
...
* commit '9b9c97e7505bca802547f81de8aff5b1d55176f6':
Update Recents Searches and Search Results padding
2014-06-04 18:44:39 +00: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
2d89840b5c
am 734290e9
: Merge "Setting Dashboard - padding updates" into lmp-preview-dev
...
* commit '734290e9eaf1169bfa91e68307708fb7516913bc':
Setting Dashboard - padding updates
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
John Spurlock
5b82f4f2c7
Settings: Use standard small text for subtitle.
...
In App notifications.
Bug:15423920
Change-Id: I493189d92b4e1447c4dd40bd5070a36d2e176bb0
2014-06-04 12:28:21 -04: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
d15de56ba1
Update Recents Searches and Search Results padding
...
- for matching the ones from the main Dashboard too
- udpate also the Titles to match the categories title appearance
from the Dashboard
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: I6d4731dbbd049b77e8c103bc21e9d0be5c0234dd
2014-06-03 13:32:21 -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
e89aecdd0f
Setting Dashboard - padding updates
...
- following UX design for N5 device
See bug #15384992
Change-Id: Id548ae0937b1aa9b7a9e1ae5c6a6b8299ff51eb6
2014-06-02 17:14:11 -07: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
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
Julia Reynolds
ee27b9de8f
Settings user restriction changes: wireless & networks changes.
...
Bug: 14081992
Change-Id: I32b0f06da7e7ff9bd8303ce26be2584e6cddbedc
2014-05-29 13:21:29 -04:00
Ido Ofir
6f482447b0
Moving the trust agents settings in the security settings menu and adding
...
personal unlock.
Change-Id: I0eeb3a32c55450af2435112a98aa44475159dc4f
2014-05-28 13:36:11 -07:00
Dianne Hackborn
beb6088990
am 0171fdba
: Merge "Fix issue #15185822 : Stability: ArithmeticException: divide by zero" into lmp-preview-dev
...
* commit '0171fdba7bd9b5acdcf0d32ffa12e07c69045a5d':
Fix issue #15185822 : Stability: ArithmeticException: divide by zero
2014-05-24 00:02:05 +00:00
Dianne Hackborn
a32d81797f
Fix issue #15185822 : Stability: ArithmeticException: divide by zero
...
Also small visual improvements.
Change-Id: I55dc30539a4ef67e9261f338c8c5a729a6958d9b
2014-05-23 16:47:37 -07:00
Jason Monk
0485b7c373
Add Editable PAC field to Proxy Configuration
...
Make PAC URL field not read only but now settable in advanced wifi
configuration options.
Bug: 14885470
Change-Id: I2c647f823d5c8a75b5fbf74434cbf0efcc4c50bf
2014-05-22 13:36:02 -04:00
Dianne Hackborn
5a9ace3a7a
Update battery use chart to better match new mocks.
...
Change-Id: I714cb30ccd9b8144785aee16a23ae2b723df4347
2014-05-21 14:19:11 -07:00
Fabrice Di Meglio
53e255242f
Merge "Tune SwitchBar padding"
2014-05-21 02:01:20 +00:00
Fabrice Di Meglio
40a66f4c14
Tune SwitchBar padding
...
- remove hardcoded values
- use UX specs padding values for Phone and Tablet UI
Change-Id: Ic907c52860a1cc17acddd271943c8b2da20fb957
2014-05-20 18:59:21 -07:00
Andres Morales
f03c422652
Merge "Revert "Settings for NFC Unlock""
2014-05-20 23:40:30 +00:00
Fabrice Di Meglio
d2b64f339a
Fix bug #15001610 Java crash in settings is observed while adding Google account on wiped device
...
- update Settings main layout to be able to show the Buttons
- make WifiPickerActivity a SettingsActivity and remove dead code
- fix reference to Buttons for using the Settings IDs instead
of the Framework ones
Change-Id: I23bfd1b8290fc007e6e80aa9a6297e55e7f6004e
2014-05-20 14:23:56 -07:00
Fabrice Di Meglio
8b81bfff2e
Update Dashboard font sizes to match UX spec
...
- 16sp for title (medium text)
- 14sp for sub-title (small text)
- 14sp for category title
See bug: #13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I04eb99b4df1ffcb60bb906ed3e1ea588e886dba4
2014-05-20 10:27:05 -07:00
Andres Morales
ad0c06aca3
Revert "Settings for NFC Unlock"
...
This will be rolled into a Trustlet
This reverts commit fd2b629335
.
Change-Id: I921f0838d4646799b6664da64a578a209e9c037e
2014-05-20 16:59:25 +00:00
Fabrice Di Meglio
29d8e8bc0d
Merge "Update Search results layout"
2014-05-19 23:56:39 +00:00
Fabrice Di Meglio
3f6d2e422b
Update Search results layout
...
See bug: #13140648 Settings needs to support the new Quantum Paper theme
Change-Id: If3174fee563ef204eb939576e4c7ef4d986735e3
2014-05-19 16:55:26 -07:00