Evan Charlton
a835f66ec7
am b71b78a4
: am 6c269982
: Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev
...
* commit 'b71b78a4d4e8c4b7a7514abd692c72898cd665ce':
Use plurals for the developer steps countdown
2012-11-30 10:20:38 -08:00
Evan Charlton
6c269982f3
Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev
2012-11-30 10:15:25 -08:00
Jeff Sharkey
129605270a
am 90dbd693
: am 39b7bd8c
: Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev
...
* commit '90dbd6936c72e2cc6a9ab4699c5af00edeb4cfd6':
Use uniform font size for APNs and timezones. DO NOT MERGE.
2012-11-29 18:02:09 -08:00
Jeff Sharkey
2f12147e91
am a04497d7
: am 5d376860
: Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev
...
* commit 'a04497d70cc4f422cfa36c5be2f35a6170d5725a':
Avoid split action bar when it only has one item. DO NOT MERGE.
2012-11-29 18:02:08 -08:00
Jeff Sharkey
4166ec39ec
Use uniform font size for APNs and timezones. DO NOT MERGE.
...
Also get rid of some orange highlight!
Bug: 7632945
Change-Id: I6a4b59f4eef81b128d128f5a429fb96f6366843a
2012-11-29 14:50:11 -08:00
Jeff Sharkey
c2b43dbee8
Avoid split action bar when it only has one item. DO NOT MERGE.
...
Bug: 7632944
Change-Id: I055564b4f8d2a3fc97346e13e1d8818196a8f988
2012-11-29 14:50:02 -08:00
Jake Hamby
26a67fd181
am c5190506
: am 0206284a
: Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev
...
* commit 'c51905067793a3f18c94df79eb15472cbb58322f':
Fix Bluetooth enable dialog to match Android style guide.
2012-11-29 14:28:50 -08:00
Dianne Hackborn
8afda9efce
am ac4bfa60
: am af604801
: Merge "Be quiet!" into jb-mr1.1-dev
...
* commit 'ac4bfa607d8a1e3c78de25dec740637cd5906a8d':
Be quiet!
2012-11-29 14:26:34 -08:00
Adam Cohen
94cdb26c40
am e38d6277
: am 9067d57a
: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev
...
* commit 'e38d6277c8355cca7239deed6a6df75f852b164d':
Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
2012-11-29 14:26:25 -08:00
Jake Hamby
0206284a66
Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev
2012-11-29 14:14:10 -08:00
Dianne Hackborn
af60480107
Merge "Be quiet!" into jb-mr1.1-dev
2012-11-28 18:18:00 -08:00
Dianne Hackborn
79d42bb622
Be quiet!
...
Change-Id: Ifcce5bf4b2fca35fe50a2684983dc726534c3d0c
2012-11-28 18:05:00 -08:00
Adam Cohen
441588d221
Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
...
Change-Id: Ia1eb902618855e1a86a84c9090cdeefe5a404fd7
2012-11-28 16:37:49 -08:00
Jeff Sharkey
81df8360c9
am 59ee3889
: Merge "Settings: fix storage measurement for device without emulated sdcard"
...
* commit '59ee3889088eb40ab6d8b0f4f9f11f51a89c0f76':
Settings: fix storage measurement for device without emulated sdcard
2012-11-28 13:04:58 -08:00
Jeff Sharkey
59ee388908
Merge "Settings: fix storage measurement for device without emulated sdcard"
2012-11-28 10:23:31 -08:00
Shuhrat Dehkanov
96577681a2
Grey out settings icon when it is in disabled state
...
If engine is not active, its settings icon is disabled in
Settings > Language & input > Text-to-speech output screen.
Currently, settings icons for all TTS engines are shown at
the same opacity. This fix dims settings icons of not-selected
engines.
Make sure that more than one TTS engine are installed on the
target, for e.g., Google Text-to-speech Engine and Classic
Text To Speech Engine (SVOX Classic TTS).
Additionally, since setAlpha() is used in multiple places within
Settings package, moved DISABLED_ALPHA declaration to Utils.java
in order to have single point of reference.
Change-Id: Ifa7de79814a2f4a4aa021cd8621cbfab41655680
Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com >
2012-11-28 23:45:35 +09:00
Daniel Sandler
7dee75c424
Add android.settings.DREAM_SETTINGS for Daydream settings.
...
Bug: 7480927
Change-Id: I5777f7c4aec9ad7d7eb9f7eeb882d2342cb481c3
2012-11-27 22:41:30 -05:00
Pawit Pornkitprasan
2ea50e2b5b
Settings: fix storage measurement for device without emulated sdcard
...
StorageMeasurement: misc files should only be measured for internal
storage only if it is the emulated storage, otherwise misc count
for the primary storage will be erroneously duplicated on the
internal storage count.
StorageVolumePreferenceCategory:
- Always create mMountTogglePreference to avoid null pointer
exception for code that relies on it existing
- Check if the keys exist before calculating totalValues to
avoid null pointer exception on storage where media is not
calculated
- For available/readonly, set title, not summary (summary is
supposed to be the amount available)
Change-Id: Ib217f79ee562dffc514696fff038e58ed0dba7d9
2012-11-24 10:47:11 +07:00
Danielle Millett
12c1451f1f
Removing tutorial for choosing a pattern as part of b/7459863
...
Removing the tutorial that is shown the first time a user sets up
a pattern as their lock type.
Change-Id: If73c936e41458af729740fe5b178b9452c7dd2c0
2012-11-21 15:44:16 -05:00
Jake Hamby
95c1003f1c
Fix Bluetooth enable dialog to match Android style guide.
...
When an app requests to enable Bluetooth and/or Bluetooth discovery,
we show a dialog for user confirmation. Remove the dialog title,
update the message text and button labels to be more descriptive,
and use the standard dialog layout instead of a custom layout.
Also fixes the button layout on the Bluetooth permission test app so
that the "Discoverable" button doesn't wrap to two lines.
Bug: 6001468
Change-Id: I731e2f31b4c822395fc3f83584a092550d9ae7d3
2012-11-20 18:21:44 -08:00
Eric Laurent
4f103c0c1a
am ccc1d614
: am 15c27bb4
: Merge "fix dock audio enable dialog" into jb-mr1.1-dev
...
* commit 'ccc1d614899459e2bb34ff977760bbb1cb225e95':
fix dock audio enable dialog
2012-11-16 14:09:47 -08:00
Eric Laurent
15c27bb40b
Merge "fix dock audio enable dialog" into jb-mr1.1-dev
2012-11-16 14:05:00 -08:00
Amith Yamasani
21b5aacf34
am 0aa79c73
: am 60977265
: Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev
...
* commit '0aa79c73948af7600f289928b18b3231d9679f81':
Use AlarmManager calls to set date/time, instead of SystemClock.setTime
2012-11-16 10:48:59 -08:00
Amith Yamasani
6097726522
Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev
2012-11-16 10:43:04 -08:00
Amith Yamasani
5f05010438
Use AlarmManager calls to set date/time, instead of SystemClock.setTime
...
This way secondary users' settings app can request the system server to
set the time. Alarm driver cannot be opened as a secondary user.
Bug: 7459635
Change-Id: I1ae1630dc448021d35280a297c5d9960f8e8fc2e
2012-11-15 14:44:41 -08:00
Vikram Aggarwal
8761a0536b
am 49a87243
: am f15f9d67
: Merge "Remove back button entirely when disabled" into jb-mr1.1-dev
...
* commit '49a872436c660cff19c2cfd50d3de5b8bcb3a7ac':
Remove back button entirely when disabled
2012-11-15 12:58:33 -08:00
Vikram Aggarwal
f15f9d6765
Merge "Remove back button entirely when disabled" into jb-mr1.1-dev
2012-11-15 12:53:25 -08:00
Amith Yamasani
f6c07cab36
am 4c326c2d
: am 940f6f0c
: Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev
...
* commit '4c326c2d2dac4b8f0394d96aae1012d4143ff427':
Fix a race condition when switching between settings panels
2012-11-15 12:25:25 -08:00
Amith Yamasani
940f6f0c46
Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev
2012-11-15 12:21:31 -08:00
Jeff Sharkey
282aacb5c3
am 05407e77
: am 733bd437
: Merge "Internationalize bytes and percentages." into jb-mr1.1-dev
...
* commit '05407e77e060e8b62a197065538e44a2b0cf8e38':
Internationalize bytes and percentages.
2012-11-15 11:50:11 -08:00
Jeff Sharkey
f707491cfb
Internationalize bytes and percentages.
...
Bug: 7545890
Change-Id: I634fafe9d61a2ebbf7a0cc56d8255457ee9fe1b2
2012-11-14 16:56:11 -08:00
Amith Yamasani
5cdc937251
Fix a race condition when switching between settings panels
...
The fragment was removed while the images were being loaded, so the
activity was null. This fix holds on to the Resources object.
Bug: 7490425
Change-Id: Ic2d8dd3c620fc34ce8255104001e17b39f828601
2012-11-14 16:23:40 -08:00
Eric Laurent
9f4afb0762
fix dock audio enable dialog
...
The dock audio enable setting is not saved if the user
dismisses the dialog without checking or unchecking the check box.
The dialog is then displayed each time the device is docked until the
user checks/unchecks the dialog or goes to sound settings to enable
or disable dock audio.
Bug 7518165.
Change-Id: Ifbc6179e78b64b5b7577ac750acf9846525e47c5
2012-11-12 14:29:17 -08:00
Vikram Aggarwal
bf459dafdc
Remove back button entirely when disabled
...
Bug: 7480506 Encryption screen shows back button
Change-Id: Iba2706fd6b61303178b472071f32d65bdf72e50d
2012-11-09 14:40:22 -08:00
Michael Jurka
1f35075b5e
am 80eed80e
: am caf13b22
: am a108d9fc
: Final tweaks to visuals of widget picker
...
* commit '80eed80e3b048672ac09c297a4971e79dd480d45':
Final tweaks to visuals of widget picker
2012-11-08 15:47:41 -08:00
Michael Jurka
06dfc8aeb6
am 4ee20f36
: am 4e773619
: am f5336fd1
: Allowing rotation while adding lockscreen widgets
...
* commit '4ee20f36fa71fc0ecd0d1cd3c46d271e7096376d':
Allowing rotation while adding lockscreen widgets
2012-11-08 06:27:26 -08:00
Michael Jurka
dae2b315fc
am f31af7d1
: am ef2b86b4
: am a487bca4
: Updated layouts for keyguard widget picker
...
* commit 'f31af7d14f88ed6cf2c5c6b6067cc9436d98b110':
Updated layouts for keyguard widget picker
2012-11-08 06:27:25 -08:00
Michael Jurka
5bd9c4d6c7
am 504bd1ee
: am ddf272da
: am 5c5eff45
: Pass argument to lock screen to show widget after adding it
...
* commit '504bd1eede2d96260b90a9bdf93d719851605642':
Pass argument to lock screen to show widget after adding it
2012-11-08 06:27:23 -08:00
Michael Jurka
09e9bdd64d
am bd533781
: am 2419d2ed
: am 4119788b
: Add widget previews to the key guard widget picker
...
* commit 'bd5337813f73de3a218ca924163c1a48ef64ff6c':
Add widget previews to the key guard widget picker
2012-11-08 06:27:21 -08:00
Evan Charlton
673130bbf8
Use plurals for the developer steps countdown
...
When counting down how many steps are left before the user becomes a
developer, use plurals so that "steps" becomes "step" correctly.
Change-Id: I5dbe2c229c9e6ed0c45aaae8c303b23efc76f75d
2012-11-07 16:18:17 -08:00
Michael Jurka
a108d9fc0e
Final tweaks to visuals of widget picker
2012-11-07 15:32:23 -08:00
Michael Jurka
f5336fd114
Allowing rotation while adding lockscreen widgets
...
Also cleaning up some unused code
Bug: 7468012
2012-11-07 01:12:04 -08:00
Michael Jurka
a487bca470
Updated layouts for keyguard widget picker
...
Bug: 7381803
Change-Id: I9a6a8fe3216002b486e7b6ddf7544d9fc4e73de8
2012-11-07 00:00:11 -08:00
Michael Jurka
5c5eff45e9
Pass argument to lock screen to show widget
...
after adding it
2012-11-06 16:22:04 -08:00
Michael Jurka
4119788b1b
Add widget previews to the key guard widget picker
...
Bug: 7381803
Change-Id: I86946b7d0d75f8a1f89120600be2513bdf9026f0
2012-11-06 15:14:03 -08:00
Michael Jurka
6deb028a9e
am b19c4ced
: am 701d8a0e
: am ab3472f5
: Supporting EXTRA_APPWIDGET_OPTIONS correctly
...
* commit 'b19c4ced11debd52313d9bfcb3b66dabba84b5b1':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
2012-11-06 12:48:24 -08:00
Michael Jurka
ab3472f594
Supporting EXTRA_APPWIDGET_OPTIONS correctly
2012-11-05 18:56:14 -08:00
Jim Miller
75d6191e1f
am 95b2db64
: am fd34f989
: Merge "Disable the "none" security selection in settings when there\'s only 1 user" into jb-mr1-lockscreen-dev
...
* commit '95b2db64d4197883739e4b1be5ece409583ceb36':
Disable the "none" security selection in settings when there's only 1 user
2012-11-05 15:38:26 -08:00
Jim Miller
fd34f98960
Merge "Disable the "none" security selection in settings when there's only 1 user" into jb-mr1-lockscreen-dev
2012-11-04 18:28:35 -08:00
Dianne Hackborn
eb6c6935f1
am b52e8ca6
: am 4de4061c
: Fix issue #7448596 : Can\'t uninstall app that was installed by another user
...
* commit 'b52e8ca60d28119ea5936245bd66edcd61c8da5e':
Fix issue #7448596 : Can't uninstall app that was installed by another user
2012-11-02 15:23:25 -07:00