Fabrice Di Meglio
1b38d75d97
Merge "Fix new Wi-Fi strings from Developer Options"
2014-06-26 18:07:29 +00:00
Fabrice Di Meglio
bf4ea4bd8c
Merge "Fix icon size for Data Usage / Battery Stats / Process Stats"
2014-06-26 18:02:09 +00:00
Julia Reynolds
4ea24ecfbf
Merge "Use user restriction instead of pin to guard factory reset in Settings."
2014-06-26 18:35:29 +00:00
Jason Monk
315070d58b
Add lock-to-app to settings
...
Lock-to-app when disabled shows some instructions about how to
enable it and use it.
When enabled shows an option of use lock screen, which controls
whether the device is locked when exiting lock-to-app. Turning
on use lock screen requires that the device have some security
challenge.
Bug: 15759649
Change-Id: I6188243e03fb0c85bdfdbc32a23ad486296a34f9
2014-06-26 11:09:54 -04:00
Fabrice Di Meglio
c0ac943eb6
Merge "Make Apps Icons size consistent in Battery Stats"
2014-06-25 17:34:02 +00:00
Fabrice Di Meglio
b974ab5825
Make Apps Icons size consistent in Battery Stats
...
- set them to 24dip as for the Settings Dashboard
Change-Id: Iadab299cac88a6b22157d285aff8a7dcf506fc97
2014-06-25 17:04:39 -07:00
Fabrice Di Meglio
f65f0e7575
Merge "Update Dashboard layout - part 2"
2014-06-25 21:16:45 +00:00
Fabrice Di Meglio
676e9c1167
Update Dashboard layout - part 2
...
- follow UX spec
- tablet UI support
- tuning for phone UI
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: I26fc6a51a4bb608399f319206c27f58c21b4aa64
2014-06-25 13:59:18 -07:00
Christoph Studer
d273c2abb3
Merge "Remove ZEN notification visibility settings"
2014-06-25 03:33:37 +00:00
Christoph Studer
672e6ed50c
Remove ZEN notification visibility settings
...
Bug: 15286335
Change-Id: I927948458cfa4cddb8ebffda2f4c81fa003f8004
2014-06-24 18:23:29 +02:00
Emily Bernier
4241d0b8db
Update Settings UI to add new microphone app ops.
...
Bug: 13585692
Change-Id: I5aa7087621a5d03f14f693a68ed4a4823b91a784
2014-06-24 14:28:31 -04:00
Fabrice Di Meglio
fdf54815d2
Remove VM switch from Developer Options
...
- no more needed as Art is the one and only one VM
See bug: #15778483 "Select Runtime" still exists in search results, but not in Settings
Change-Id: I4ccca20165e254f7eec87c1e44aad8de0cab628d
2014-06-23 17:27:38 -07:00
Fabrice Di Meglio
47a25e7640
Update Dashboard layout again
...
- follow UX spec
- update also the Search Panels (suggestions / results) to
follow the same specs
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: I3d27a3b3d9779644f8ea123990a0c7bed8d4ba74
2014-06-23 13:23:47 -07:00
Dianne Hackborn
68f005fbd4
Modify proc stats to show new memory use computation.
...
Switch the proc status UI's memory use bar to be based on the
new total memory use computation, instead of showing that weird
"time spent in memory states" thing.
Also now have it link to a detail page that shows details of time
spent in memory states and RAM used by various things.
Change-Id: I6817a499db518adb8e72466a5e9cfe18a81be5d5
2014-06-19 21:35:27 -07:00
Yorke Lee
cb4f825c77
Merge "Revert "Add default Dialer preference to Settings""
2014-06-19 22:33:55 +00:00
Yorke Lee
5e10834bd8
Revert "Add default Dialer preference to Settings"
...
This reverts commit d4720d9872 .
Change-Id: I0cfc0506619892360e42a62c6bdbf6d2d3186e1c
2014-06-19 22:21:41 +00:00
Fabrice Di Meglio
356b89a3ba
Merge "Improve Search results highlighting"
2014-06-19 20:37:59 +00:00
Fabrice Di Meglio
c70b7f6f35
Improve Search results highlighting
...
- remove unnecessary code
- use keyed Tag with a well known App key for preventing collisions
- fix missing Brightness Level preference key (used for highlight)
Change-Id: I070e3b8c3cb43da7addd34be192aade21951f57c
2014-06-19 13:58:22 -07:00
Fabrice Di Meglio
2957243d83
Merge "Update more colors in Data Usage Summary"
2014-06-17 21:46:58 +00:00
Fabrice Di Meglio
6ebcc36514
Update more colors in Data Usage Summary
...
- use colors from the Settings Theme
- code cleaning for use the Theme accent color constant
instead of raw color value
Change-Id: I04ec913f0b8048b6e50069213e9d92992168fe18
2014-06-18 12:56:04 -07:00
vandwalle
5569c24380
Merge "add setting to control wifi handover"
2014-06-18 21:47:35 +00:00
vandwalle
5e7b3ad09f
add setting to control wifi handover
...
Change-Id: I85a8c8d501238a8115713ca7b018cdac6d0af95a
2014-06-18 20:26:08 -07:00
Mark Salyzyn
2160b50309
am 3f7e5fc1: am ce258caa: Merge changes I8f067f14,I54d8255a,Ib15917bf
...
* commit '3f7e5fc170930df1b049c88a0d2b423dbc83252a':
Settings: crashing when turning ON<>OFF developer option. DO NOT MERGE
Settings: logd: increase dialog title field size to 59
Settings: logd: increase summary field size to 30
2014-06-18 14:24:25 +00:00
Mark Salyzyn
3f7e5fc170
am ce258caa: Merge changes I8f067f14,I54d8255a,Ib15917bf
...
* commit 'ce258caa4aa5cd1ea66b839ee7231c76fcfbc8d6':
Settings: crashing when turning ON<>OFF developer option. DO NOT MERGE
Settings: logd: increase dialog title field size to 59
Settings: logd: increase summary field size to 30
2014-06-18 14:20:11 +00:00
Fabrice Di Meglio
18bc61bc8d
Fix Storage Settings UsageBar empty color
...
- use same empty color as the Battery graph
Change-Id: I1458ecc713117d79182c427e0eadb7407ec1ebae
2014-06-17 17:01:51 -07:00
Mark Salyzyn
20f1b207d0
Settings: logd: increase dialog title field size to 59
...
Bug: 15660860
Change-Id: I54d8255a1fc28ff41e8d8adc693d2e66ff4cc311
2014-06-17 09:56:30 -07:00
Mark Salyzyn
44cf6b73b6
Settings: logd: increase summary field size to 30
...
Bug: 15661901
Bug: 15661903
Bug: 15644939
Bug: 15644940
Bug: 15662401
Bug: 15665444
Bug: 15668253
Change-Id: Ib15917bfdd4a1028d5d9d8ac4f7afe772a0ba77b
2014-06-17 09:48:51 -07:00
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
John Spurlock
d063bc5a7e
Settings: Remove low power mode from development settings.
...
The wiring was removed, this also removes the declarative pieces.
The same function is now under Battery saver settings.
Change-Id: I975afaa3beb771aa80bbef06da1bba9a51519576
2014-06-16 13:21:07 -04: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
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
Mark Salyzyn
6b5bcd2138
resolved conflicts for merge of c2c64a31 to master
...
Change-Id: Ica0f138d4bf2cf66b8ba485bf286e062be433d0a
2014-06-13 14:57:13 -07: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
Paul Lawrence
9b17be0d4b
Merge "Set quantum pattern for crypt dialogs"
2014-06-11 23:10:23 +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
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
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
Alan Viverette
1da878c302
am 8cd7dc23: Merge "Add Settings theme" into lmp-preview-dev
...
* commit '8cd7dc23ec5e65504ea3f9c8d5869df2b670879d':
Add Settings theme
2014-06-12 19:57:25 +00:00
Fabrice Di Meglio
d5f8823b2a
am deb08839: Merge "Fix bug #15384992 Setting Dashboard - padding updates" into lmp-preview-dev
...
* commit 'deb088398900bd1c212889c59c9e057795d2b2bd':
Fix bug #15384992 Setting Dashboard - padding updates
2014-06-12 18:48:56 +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
Fabrice Di Meglio
b0312debfd
am f5440793: Merge "Fix bug #15558357 java.lang.RuntimeException: Unable to start activity ...ComponentInfo{com.android.settings/com.android.settings.wifi.WifiSetupActivity}" into lmp-preview-dev
...
* commit 'f54407933fd30c0838fcd89d9f4dafaf7af865be':
Fix bug #15558357 java.lang.RuntimeException: Unable to start activity ...ComponentInfo{com.android.settings/com.android.settings.wifi.WifiSetupActivity}
2014-06-12 16:53:47 +00:00
Alan Viverette
8cd7dc23ec
Merge "Add Settings theme" into lmp-preview-dev
2014-06-11 21:23:31 +00:00