Narayan Kamath
76dcc66f4a
am c7bcddaa
: am 729c83a4
: am 7f1c81b7
: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
...
* commit 'c7bcddaa5ad2d6184ba296f53ed3c83f8f98f2b7':
Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
2014-02-27 12:09:00 +00:00
Narayan Kamath
c7bcddaa5a
am 729c83a4
: am 7f1c81b7
: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
...
* commit '729c83a4f8d7bdd02de2c9c3be1243985b042d5d':
Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
2014-02-27 12:06:36 +00:00
Narayan Kamath
729c83a4f8
am 7f1c81b7
: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
...
* commit '7f1c81b7b58a6a938494ed8f06d9fcf915226ba1':
Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
2014-02-27 12:05:07 +00:00
Narayan Kamath
7f1c81b7b5
Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
2014-02-27 12:00:22 +00:00
Narayan Kamath
9ebc27c73e
Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
...
This reverts commit d5d9d37361
.
Change-Id: I76eeb6f95a4cbbd241db1fb90528b4d91ddf7707
2014-02-27 12:00:08 +00:00
Narayan Kamath
8e09112517
am a5fbf748
: am ef3a0be9
: am 14b0da74
: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED."
...
* commit 'a5fbf748c1c92e5dd7ec69de71ed9bf371c11d19':
Set 24 hour pref. with ACTION_TIME_CHANGED.
2014-02-27 11:53:32 +00:00
Narayan Kamath
a5fbf748c1
am ef3a0be9
: am 14b0da74
: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED."
...
* commit 'ef3a0be922618334645b7f9b5e3ab719f3578b92':
Set 24 hour pref. with ACTION_TIME_CHANGED.
2014-02-27 11:50:09 +00:00
Narayan Kamath
ef3a0be922
am 14b0da74
: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED."
...
* commit '14b0da749c73c1e0201adee1b398a1955b7d624e':
Set 24 hour pref. with ACTION_TIME_CHANGED.
2014-02-27 11:46:48 +00:00
Narayan Kamath
14b0da749c
Merge "Set 24 hour pref. with ACTION_TIME_CHANGED."
2014-02-27 11:42:11 +00:00
Dianne Hackborn
3c741d2be8
Show new radio active times.
...
Change-Id: Id3b2d072df87dce5312a1e7b7d6a0012a1b5b19a
2014-02-26 15:53:47 -08:00
Baligh Uddin
273eebf1d6
Import translations. DO NOT MERGE
...
Change-Id: I2150ccd0a7620d9282f2944c648806eff6942b8c
Auto-generated-cl: translation import
2014-02-26 12:16:03 -08:00
The Android Automerger
92266ca7e7
merge in master-release history after reset to master
2014-02-26 09:59:37 -08:00
The Android Automerger
0df4a4799c
merge in master-release history after reset to master
2014-02-26 05:50:18 -08:00
Narayan Kamath
d5d9d37361
Set 24 hour pref. with ACTION_TIME_CHANGED.
...
Sent as a boolean extra EXTRA_TIME_PREF_24_HOUR_FORMAT.
Change-Id: I7fbd59eacdeb298d046da950d7045f0bab53b462
2014-02-26 13:43:32 +00:00
Fabrice Di Meglio
167f82de3a
Merge "Fix bug #13140648 Settings needs to support the new Quantum Paper theme"
2014-02-25 22:31:06 +00:00
Fabrice Di Meglio
0e2f949c90
Fix bug #13140648 Settings needs to support the new Quantum Paper theme
...
Second pass:
- use Theme Holo for the Drawer too
- add a temporary background for Drawer icons (so that they dont mix
with the Drawer background)
- remove the "More..." icon as it was not needed
This CL will show that there is a discrepancy into the Drawer icons
size (some are smaller than the standard size, some other bigger).
This issue will be fixed when the new set of Icons will be delivered
by the UX team.
Change-Id: I431882df9b98157e98a1b735f31d9e77ef846767
2014-02-25 14:26:27 -08:00
Dianne Hackborn
9050c57707
Merge "Rename unaccounted to unknown."
2014-02-25 19:08:09 +00:00
Fabrice Di Meglio
5b845d0ad7
Merge "Fix bug #13167668 stability-sys: Java crash in com.android.settings: ...java.lang.RuntimeException: Unable to destroy activity {com.android.settings/ com.android.settings.Settings}: java.lang.IllegalStateException: Can not perform this action after onSaveInstanceState"
2014-02-25 17:54:07 +00:00
Fabrice Di Meglio
a90ecd775e
Merge "Implement Holo Light Theme for Settings"
2014-02-25 17:53:05 +00:00
Baligh Uddin
1a666ff6e0
Merge "Import translations. DO NOT MERGE"
2014-02-25 17:21:04 +00:00
The Android Automerger
2335ddc954
merge in master-release history after reset to master
2014-02-25 05:50:35 -08:00
Fabrice Di Meglio
90f7a6e06e
Fix bug #13167668 stability-sys: Java crash in com.android.settings:
...
...java.lang.RuntimeException: Unable to destroy activity {com.android.settings/
com.android.settings.Settings}: java.lang.IllegalStateException:
Can not perform this action after onSaveInstanceState
- revert the change that was done by
https://googleplex-android-review.git.corp.google.com/#/c/148273/2
Also the OnItemClickListener has been changed since that time to cope
with the initial issue.
Change-Id: I0e3a44e6340f5576bb0f46d5a6c6a5824a44b406
2014-02-24 18:37:06 -08:00
Dianne Hackborn
8969f615f8
Rename unaccounted to unknown.
...
Change-Id: I8071c3046c69a5f513cfbec12bc0b8628194b30d
2014-02-24 18:16:12 -08:00
Alan Viverette
061333c26b
Remove toggle switch on accessibility preference fragment detach
...
BUG: 13169998
Change-Id: Id6bac95feb53fec7bb56e6af5c7f5e407e8eba55
2014-02-24 17:57:44 -08:00
Baligh Uddin
3c73af873c
Import translations. DO NOT MERGE
...
Change-Id: I1a0074c2f477113546c82437d8f07d43906cc859
Auto-generated-cl: translation import
2014-02-24 13:29:09 -08:00
Fabrice Di Meglio
dca2806a23
Implement Holo Light Theme for Settings
...
... and use Holo (Dark) Theme for the Drawer as requested by UX
Also remove the Wi-Fi and Bluetooth switches in the Drawer per
following UX specification.
Change-Id: I4fc17481255b5db337a887033bc831ded0d2d701
2014-02-24 13:03:32 -08:00
Dan Sandler
a6af10f82b
Merge "Settings>Security>Show notifications (on the lockscreen)."
2014-02-24 18:38:12 +00:00
Matthew Xie
b0477c3ccc
am 8e6a5d31
: am 27543d42
: am 0223f9c5
: Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change"
...
* commit '8e6a5d31344395ffce77caff217a90f5d0d25ab1':
Bluetooth: GAP: Cancel the pairing notification on bond state change
2014-02-24 14:32:13 +00:00
Matthew Xie
8e6a5d3134
am 27543d42
: am 0223f9c5
: Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change"
...
* commit '27543d42ff79b92e2ec3ddcbe970633b848231e8':
Bluetooth: GAP: Cancel the pairing notification on bond state change
2014-02-24 14:29:06 +00:00
Matthew Xie
27543d42ff
am 0223f9c5
: Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change"
...
* commit '0223f9c5ddfdbcd2c759d1b0cf289844ca0438c0':
Bluetooth: GAP: Cancel the pairing notification on bond state change
2014-02-24 14:25:28 +00:00
The Android Automerger
ff5c674255
merge in master-release history after reset to master
2014-02-24 05:52:10 -08:00
Przemyslaw Szczepaniak
9c8b3d47d6
Merge "Fix crash caused by failed TTS CheckVoiceData."
2014-02-24 11:45:13 +00:00
Dan Sandler
91d014a965
Settings>Security>Show notifications (on the lockscreen).
...
Allows the user to toggle
Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
which if set shows the complete private contents of that
user's notifications atop a securely locked screen. When
unset, only the "public" versions of notifications are shown
(which may include explicit redactions made by the app).
See f/b change I32bb7939 for details.
This checkbox is hidden for insecure keyguards ("off" and
"none"). It is also unavailable if
Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS is not set
(see f/b change I9c517949.)
Change-Id: Ie1b4c6b949b597b97e536d8ea7e35c9de9b6995f
2014-02-24 01:28:49 +00:00
Matthew Xie
0223f9c5dd
Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change"
2014-02-24 00:49:19 +00:00
Jeff Sharkey
dba5623a0b
am c3e8fd25
: am e0388230
: am 14136c7c
: Merge "Settings: Fix the memory leak in Settings"
...
* commit 'c3e8fd25997a70155497358d077e6c8fec6fe981':
Settings: Fix the memory leak in Settings
2014-02-21 17:28:39 +00:00
Jeff Sharkey
c3e8fd2599
am e0388230
: am 14136c7c
: Merge "Settings: Fix the memory leak in Settings"
...
* commit 'e0388230768168af31c26507b5889985daa93169':
Settings: Fix the memory leak in Settings
2014-02-21 17:26:29 +00:00
Jeff Sharkey
e038823076
am 14136c7c
: Merge "Settings: Fix the memory leak in Settings"
...
* commit '14136c7cdfee7525a97cfee6eec038994668b6a5':
Settings: Fix the memory leak in Settings
2014-02-21 17:21:48 +00:00
Jeff Sharkey
14136c7cdf
Merge "Settings: Fix the memory leak in Settings"
2014-02-21 17:17:22 +00:00
Przemyslaw Szczepaniak
574fb952a1
Fix crash caused by failed TTS CheckVoiceData.
...
Bug: 13112824
Change-Id: Idb46e499fc7982eb92b6ed1a88d7a0725896b4ef
2014-02-21 10:17:57 +00:00
Fabrice Di Meglio
351adbf35c
Merge "Fix bug #13058470 Cannot add account -- Settings app crashes"
2014-02-21 00:22:16 +00:00
Fabrice Di Meglio
74309ea53a
Fix bug #13058470 Cannot add account -- Settings app crashes
...
- revert back to an Activity instead of a fragment. This
is a straight reverse of the changes introduced for trying
to have a Fragment.
Basically ChooseAccountActivity was previously an Activity for
choosing an account type. If the list of account types was containing
only one item, then the ChooseAccountActivity was just a pass thru
and was falling back to the only account authority available.
In the current reported bug, this was happening by disabling the
Email app and thus having only the GoogleAuthenticator as an
Authority.
Then in the onCreate() the ChooseAccountFragment was seeing that
there was only one account authenticator and issuing a BACK button
press. Too bad, this was done into a non finished Fragment transaction
and leading to a crash.
All in all, we NEED to have an Activity and cannot use a Fragment
in that case.
Change-Id: I4a867a25fe9580929ec50a6775105adac1f88c52
2014-02-20 16:21:14 -08:00
Baligh Uddin
ef49311b77
am 8db86bc9
: (-s ours) am 1bb55f55
: (-s ours) am a9d878ef
: (-s ours) am af03def3
: (-s ours) am 63a354ee
: (-s ours) am d83484db
: (-s ours) Import translations. DO NOT MERGE
...
* commit '8db86bc9bc7265d067da92c22e54be98e42b833f':
Import translations. DO NOT MERGE
2014-02-20 23:15:41 +00:00
Baligh Uddin
8db86bc9bc
am 1bb55f55
: (-s ours) am a9d878ef
: (-s ours) am af03def3
: (-s ours) am 63a354ee
: (-s ours) am d83484db
: (-s ours) Import translations. DO NOT MERGE
...
* commit '1bb55f555fce1e83bcdc9d154dc6ff714b2a029b':
Import translations. DO NOT MERGE
2014-02-20 21:09:39 +00:00
Baligh Uddin
1bb55f555f
am a9d878ef
: (-s ours) am af03def3
: (-s ours) am 63a354ee
: (-s ours) am d83484db
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a9d878ef67f54c878cef0868767ed8e9a5b8c063':
Import translations. DO NOT MERGE
2014-02-20 21:06:07 +00:00
Baligh Uddin
a9d878ef67
am af03def3
: (-s ours) am 63a354ee
: (-s ours) am d83484db
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'af03def380ca594838ef6caff4f8c23dc78e821c':
Import translations. DO NOT MERGE
2014-02-20 21:02:54 +00:00
Baligh Uddin
af03def380
am 63a354ee
: (-s ours) am d83484db
: (-s ours) Import translations. DO NOT MERGE
...
* commit '63a354ee094f3e71773cbdd29359b5c28df2b9f0':
Import translations. DO NOT MERGE
2014-02-20 20:59:28 +00:00
Baligh Uddin
63a354ee09
am d83484db
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd83484dba0749e01cf80a85cd0d2648a79f9fdf4':
Import translations. DO NOT MERGE
2014-02-20 20:56:19 +00:00
Baligh Uddin
b52368fe37
Import translations. DO NOT MERGE
...
Change-Id: Idd6939c2d6ea42d687057848503456b4829bb0d6
Auto-generated-cl: translation import
2014-02-20 07:35:16 -08:00
Baligh Uddin
d83484dba0
Import translations. DO NOT MERGE
...
Change-Id: I96d7cdea504fe320dc1768f1e0dbae23d5901fbd
Auto-generated-cl: translation import
2014-02-20 07:23:08 -08:00
The Android Automerger
7eaf8807d1
merge in master-release history after reset to master
2014-02-20 05:50:08 -08:00