PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,559 Commits 1 Branch 0 Tags
b4fb63e4118a06a5bd260428824b73057d91946b
Commit Graph

4072 Commits

Author SHA1 Message Date
Daniel Sandler
b4fb63e411 am 8a8a265b: am aea3fbde: am 77ec6de1: Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev 
* commit '8a8a265b88bda03f0ccc221522e2f038aed9f1ff':
  Add android.settings.DREAM_SETTINGS for Daydream settings.
 2012-11-30 11:04:29 -08:00
Daniel Sandler
8a8a265b88 am aea3fbde: am 77ec6de1: Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev 
* commit 'aea3fbde280107738281f568cb1f4d860f50abfc':
  Add android.settings.DREAM_SETTINGS for Daydream settings.
 2012-11-30 11:02:23 -08:00
Daniel Sandler
77ec6de156 Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev 2012-11-30 10:58:04 -08:00
Evan Charlton
d781bcfc90 am a835f66e: am b71b78a4: am 6c269982: Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev 
* commit 'a835f66ec736b7c2cdf4ca433f70161ef2290359':
  Use plurals for the developer steps countdown
 2012-11-30 10:23:02 -08:00
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
Przemyslaw Szczepaniak
820dc4c910 Fix radio buttons when user cancel TTS engine change 
When user decides to change tts engine, and if it's not system one,
then he sees dialog warning about possibility of sending all kinds of
data to the engine.

If user chooses to not changes engine, radio button still sticks to the
new position.

This change delays all operations regarding changing current engine
after user closes dialog. It also unsets the radio button if user chooses
to cancel it.

Bug: 7628362
Change-Id: I977abe71b3547f2545a971fc0d69179be6fafb44
 2012-11-30 04:48:58 -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
364b17f1ec am 26a67fd1: am c5190506: am 0206284a: Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev 
* commit '26a67fd181bc22d1d922195f32c4760ef8d7c578':
  Fix Bluetooth enable dialog to match Android style guide.
 2012-11-29 14:37:20 -08:00
Dianne Hackborn
ed8342a559 am 8afda9ef: am ac4bfa60: am af604801: Merge "Be quiet!" into jb-mr1.1-dev 
* commit '8afda9efce141118425e2ee8b1dca7f2466cd525':
  Be quiet!
 2012-11-29 14:37:18 -08:00
Adam Cohen
a49c2bedd5 am 94cdb26c: am e38d6277: am 9067d57a: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '94cdb26c409f0b8b1bc0b80d485b93bd6720a7e8':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
 2012-11-29 14:37:17 -08:00
Irfan Sheriff
93bd7b1e8f Merge "Fix wifi compareTo" 2012-11-29 14:32:23 -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
Irfan Sheriff
07783ec67e Fix wifi compareTo 
Bug: 7521354
Change-Id: Icc09be305bebe2f82d252c44dac98ea4a723f245
 2012-11-29 14:10:20 -08:00
Jeff Sharkey
d05ad95709 Merge "Use uniform font size for APNs and timezones." 2012-11-28 23:34:10 -08:00
Jeff Sharkey
b16e151bea Merge "Avoid split action bar when it only has one item." 2012-11-28 23:33:41 -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
Jeff Sharkey
8b26346890 Use uniform font size for APNs and timezones. 
Also get rid of some orange highlight!

Bug: 7632945
Change-Id: I6a4b59f4eef81b128d128f5a429fb96f6366843a
 2012-11-28 17:41:16 -08:00
Jeff Sharkey
ccb3f8fcf1 Avoid split action bar when it only has one item. 
Bug: 7632944
Change-Id: I055564b4f8d2a3fc97346e13e1d8818196a8f988
 2012-11-28 17:09:19 -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
4ae21d17d9 am 81df8360: am 59ee3889: Merge "Settings: fix storage measurement for device without emulated sdcard" 
* commit '81df8360c9c27189445c69577f0f8f6f07e4b73b':
  Settings: fix storage measurement for device without emulated sdcard
 2012-11-28 13:06:25 -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
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
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
35a2d0fd09 am 4f103c0c: am ccc1d614: am 15c27bb4: Merge "fix dock audio enable dialog" into jb-mr1.1-dev 
* commit '4f103c0c1aed90e771b9f1d02b07ebb8b7780636':
  fix dock audio enable dialog
 2012-11-16 14:12:17 -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
775176cbb4 am 21b5aacf: am 0aa79c73: am 60977265: Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev 
* commit '21b5aacf34e5249b59cdbf0cc349fa2d604a25a4':
  Use AlarmManager calls to set date/time, instead of SystemClock.setTime
 2012-11-16 11:37:30 -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
Vikram Aggarwal
c7da73229e am 8761a053: am 49a87243: am f15f9d67: Merge "Remove back button entirely when disabled" into jb-mr1.1-dev 
* commit '8761a0536b618c3dd2711b26142469b6a6591423':
  Remove back button entirely when disabled
 2012-11-16 10:38:13 -08:00
Amith Yamasani
afbf58aab3 am f6c07cab: am 4c326c2d: am 940f6f0c: Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev 
* commit 'f6c07cab362219ef4457b9fc418c6e11e34b17e0':
  Fix a race condition when switching between settings panels
 2012-11-16 10:38:04 -08:00
Jeff Sharkey
62bafa5935 am 282aacb5: am 05407e77: am 733bd437: Merge "Internationalize bytes and percentages." into jb-mr1.1-dev 
* commit '282aacb5c372bf8beece536ce3b2510f87be59db':
  Internationalize bytes and percentages.
 2012-11-16 10:37:37 -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