Paul Lawrence
b191bcc3bf
Fix owner info
...
The owner info field was set to be the same size as the status field.
This means, that, for instance, when the status field shows 'Try again'
you only get a very short owner info area.
Change-Id: Ib9b49f8d64d47f0ade686f1f99b2d1a2176cdfc5
2014-06-13 18:17:36 +00:00
Julia Reynolds
2c53933e8d
Use user restriction instead of pin to guard factory reset in Settings.
...
Bug: 14081992
Change-Id: I60f132312368c5097b46ab97e881eec3700ef586
2014-06-13 13:10:44 -04:00
Paul Lawrence
0990d744e5
Merge "Show time to go while encrypting drive"
2014-06-12 03:30:50 +00:00
Colin Cross
102fea22e0
Revert "logd: Add Developer settings for size, merge conflict issue"
...
This reverts commit c6d03a828e
.
Change-Id: Ic41bf8609a1e16a10bfdce021e0536370800b81e
2014-06-13 23:26:15 +00:00
Mark Salyzyn
c6d03a828e
logd: Add Developer settings for size, merge conflict issue
...
- mLogdSize dropped by merge conflict resolution
Bug: 14563261
Change-Id: I11e3aa97a0ba40c3f55041d98c02d7e73629e985
2014-06-13 15:09:20 -07:00
Mark Salyzyn
6b5bcd2138
resolved conflicts for merge of c2c64a31
to master
...
Change-Id: Ica0f138d4bf2cf66b8ba485bf286e062be433d0a
2014-06-13 14:57:13 -07:00
Fabrice Di Meglio
a6fa002315
Fix padding issue with Dream list item
...
- needs to use the standard Framework one
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: I4f7bb003c928a799bf8b77fce3c4869671816265
2014-06-13 21:11:31 +00:00
Fabrice Di Meglio
a8b4dcc827
Fix bug #15611108 Stability: CursorIndexOutOfBoundsException in Settings: Index -1 requested, with a size of 1
...
- do not allow to have position < 0
A use case was generated by the Monkeys where they were capable to click on the Header.
Change-Id: I3a8ded4c1471a1589134826539c9db1b551f49dd
2014-06-13 21:04:59 +00:00
Julia Reynolds
cbfda98816
Merge "Remove pin and add restrictions for Security settings."
2014-06-12 17:09:07 +00:00
Julia Reynolds
565653cef1
Remove pin and add restrictions for Security settings.
...
Bug: 14081992
Change-Id: Iec5667202b6f5ae5b5a2a0cfded1a832d98adaf9
2014-06-13 13:15:39 -04:00
Mark Salyzyn
5a9a18c15b
Merge "logd: Add Developer settings for size"
2014-06-10 21:49:56 +00:00
Mark Salyzyn
408c89bfb5
logd: Add Developer settings for size
...
- Dependent on some logd/init/selinux security changes.
Bug: 14563261
Change-Id: I11e3aa97a0ba40c3f55041d98c02d7e73629e984
2014-06-13 20:20:08 +00:00
Paul Lawrence
5b2ea2fd6f
Merge "DO NOT MERGE: Set quantum pattern for crypt dialogs" into lmp-preview-dev
2014-06-10 21:44:22 +00:00
Dianne Hackborn
b11c973799
Fix issue #15597136 : n7 not showing estimated discharge time
...
Use battery plugged state to decide whether to show the estimated
discharge time remaining vs. charge time remaining.
Change-Id: I2e0d12871201e7d4927aaa9a94d15bff949a881c
2014-06-12 16:40:56 -07:00
Paul Lawrence
60870987ad
DO NOT MERGE: Set quantum pattern for crypt dialogs
...
The bug makes the decrypt screen for patterns very hard to use
(white on white).
Bug: 14883421
Change-Id: Icd2c99c3f483d1a9b6571fa1e124322fbf6f3289
(cherry picked from commit 26abe64c3d
)
2014-06-12 14:49:07 +00:00
Fabrice Di Meglio
f9360dbcef
Merge "Make the SwitchBar appear immediately" into lmp-preview-dev
2014-06-11 21:23:31 +00:00
Fabrice Di Meglio
138ff8c045
Make the SwitchBar appear immediately
...
- change the way the SwitchBar is shown and hidden
- save its state
- remove the delay transition code
Change-Id: I07260430e6709b42517ca011f6d3c3446a626731
2014-06-12 11:13:23 -07:00
John Spurlock
5fe76205b6
Settings: Workaround duplicate onActivityCreate
...
Bug: 13329308
Change-Id: Ia6b8cf766d517b4e8e5689e33cbb52299471407b
2014-06-12 15:42:12 +00:00
Fabrice Di Meglio
601aad2022
Fix bug #15384992 Setting Dashboard - padding updates
...
- make padding start / end to "0dip" for Preferences ListView
- update also Battery History Chart padding to be compatible
with other layouts
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: I1faae1186322965d7077e92418a507720bab75cf
2014-06-11 16:30:49 -07:00
Alan Viverette
8cd7dc23ec
Merge "Add Settings theme" into lmp-preview-dev
2014-06-11 21:23:31 +00:00
Alan Viverette
5365c626fc
Add Settings theme
...
Also removes unused colors.
Change-Id: Iadf4d72879ea34eab91a9efe02102a6e35be82eb
2014-06-11 18:35:18 -07:00
Fabrice Di Meglio
209c1febb5
Fix bug #15558357 java.lang.RuntimeException: Unable to start activity
...
...ComponentInfo{com.android.settings/com.android.settings.wifi.WifiSetupActivity}
- add missing attributes to SetupWizard themes
Change-Id: I5d58df8edfcfff4902b714c38dbdbc3933c9323d
2014-06-11 12:11:48 -07:00
Fabrice Di Meglio
caf4b1dda2
Fix bug #15543626 Bluetooth Settings headers need to support Quantum styling
...
- per UX request
- remove the TextView "list separator" styling and use the correct one
Change-Id: I54e41d89dd9b930cbaa04bc5b9ed9a5fd9b8605e
2014-06-11 11:31:35 -07:00
Dianne Hackborn
2f2cbbc760
Merge "Small fixes to power save UI." into lmp-preview-dev
2014-06-10 22:18:15 +00:00
Dianne Hackborn
de159c8d16
Small fixes to power save UI.
...
Use the correct default setting, and don't crash.
Change-Id: I33fd612aba404e13c8bbe9110535dff1cfba12a4
2014-06-10 23:17:01 -07:00
Fabrice Di Meglio
782d0f6891
Merge "Fix bug #15545573 Battery use chart is incorrect for date labels and time axis labels" into lmp-preview-dev
2014-06-10 22:18:15 +00:00
Fabrice Di Meglio
a7a62c5b66
Fix bug #15545573 Battery use chart is incorrect for date labels and time axis labels
...
- use DateFormat.getBestDateTimePattern(...) to get the best Date and Time format
depending on the Locale
- format the label according to the best format
- remove non needed formatting strings
Change-Id: I78b62b9a7c9401e47e62c7161214636bb43324fc
2014-06-10 20:26:42 -07:00
Fabrice Di Meglio
da8babaedf
Update Settings redlines per UX request
...
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: Ie95b6cee701847d7f76f2e2a72aaf8fc64bc4dd9
2014-06-10 19:36:26 -07:00
Fabrice Di Meglio
1c3203e83e
Merge "Update Settings redlines per UX request" into lmp-preview-dev
2014-06-10 22:18:15 +00:00
Dianne Hackborn
9f789fbe08
Merge "I am a Material girl, living in a Material world." into lmp-preview-dev
2014-06-10 22:12:51 +00:00
Dianne Hackborn
3bd46a70c1
I am a Material girl, living in a Material world.
...
Change-Id: I3206041666a3236fdeb5f5897e6d8767137c2b85
2014-06-11 16:27:22 -07:00
Fabrice Di Meglio
deb0883989
Merge "Fix bug #15384992 Setting Dashboard - padding updates" into lmp-preview-dev
2014-06-11 21:23:31 +00:00
Dianne Hackborn
3864cda8fd
Merge "In a document centric world, hiding from recents makes no sense." into lmp-preview-dev
2014-06-10 21:49:59 +00:00
Dianne Hackborn
a1b89d0ae8
In a document centric world, hiding from recents makes no sense.
...
Change-Id: I462649a0663cc54c60303392168624483d6a1e17
2014-06-11 15:56:19 -07:00
Julia Reynolds
253b111a3d
Merge "Remove PIN from users page - use disallow_add/remove_user restrictions."
2014-06-10 21:38:43 +00:00
Paul Lawrence
9b17be0d4b
Merge "Set quantum pattern for crypt dialogs"
2014-06-11 23:10:23 +00:00
Dianne Hackborn
ff0a8a2f43
am 2f2cbbc7
: Merge "Small fixes to power save UI." into lmp-preview-dev
...
* commit '2f2cbbc760c23d89c5b0255378bbf5cb074a6988':
Small fixes to power save UI.
2014-06-12 00:03:50 +00:00
Fabrice Di Meglio
e306098cab
am 782d0f68
: Merge "Fix bug #15545573 Battery use chart is incorrect for date labels and time axis labels" into lmp-preview-dev
...
* commit '782d0f689106aed05de80e93948f9e7b30701601':
Fix bug #15545573 Battery use chart is incorrect for date labels and time axis labels
2014-06-12 00:03:34 +00:00
Paul Lawrence
26abe64c3d
Set quantum pattern for crypt dialogs
...
Bug: 14883421
Change-Id: Icd2c99c3f483d1a9b6571fa1e124322fbf6f3289
2014-06-11 16:11:12 -07:00
vandwalle
4e278c7c62
Merge "remove disbaled for unknown reason status"
2014-06-11 21:23:31 +00:00
Julia Reynolds
b9195d25ee
Remove PIN from users page - use disallow_add/remove_user restrictions.
...
Bug: 14081992
Change-Id: If4973d64ae54da602a2682dee5b868ff66273856
2014-06-11 17:14:14 -04:00
Fabrice Di Meglio
87f06fa594
am 1c3203e8
: Merge "Update Settings redlines per UX request" into lmp-preview-dev
...
* commit '1c3203e83efed2d5c257da8e4f5fba4844b6fa47':
Update Settings redlines per UX request
2014-06-11 17:43:44 +00:00
John Spurlock
69323ad96a
am e9ee5e2c
: Merge "Settings: Battery saver settings sub-page." into lmp-preview-dev
...
* commit 'e9ee5e2cede8d7e8fd7791113903df7eff1ec75a':
Settings: Battery saver settings sub-page.
2014-06-11 17:02:20 +00:00
Martijn Coenen
d23aa97454
am 8da48ee8
: Remove obsolete NFC unlock XML file.
...
* commit '8da48ee882825c43bce7068382ad730fbbc060e7':
Remove obsolete NFC unlock XML file.
2014-06-11 17:02:19 +00:00
Alan Viverette
2c461006b8
am 6bfec2d6
: Remove all dialog icons in Settings
...
* commit '6bfec2d6b197068dd355bd1742179fe3da07136f':
Remove all dialog icons in Settings
2014-06-11 13:07:58 +00:00
Alan Viverette
9947787a64
am a29f3bbf
: Merge "Ripple tint is now color" into lmp-preview-dev
...
* commit 'a29f3bbff43c33aedd028a852bfaf53325fe2538':
Ripple tint is now color
2014-06-11 13:07:56 +00:00
Baligh Uddin
c1846e0c19
am bb883075
: Merge "Breaks the build. Issue being tracked in b/15538481" into lmp-preview-dev
...
* commit 'bb8830756fec3c6ee66b87eb7fe6822d038147ce':
Breaks the build. Issue being tracked in b/15538481
2014-06-11 12:41:37 +00:00
Fabrice Di Meglio
da7fee6a62
am df055ead
: Merge "Replace ic_settings_language.png asset to the new one" into lmp-preview-dev
...
* commit 'df055ead66b11fdc28f9af5641013705d064b516':
Replace ic_settings_language.png asset to the new one
2014-06-11 12:41:35 +00:00
Baligh Uddin
fe5f063e45
am eff52add
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
...
* commit 'eff52addfc1c27d9aadbefe7e1e91f2bb2647ab6':
Import translations. DO NOT MERGE
2014-06-11 11:24:36 +00:00
vandwalle
d42ec37dbf
remove disbaled for unknown reason status
...
Change-Id: Id9fda1b6aeec8e7122a5c00996e5afbec20ac1cb
2014-06-10 20:47:19 -07:00