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

9559 Commits

This Branch
This Branch
All Branches
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
aea3fbde28 am 77ec6de1: Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev 
* commit '77ec6de156c52edbda95894a609cc43dcd29e454':
  Add android.settings.DREAM_SETTINGS for Daydream settings.
 2012-11-30 11:00:17 -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
b71b78a4d4 am 6c269982: Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev 
* commit '6c269982f3b188b5d7f70fcb670ab191b39b2689':
  Use plurals for the developer steps countdown
 2012-11-30 10:18:27 -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
Baligh Uddin
4745ccf1ae am df0c7e76: (-s ours) am 918c847d: am 43635081: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'df0c7e76014c0765e764da6dbfc2a08309ac6018':
  Import translations. DO NOT MERGE
 2012-11-29 21:29:10 -08:00
Baligh Uddin
bf6711a033 am e5187da9: (-s ours) am 4d9ba011: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'e5187da9cc678c42fe6cc7eb644d1042be0c7eb4':
  Import translations. DO NOT MERGE
 2012-11-29 21:27:45 -08:00
Baligh Uddin
df0c7e7601 am 918c847d: am 43635081: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '918c847dacbc52af3c1f438318bc1bb3ce9ceed8':
  Import translations. DO NOT MERGE
 2012-11-29 21:27:44 -08:00
Baligh Uddin
918c847dac am 43635081: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '436350817f550819a3bf514c9ea74e12a1fbb2e8':
  Import translations. DO NOT MERGE
 2012-11-29 21:25:46 -08:00
Baligh Uddin
e5187da9cc am 4d9ba011: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '4d9ba0114a4c5e3b54be65bee667ce3c3f06415e':
  Import translations. DO NOT MERGE
 2012-11-29 21:25:14 -08:00
Baligh Uddin
14b2999be7 Merge "Import translations. DO NOT MERGE" 2012-11-29 21:24:09 -08:00
Baligh Uddin
436350817f Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-29 21:23:45 -08:00
Baligh Uddin
4d9ba0114a Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-29 21:23:28 -08:00
Jeff Sharkey
ffcb4abdab am 12960527: (-s ours) am 90dbd693: am 39b7bd8c: Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev 
* commit '129605270a81e51e730394682cc035b78b4e86a5':
  Use uniform font size for APNs and timezones. DO NOT MERGE.
 2012-11-29 18:04:53 -08:00
Jeff Sharkey
0bff9dd663 am 2f12147e: (-s ours) am a04497d7: am 5d376860: Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev 
* commit '2f12147e91ecdf3d8d36e1f0d82be85f69d735db':
  Avoid split action bar when it only has one item.  DO NOT MERGE.
 2012-11-29 18:04:52 -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
90dbd6936c am 39b7bd8c: Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev 
* commit '39b7bd8cbcd4413e8ab4dae5caa2b34f38530c95':
  Use uniform font size for APNs and timezones. DO NOT MERGE.
 2012-11-29 18:00:37 -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
39b7bd8cbc Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev 2012-11-29 17:58:24 -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
9bdc5d10ab am fc6f304a: am 48b6e21b: am 6e8644bc: Add string resource removed by previous commit. 
* commit 'fc6f304a9f5312bc0dde0ecfd93a301d0a5c6a99':
  Add string resource removed by previous commit.
 2012-11-29 16:21: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
51d595c0fc am af8e1060: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit 'af8e106049f7993f9c2f4e008eb6973f37dd3215':
 2012-11-29 15:44:32 -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
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
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
Irfan Sheriff
07783ec67e Fix wifi compareTo 
Bug: 7521354
Change-Id: Icc09be305bebe2f82d252c44dac98ea4a723f245
 2012-11-29 14:10:20 -08:00
Baligh Uddin
487cbe77f5 Import translations. DO NOT MERGE 
Change-Id: I467462136cb69c37a596f3c91dc4cd16a08fa409
Auto-generated-cl: translation import
 2012-11-29 11:08:28 -08:00
Baligh Uddin
8092adf3a9 Import translations. DO NOT MERGE 
Change-Id: I89608bcb397958bf76472adb67ec1402f4a3ed5c
Auto-generated-cl: translation import
 2012-11-29 11:05:49 -08:00
Baligh Uddin
9768cfb7df Import translations. DO NOT MERGE 
Change-Id: I42cd557944ae8f5f2da42603328eee04f5e6b25c
Auto-generated-cl: translation import
 2012-11-29 11:04:26 -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
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
ac4bfa607d am af604801: Merge "Be quiet!" into jb-mr1.1-dev 
* commit 'af6048010773606acf3a88df6954e1f7f3597a9f':
  Be quiet!
 2012-11-28 18:20:21 -08:00