Yorke Lee
d4720d9872
Add default Dialer preference to Settings
...
Add a Default phone app setting under wireless settings, and also
a dialog activity that allows a user to confirm the selection of an
application as a default phone app.
Bug: 6948882
Bug: 15021725
Change-Id: I2c1473feba20da01b14fbd30dbecc01be560479d
2014-06-16 15:51:44 -07:00
Selim Gurun
190b6ca8f4
Merge "Do not enable bandwidth reduction settings if key is not available"
2014-06-16 22:12:26 +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
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
Mark Salyzyn
c2c64a312a
am 5a9a18c1
: Merge "logd: Add Developer settings for size"
...
* commit '5a9a18c15b16be282ed48df0fa38045ae9016524':
logd: Add Developer settings for size
2014-06-13 20:27:25 +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
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
Julia Reynolds
253b111a3d
Merge "Remove PIN from users page - use disallow_add/remove_user restrictions."
2014-06-10 21:38:43 +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
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
vandwalle
d42ec37dbf
remove disbaled for unknown reason status
...
Change-Id: Id9fda1b6aeec8e7122a5c00996e5afbec20ac1cb
2014-06-10 20:47:19 -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
Jay Civelli
8662a22c99
Merge "Temporary removing the Trust Agent permission change."
2014-06-10 21:49:59 +00: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
Jay Civelli
382a9b9780
Temporary removing the Trust Agent permission change.
...
Removing the permission check for Trust Agents, until the GMS core prebuilt
has that permission.
BUG: 15546358
Change-Id: Ie0a68fcc313b835a8f5e87570fd248612c837bd3
2014-06-11 09:17:46 -07: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
John Spurlock
e9ee5e2ced
Merge "Settings: Battery saver settings sub-page." into lmp-preview-dev
2014-06-10 21:36:19 +00:00
Przemyslaw Szczepaniak
72a00c459c
Merge "Expose "default tts locale" to the TTS V2 API."
2014-06-10 21:31:35 +00:00
Przemyslaw Szczepaniak
5882320b63
Expose "default tts locale" to the TTS V2 API.
...
Accommodate for the changes in frameworks/base. TtsEngines now
uses Locale objects for setting/getting the default locale
for TTS engines.
Change-Id: I518ace8d16d17b2c36a62e4e9d14a3568a38f68e
2014-06-12 11:44:43 +01:00
vandwalle
4633932a3f
Merge "show frequency within debug settings"
2014-06-12 05:34:42 +00:00
vandwalle
8d9a055f84
show frequency within debug settings
...
Change-Id: I6ebf08a193fc92b7e0289d663f089ba6e871497d
2014-06-12 20:29:27 -07:00
Dianne Hackborn
dd1ad04de2
am b11c9737
: Fix issue #15597136 : n7 not showing estimated discharge time
...
* commit 'b11c97379918fce423bfb0b96a8319a8e698845d':
Fix issue #15597136 : n7 not showing estimated discharge time
2014-06-12 23:57:20 +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
Fabrice Di Meglio
204521626f
resolved conflicts for merge of f9360dbc
to master
...
Change-Id: I2e468d83a7ce5200c59f63b4362e7bee10d0a2eb
2014-06-12 15:46:41 -07:00
Ido Ofir
524a63b493
Small fix to trust agent item in security settings.
...
Change-Id: Ie3157e0c9c68bbab5ba394f61c12d1bbf075bb06
2014-06-12 14:49:25 -07:00
John Spurlock
2bd9eeded4
am 5fe76205
: Settings: Workaround duplicate onActivityCreate
...
* commit '5fe76205b607f193b5925eccfabddc145118b5ea':
Settings: Workaround duplicate onActivityCreate
2014-06-12 20:06:10 +00:00
Dianne Hackborn
3b2be31687
am 9f789fbe
: Merge "I am a Material girl, living in a Material world." into lmp-preview-dev
...
* commit '9f789fbe082792f57dde72e6c5a501cd0441cd6f':
I am a Material girl, living in a Material world.
2014-06-12 18:48:57 +00:00
John Spurlock
a6f8f8b3d9
am 26ac83df
: Merge "Settings: Remove master swtich from battery saver." into lmp-preview-dev
...
* commit '26ac83df5922430b7d7e3eee46c36c7d856bc47c':
Settings: Remove master swtich from battery saver.
2014-06-12 18:37:34 +00:00
Vinit Deshpande
63328dedb4
am c8e2eeea
: Fix icon location on Wifi Settings
...
* commit 'c8e2eeeaa1666d37abc16d0505a1ef6e9a5bae91':
Fix icon location on Wifi Settings
2014-06-12 18:37:22 +00:00
John Spurlock
5fe76205b6
Settings: Workaround duplicate onActivityCreate
...
Bug: 13329308
Change-Id: Ia6b8cf766d517b4e8e5689e33cbb52299471407b
2014-06-12 15:42:12 +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
Vinit Deshpande
c8e2eeeaa1
Fix icon location on Wifi Settings
...
Wifi icons are showing up on the right of the name; which is unlike
other settings; this change fixes that.
Wifi settings are using standard preference layout; so moving to the
new location requires setting different property (icon instead of widget)
on the preference fragment.
Bug: 15117166
Change-Id: I5dd0a843139512d16fb70dd99ed12c3584f57895
2014-06-11 21:22:04 +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
Robert Greenwalt
746c6ae949
Merge "Apply LinkProperties changes." into lmp-preview-dev
2014-06-10 22:12:51 +00:00
Robert Greenwalt
a0ac614c08
Apply LinkProperties changes.
...
bug:15142362
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
(cherry picked from commit 51d898fd02
)
2014-06-10 22:42:12 +00:00