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

9079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tony Guo
63c91f0973 Check if the Activity is finishing before showDialog() 
Check if the Activity is going through its finishing phase before
displaying the Dialog, because Showing dialog once the activity
is no longer in context will cause BadTokenException.

Change-Id: I58940e694f61cd79536abe2df60a0b745a7b806f
 2013-01-29 14:39:26 +01:00
Elliott Hughes
f141594c05 Merge "Correct check box visibility in Display / Brightness" 2012-12-19 16:11:15 -08:00
Benn Porscke
106cf669c1 Correct check box visibility in Display / Brightness 
The check box for "Automatic brightness" should not be visible in
Brightness screen if the product configuration
config_automatic_brightness_available in config.xml is set to false.

Change-Id: I0d81137723d0eacd97aa88bf08b69e12dd4d73fa
Signed-off-by: Benn Porscke <benn.porscke@stericsson.com>
 2012-12-18 10:38:41 +01:00
Amith Yamasani
0df6a2771d Merge "Grey out settings icon when it is in disabled state" 2012-12-12 09:12:47 -08:00
Elliott Hughes
e2d893e2af Merge "Makes the add button for new APNs appear in the action bar." 2012-12-08 09:55:09 -08:00
Wink Saville
49c4de7f13 Merge "Format change at "Mobile network type" value" 2012-12-06 08:51:22 -08:00
Akira Oshimi
1fd3544c55 Format change at "Mobile network type" value 
Remove "network type Number" from "mobile network type" value
at "About Phone > Status".

For example value "UNKNOWN:0" became "UNKNOWN"
(if value is "UNKNOWN", the word is localized)

The number ":0" did not add much value to the user.

Change-Id: Iee29fa2ab42f2d6eab5d9dbd6f647087ee382648
 2012-12-06 09:52:55 +01: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
The Android Open Source Project
19f09fb127 Merge jb-mr1-dev into aosp/master - do not merge 
Change-Id: I07ffd44995f02108e9a981fd590e7e29ff813e7f
 2012-11-27 08:21:40 -08: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
Baligh Uddin
4012997392 Import translations. DO NOT MERGE 
Change-Id: I21102fa6155368b3948a2606f9e30fde08b508b1
Auto-generated-cl: translation import
 2012-11-22 23:18:51 -08:00
Baligh Uddin
e71a8772bb Import translations. DO NOT MERGE 
Change-Id: I275d3bec8048e4da0d30b6deabc6966f6b0785fe
Auto-generated-cl: translation import
 2012-11-21 00:04:32 -08:00
Baligh Uddin
7ed1879f28 Import translations. DO NOT MERGE 
Change-Id: If48dc63e0112cc63e76b635047b38cde4b33ea06
Auto-generated-cl: translation import
 2012-11-16 15:51:59 -08:00
Baligh Uddin
add9d21f58 Import translations. DO NOT MERGE 
Change-Id: I4d8e15ea1297b2ec3efd3decd24629e4b6360e76
Auto-generated-cl: translation import
 2012-11-14 12:41:58 -08:00
Baligh Uddin
9cd44a18c7 am 3206fb2b: am 42d97684: am a0fbc220: Import translations. DO NOT MERGE 
* commit '3206fb2bb2fff97db47f1eeb3e0e0b7025f7fada':
  Import translations. DO NOT MERGE
 2012-11-09 22:45:13 -08:00
Baligh Uddin
3206fb2bb2 am 42d97684: am a0fbc220: Import translations. DO NOT MERGE 
* commit '42d976842081d3e40cdc68774573fedd90f21575':
  Import translations. DO NOT MERGE
 2012-11-09 22:42:02 -08:00
Baligh Uddin
0ae2c4225c am 7468d94e: Import translations. DO NOT MERGE 
* commit '7468d94e31301ba3e0accb15cc26cd47438e1642':
  Import translations. DO NOT MERGE
 2012-11-09 16:15:59 -08:00
Baligh Uddin
42d9768420 am a0fbc220: Import translations. DO NOT MERGE 
* commit 'a0fbc220bb401f97103a0a22d14a45e33ca7a149':
  Import translations. DO NOT MERGE
 2012-11-09 16:15:33 -08:00
Baligh Uddin
a0fbc220bb Import translations. DO NOT MERGE 
Change-Id: I520c6d173124c8645fdfa2eb3db251f704c656c3
Auto-generated-cl: translation import
 2012-11-09 11:53:40 -08:00
Baligh Uddin
7468d94e31 Import translations. DO NOT MERGE 
Change-Id: Ia83d3a7041a3af738961ccf10bc96d540bc1f147
Auto-generated-cl: translation import
 2012-11-09 11:51:15 -08:00
The Android Open Source Project
0c9b200b94 am fee1840f: am 15d91c6e: Reconcile with jb-mr1-release - do not merge 
* commit 'fee1840f3d6d68c5f3d4e4ab9372305e154c64a9':
 2012-11-08 15:47:52 -08:00
Michael Jurka
a5bb85e4f8 am 8bb938dc: am ffffbf40: am d9609fc0: Fix jank after adding a widget for lock screen 
* commit '8bb938dcc9a7d1c9f465439121171793fb405d14':
  Fix jank after adding a widget for lock screen
 2012-11-08 15:47:42 -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
Baligh Uddin
49be9660bf am 90ef462c: am 09256980: am c74ef2f2: am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '90ef462ca76a6c800feddc125badb6f483782b6e':
 2012-11-08 15:43:47 -08:00
Baligh Uddin
3522253c4c am c25bfc07: am 4f1a0932: am 7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'c25bfc07af873793abb19fe95295aa8bf0cd2ebc':
  Import translations. DO NOT MERGE
 2012-11-08 15:42:36 -08:00
The Android Open Source Project
349564e924 am c8c23821: am 1a37da3b: Reconcile with jb-mr1-release - do not merge 
* commit 'c8c238212ded8d4e774ad7cdc06de58626fedce2':
 2012-11-08 15:42:14 -08:00
The Android Open Source Project
fee1840f3d am 15d91c6e: Reconcile with jb-mr1-release - do not merge 
* commit '15d91c6e825d6529cf03478410c3ff92d8879b53':
 2012-11-08 14:22:21 -08:00
The Android Open Source Project
15d91c6e82 Reconcile with jb-mr1-release - do not merge 
Change-Id: Iaa26de823282e7aba1ec495c04de885dd5267982
 2012-11-08 14:19:27 -08:00
The Android Automerger
79bf08d246 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-08 13:54:19 -08:00
Michael Jurka
8bb938dcc9 am ffffbf40: am d9609fc0: Fix jank after adding a widget for lock screen 
* commit 'ffffbf400b528262ffee791a0c607a6d2affed72':
  Fix jank after adding a widget for lock screen
 2012-11-08 13:15:32 -08:00
Michael Jurka
80eed80e3b am caf13b22: am a108d9fc: Final tweaks to visuals of widget picker 
* commit 'caf13b22c072dc48ace4c53065c78fd0dac131ef':
  Final tweaks to visuals of widget picker
 2012-11-08 13:15:31 -08:00
Michael Jurka
ffffbf400b am d9609fc0: Fix jank after adding a widget for lock screen 
* commit 'd9609fc0a2be07e9100dbb83f3549dad1d9b3c51':
  Fix jank after adding a widget for lock screen
 2012-11-08 13:10:47 -08:00
Michael Jurka
caf13b22c0 am a108d9fc: Final tweaks to visuals of widget picker 
* commit 'a108d9fc0edd3b4f741fae595e35a246fbc700ff':
  Final tweaks to visuals of widget picker
 2012-11-08 13:10:46 -08:00
Baligh Uddin
8c062ff5c4 am c3876ebb: am f654e3bb: am 9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'c3876ebb450bd8fbba14d03bdf278243dc825c2d':
  Import translations. DO NOT MERGE
 2012-11-08 06:27:27 -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
e2d65f1d00 am 686e8287: am 02dd6c42: am c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev 
* commit '686e8287a0b3799aa75258676fc7546691e1a4df':
  Updated assets.
 2012-11-08 06:27:24 -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
Baligh Uddin
470d258efd am cbc0d030: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'cbc0d03093710961bd9abaf0e0f076a2da08ff7d':
  Import translations. DO NOT MERGE
 2012-11-08 06:26:53 -08:00
The Android Open Source Project
12fde8304f am a60f3ae7: am 5a051a7f: Reconcile with jb-mr1-release - do not merge 
* commit 'a60f3ae723844f72cf81ee442b3a9babf793f731':
 2012-11-08 06:12:41 -08:00
Baligh Uddin
90ef462ca7 am 09256980: am c74ef2f2: am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '09256980960cd5de7633f3a0f69cef2a676a6812':
 2012-11-07 18:34:44 -08:00
Baligh Uddin
0925698096 am c74ef2f2: am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'c74ef2f28b1b095ecb3dea78ff8d277daec84f58':
 2012-11-07 18:29:07 -08:00
Michael Jurka
d9609fc0a2 Fix jank after adding a widget for lock screen 
After adding a widget, you see a black flash, but
there's also a small sliver of wallpaper left
showing. This change covers up that small bit 
of wallpaper.

Bug: 7381803
 2012-11-07 16:54:46 -08:00
Michael Jurka
a108d9fc0e Final tweaks to visuals of widget picker 2012-11-07 15:32:23 -08:00
Baligh Uddin
c25bfc07af am 4f1a0932: am 7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '4f1a09320321cc758df1d33358e6353d3614bdb0':
  Import translations. DO NOT MERGE
 2012-11-07 11:53:29 -08:00
Baligh Uddin
c74ef2f28b am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7d6a0f9c8b9494e3b735ea98836ff3b826e11c8e':
  Import translations. DO NOT MERGE
 2012-11-07 11:51:32 -08:00
Baligh Uddin
4f1a093203 am 7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7d6a0f9c8b9494e3b735ea98836ff3b826e11c8e':
  Import translations. DO NOT MERGE
 2012-11-07 11:50:53 -08:00
Baligh Uddin
7d6a0f9c8b Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-07 11:49:24 -08:00