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

9161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
a04497d70c am 5d376860: Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev 
* commit '5d376860e9c76c4026b824dfd4b4d295541f4fef':
  Avoid split action bar when it only has one item.  DO NOT MERGE.
 2012-11-29 18:00:36 -08:00
Jeff Sharkey
5d376860e9 Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev 2012-11-29 17:58:19 -08:00
Jake Hamby
fc6f304a9f am 48b6e21b: am 6e8644bc: Add string resource removed by previous commit. 
* commit '48b6e21b75a5da10e9840aa88f2789956483de87':
  Add string resource removed by previous commit.
 2012-11-29 16:19:15 -08:00
Jake Hamby
48b6e21b75 am 6e8644bc: Add string resource removed by previous commit. 
* commit '6e8644bcca75700757977be9fab1ffc501325c3e':
  Add string resource removed by previous commit.
 2012-11-29 16:17:08 -08:00
The Android Open Source Project
af8e106049 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I5f455c4d385b0d72a9539104b6390abb94042277
 2012-11-29 15:41:44 -08:00
Jake Hamby
6e8644bcca Add string resource removed by previous commit. 
The "bluetooth_permission_request" string resource was removed in
a previous commit, but is still referenced by a manifest element.
Add the original string resource to strings.xml.

Bug: 7641406
Change-Id: I9a41760c74d8a243ff5e8d2d7938f81207e75173
 2012-11-29 15:06:20 -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
c519050677 am 0206284a: Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev 
* commit '0206284a661b3370a175bb8c28c005aa6b45d9d3':
  Fix Bluetooth enable dialog to match Android style guide.
 2012-11-29 14:15:39 -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
The Android Automerger
f7f6e2c4bb merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-29 07:09:57 -08:00
Dianne Hackborn
ac4bfa607d am af604801: Merge "Be quiet!" into jb-mr1.1-dev 
* commit 'af6048010773606acf3a88df6954e1f7f3597a9f':
  Be quiet!
 2012-11-28 18:20:21 -08:00
Adam Cohen
e38d6277c8 am 9067d57a: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '9067d57a88e7bc43b7d1d0217b4b740f972bde47':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
 2012-11-28 18:18:26 -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
9067d57a88 Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 2012-11-28 17:47: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
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
The Android Open Source Project
2fb2c487c1 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I81ef334240c928353194c517a94bf5e052b54322
 2012-11-28 09:47:52 -08:00
John Spurlock
fb50353037 am 28c116f0: am fc4be385: Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev 
* commit '28c116f0c22c8a31a4053fa72a73eaa0f4cbf30e':
  Update a few dream setting strings to ease translation.
 2012-11-28 06:33:53 -08:00
John Spurlock
28c116f0c2 am fc4be385: Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev 
* commit 'fc4be3856f6e1cd47da742a2a30b322979a9ebd0':
  Update a few dream setting strings to ease translation.
 2012-11-28 06:31:50 -08:00
John Spurlock
fc4be3856f Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev 2012-11-28 06:30:29 -08:00
The Android Automerger
1abbe83607 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-27 15:34:56 -08:00
Baligh Uddin
b3724b305c am abd5b596: am 3236571f: am 42db418f: Import translations. DO NOT MERGE 
* commit 'abd5b596febe7c1920ce8f46e0e3355dd44a0b99':
  Import translations. DO NOT MERGE
 2012-11-27 14:26:47 -08:00
Baligh Uddin
d8cd1eda78 am 234ac63b: am 1e9f8d6f: Import translations. DO NOT MERGE 
* commit '234ac63beae7ea8d6612ab31ad7afc907d9d1c7b':
  Import translations. DO NOT MERGE
 2012-11-27 14:26:46 -08:00
Baligh Uddin
abd5b596fe am 3236571f: am 42db418f: Import translations. DO NOT MERGE 
* commit '3236571f4551bf20c4651ed9bc46380cd3ff8d67':
  Import translations. DO NOT MERGE
 2012-11-27 14:24:20 -08:00
Baligh Uddin
234ac63bea am 1e9f8d6f: Import translations. DO NOT MERGE 
* commit '1e9f8d6f5401105a3e78c28689f0be5a6b5f4072':
  Import translations. DO NOT MERGE
 2012-11-27 14:24:19 -08:00
Baligh Uddin
3236571f45 am 42db418f: Import translations. DO NOT MERGE 
* commit '42db418f963dfd200a75b518971c719215af352a':
  Import translations. DO NOT MERGE
 2012-11-27 14:23:27 -08:00
Baligh Uddin
45076f8eb1 am 20fbdbf1: Import translations. DO NOT MERGE 
* commit '20fbdbf1ec15ee7ec27ad288802a6474f54db8c2':
  Import translations. DO NOT MERGE
 2012-11-27 14:22:43 -08:00
Baligh Uddin
1e9f8d6f54 Import translations. DO NOT MERGE 
Change-Id: Ibe10143bc63383ced22f10c1b7d35f90424dcb2f
Auto-generated-cl: translation import
 2012-11-27 14:22:35 -08:00
Baligh Uddin
42db418f96 Import translations. DO NOT MERGE 
Change-Id: I5b887c229653be7d975d36f96b2cdc66ebb498a9
Auto-generated-cl: translation import
 2012-11-27 14:21:30 -08:00
Baligh Uddin
20fbdbf1ec Import translations. DO NOT MERGE 
Change-Id: Icfe4b7b706f7ca8889a519688c222e35ecc5fb4e
Auto-generated-cl: translation import
 2012-11-27 14:20:22 -08:00
The Android Open Source Project
86b76b214a am 19f09fb1: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge 
* commit '19f09fb127cd193023fe518f4fe3ae890c1b52d4':
 2012-11-27 08:24:23 -08: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
The Android Open Source Project
346f5a481b Reconcile with jb-mr1.1-release - do not merge 
Change-Id: If815fb1e8d064c7abb53ef05b81bb1495cfb7b2c
 2012-11-27 07:43:37 -08:00
John Spurlock
8a9edfb1e3 Update a few dream setting strings to ease translation. 
Clarify that sleep = asleep and charging as we do in the ui.

Bug: 7564443
Change-Id: Id50938d6d4052fd4223e212125d10f4bfd0c6908
 2012-11-27 10:20:08 -05:00
The Android Automerger
2f9011a1b1 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-26 12:23:08 -08:00
The Android Automerger
4fb0c131fc merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-26 11:29:21 -08:00
Baligh Uddin
6033181019 am b1fdf6fd: am 75e09c30: am 40129973: (-s ours) Import translations. DO NOT MERGE 
* commit 'b1fdf6fd74036a9f83adfaae93ee6b3e89481d35':
  Import translations. DO NOT MERGE
 2012-11-26 09:40:09 -08:00
Baligh Uddin
b1fdf6fd74 am 75e09c30: am 40129973: (-s ours) Import translations. DO NOT MERGE 
* commit '75e09c30a1b1eededc615d6dca319aab8ce40d2e':
  Import translations. DO NOT MERGE
 2012-11-26 09:38:44 -08:00
Baligh Uddin
de241adbd3 am 089773ba: am 16a4c2b2: Import translations. DO NOT MERGE 
* commit '089773bacbc41032f85c02259d5bdb5f89502cce':
  Import translations. DO NOT MERGE
 2012-11-26 09:37:38 -08:00
Baligh Uddin
75e09c30a1 am 40129973: (-s ours) Import translations. DO NOT MERGE 
* commit '401299739295b2305707810bbae2e49eadac50ba':
  Import translations. DO NOT MERGE
 2012-11-26 09:35:59 -08:00
Baligh Uddin
089773bacb am 16a4c2b2: Import translations. DO NOT MERGE 
* commit '16a4c2b2d38e2da6b26fc72029f9de0a1e282295':
  Import translations. DO NOT MERGE
 2012-11-26 09:35:10 -08:00
Baligh Uddin
ee6199cc93 am e1dade77: Import translations. DO NOT MERGE 
* commit 'e1dade77d86201cfc513b400b70f7dc5a7bc127b':
  Import translations. DO NOT MERGE
 2012-11-26 09:31:28 -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
16a4c2b2d3 Import translations. DO NOT MERGE 
Change-Id: Ibdf26abbd3f779772241bddcaa321ef7cec0d19b
Auto-generated-cl: translation import
 2012-11-22 23:19:57 -08:00