PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,880 Commits 1 Branch 0 Tags
c92af83b0c94eaf99f1c4d9675b39b4a73a958cc
Commit Graph

13880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
b4a50745f2 am c736f794: am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev 
* commit 'c736f794ac38b832b5ffde28502580a9b20b722b':
  DO NOT MERGE Remove extra fragment in captioning preferences
 2014-03-13 18:02:18 +00:00
Baligh Uddin
a60df014e2 am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '846f036ef15a2bea6c522e5b75b351b28c29953c':
  Import translations. DO NOT MERGE
 2014-03-13 17:19:21 +00:00
Dianne Hackborn
fa066b9c1a Merge "Bat stats: misc, percents are of battery drain." 2014-03-13 17:04:59 +00:00
Dianne Hackborn
17452d5238 Bat stats: misc, percents are of battery drain. 
Change-Id: I6f1fb6ff33f524fe76d519a6194fad67559193bd
 2014-03-13 09:51:19 -07:00
Baligh Uddin
255034803c am 7c35c10e: (-s ours) Import translations. DO NOT MERGE 
* commit '7c35c10ebcf53a25d2c9c5cf37c25b1d5b553d1c':
  Import translations. DO NOT MERGE
 2014-03-13 16:40:31 +00:00
Baligh Uddin
a28c64dd6c Merge "Import translations. DO NOT MERGE" 2014-03-13 16:37:47 +00:00
Przemyslaw Szczepaniak
7a5911a96d am 375545e2: am 6829c48c: Merge "Fix F/C in TTS settings" 
* commit '375545e2fe6da2c2ccae7239f444a92004213018':
  Fix F/C in TTS settings
 2014-03-13 15:35:41 +00:00
Przemyslaw Szczepaniak
375545e2fe am 6829c48c: Merge "Fix F/C in TTS settings" 
* commit '6829c48c36fceebb46989f8ee25c369fa5f7adeb':
  Fix F/C in TTS settings
 2014-03-13 15:32:48 +00:00
Przemyslaw Szczepaniak
6829c48c36 Merge "Fix F/C in TTS settings" 2014-03-13 15:26:49 +00:00
The Android Automerger
67cc90c3f6 merge in master-release history after reset to master 2014-03-13 05:50:51 -07:00
Alan Viverette
429720754d am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev 
* commit '0100a310d8184baf9576925d160f8af09aa93b10':
  DO NOT MERGE Add preference for caption text opacity
 2014-03-13 10:01:45 +00:00
Alan Viverette
c736f794ac am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev 
* commit 'a74da813ec622822c8bb8b4524439c81e8b90dfa':
  DO NOT MERGE Remove extra fragment in captioning preferences
 2014-03-13 10:01:42 +00:00
Shuhrat Dehkanov
f365216391 Fix F/C in TTS settings 
This is an attempt to fix uncaught MissingResourceException
that would be thrown if default language of selected engine is
set to a locale that has no 3-letter country/language code.

Please see https://code.google.com/p/android/issues/detail?id=63122

Change-Id: Iccb2a55f5f7a97819310fd888559650fe7febe4a
Signed-off-by: Shuhrat Dehkanov <k@efir.uz>
 2014-03-13 12:06:17 +09:00
Narayan Kamath
5877242019 am c776bbb1: Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""" 
* commit 'c776bbb1562b844297260790fd1a50382396a3f9':
  Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
 2014-03-13 01:55:25 +00:00
Fabrice Di Meglio
6c9e03fd6d More code cleaning 
- use var for context.getResources()
- rename var

Change-Id: I8b8b7ffdd2c83bdbec7a4f162757597032aa9fb0
 2014-03-12 17:19:39 -07:00
RoboErik
acfcf69b34 am 64beb278: (-s ours) am 0b71937d: am 5791cecc: b/12068020 Update calls to InputManager. Do not merge 
* commit '64beb278983aaa1dbd4115c50cc123be1b0ebc1a':
  b/12068020 Update calls to InputManager. Do not merge
 2014-03-12 23:04:48 +00:00
RoboErik
64beb27898 am 0b71937d: am 5791cecc: b/12068020 Update calls to InputManager. Do not merge 
* commit '0b71937d304d701fb0edc1cd3720bcadb264d9f9':
  b/12068020 Update calls to InputManager. Do not merge
 2014-03-12 21:15:48 +00:00
RoboErik
0b71937d30 am 5791cecc: b/12068020 Update calls to InputManager. Do not merge 
* commit '5791cecc9e0a4169c71b87696973441071e295c8':
  b/12068020 Update calls to InputManager. Do not merge
 2014-03-12 21:12:27 +00:00
Baligh Uddin
14cc7647cb am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '846f036ef15a2bea6c522e5b75b351b28c29953c':
  Import translations. DO NOT MERGE
 2014-03-12 20:40:19 +00:00
Fabrice Di Meglio
7cacc12009 Code cleaning - class names 
- use class names instead of their static string representation

Change-Id: I82ebfc087bc2bbadb9076c5750265bf400ff4224
 2014-03-12 13:19:34 -07:00
Fabrice Di Meglio
757450247d Merge "Add dynamic Preferences indexing" 2014-03-12 19:58:06 +00:00
RoboErik
5791cecc9e b/12068020 Update calls to InputManager. Do not merge 
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/400419/

This is part of work on making key layouts get saved per vendor/product
instead of per device. The corresponding change in fw is
https://googleplex-android-review.git.corp.google.com/#/c/399886/
This changes all uses of InputDevice descriptor to InputDeviceIdentifier.

Change-Id: I9072c5b5c822b73188a6c572945f87b4a7c03139
 2014-03-12 12:53:46 -07:00
Svetoslav
92915638d4 Merge "Remove unused fields and imports." 2014-03-12 19:49:18 +00:00
Svetoslav
177618fac5 Remove unused fields and imports. 
Change-Id: If95879a506a9657b3dd370a35c1060712dcb9e93
 2014-03-12 12:48:16 -07:00
Lifu Tang
d0e9b3f202 Merge "Re-register listener for the switch upon onResume" 2014-03-12 19:46:52 +00:00
Baligh Uddin
b4bc781699 Import translations. DO NOT MERGE 
Change-Id: I740417ae9fb2163d81b85ec337d2f1687ebb1a5f
Auto-generated-cl: translation import
 2014-03-12 12:08:43 -07:00
Baligh Uddin
7c35c10ebc Import translations. DO NOT MERGE 
Change-Id: Ide5d8c50abddb80d6e820777804ed8f0a2a93327
Auto-generated-cl: translation import
 2014-03-12 12:02:29 -07:00
Lifu Tang
1bb6c75cdf Re-register listener for the switch upon onResume 
- Fix b/13330300

Change-Id: I6a5f97c383913dd461ec30d4e30585d325287ccc
 2014-03-12 11:55:30 -07:00
Dan Sandler
39e9ab37b1 Merge "Finally, a place for notification settings." 2014-03-12 18:38:22 +00:00
Fabrice Di Meglio
5d702d90f3 Merge "Code refactoring" 2014-03-12 18:36:46 +00:00
Fabrice Di Meglio
b8dfbf1409 Add dynamic Preferences indexing 
- introduce a new private interface "Indexable".
- refactor Wallpaper and Wi-Fi settings to support this new
interface.
- only index saved/remembered Wi-Fi networks
- also add the capability to remove some data from the Index.

Fragments that want to publish some dynamic indexable data should
implement the "Indexable" interface and provide a static final field
named "INDEX_DATA_PROVIDER" with is the Indexable.IndexDataProvider
interface for providing the data for indexing.

Thru this interface the Index can ask what are the data chuncks to
index.

Change-Id: I31e7212c87b8218efe1a8f3028147cb19e119be6
 2014-03-12 11:34:59 -07:00
Dan Sandler
347f944a22 Finally, a place for notification settings. 
Consolidated under the new Notifications settings are:

  - Ringtone (from Sound)
  - Zen Mode (from Sound)
  - Pulse LED (from Display)
  - Heads-Up Notifications (from Display)
  - Notification Access (from Security)
  - Show when locked (from Security)

Change-Id: I214d03ba1e356e088323a3058d98d390b8a8f988
 2014-03-12 14:15:09 -04:00
Felipe Leme
f8d798631b Displays frequency on connected WiFi network info. 
Bug: 12767819

Change-Id: Ia71b28b1dd77bdabc53a3e91bd54375bdaebfe4a
 2014-03-12 10:50:12 -07:00
The Android Automerger
8a6f447fbf merge in master-release history after reset to master 2014-03-12 05:50:39 -07:00
Alan Viverette
23d01e0b4b am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev 
* commit '0100a310d8184baf9576925d160f8af09aa93b10':
  DO NOT MERGE Add preference for caption text opacity
 2014-03-11 23:05:19 +00:00
Alan Viverette
451994bf10 am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev 
* commit 'a74da813ec622822c8bb8b4524439c81e8b90dfa':
  DO NOT MERGE Remove extra fragment in captioning preferences
 2014-03-11 23:05:13 +00:00
Matthew Xie
4f9fa80d37 am 85fb88ee: Merge "HTML injection fix for bluetooth pairing, issue 65946" 
* commit '85fb88ee10c6bb901d30e50038b4a86252ff8c68':
  HTML injection fix for bluetooth pairing, issue 65946
 2014-03-11 18:16:34 +00:00
Narayan Kamath
ed44913789 am 7f1c81b7: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."" 
* commit '7f1c81b7b58a6a938494ed8f06d9fcf915226ba1':
  Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
 2014-03-11 18:16:11 +00:00
Narayan Kamath
01723221ff am 14b0da74: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED." 
* commit '14b0da749c73c1e0201adee1b398a1955b7d624e':
  Set 24 hour pref. with ACTION_TIME_CHANGED.
 2014-03-11 18:16:09 +00:00
Baligh Uddin
846f036ef1 am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '14b82fd73f59f51dffee9562057ab747f12134d3':
  Import translations. DO NOT MERGE
 2014-03-11 17:41:25 +00:00
Baligh Uddin
14b82fd73f Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-11 17:37:53 +00:00
Baligh Uddin
1c170dbecf Merge "Import translations. DO NOT MERGE" 2014-03-11 17:37:48 +00:00
Narayan Kamath
cce74886eb am 677f32b1: am d4cf5c55: am c776bbb1: Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""" 
* commit '677f32b1bb97b1c4f23af4315d401197b4857632':
  Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
 2014-03-11 15:21:11 +00:00
Narayan Kamath
677f32b1bb am d4cf5c55: am c776bbb1: Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""" 
* commit 'd4cf5c5578844ce9915aba178094313a9eeb8022':
  Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
 2014-03-11 15:17:28 +00:00
Narayan Kamath
d4cf5c5578 am c776bbb1: Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""" 
* commit 'c776bbb1562b844297260790fd1a50382396a3f9':
  Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
 2014-03-11 15:14:15 +00:00
Narayan Kamath
c776bbb156 Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""" 2014-03-11 15:07:14 +00:00
Narayan Kamath
0a2bc1cc76 Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."" 
This reverts commit 9ebc27c73e.

Change-Id: Id440bd004fee696472aeec9eefa5732755b19627
 2014-03-11 13:05:37 +00:00
The Android Automerger
38a6724b09 merge in master-release history after reset to master 2014-03-11 05:50:16 -07:00
Alan Viverette
0100a310d8 am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev 
* commit '8840aa4c406bf08bba186cf9e674033bd1b9a4c1':
  DO NOT MERGE Add preference for caption text opacity
 2014-03-11 02:15:28 +00:00
Alan Viverette
a74da813ec am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev 
* commit 'd43d5becb359cfdd5e30f691724739ab216011f0':
  DO NOT MERGE Remove extra fragment in captioning preferences
 2014-03-11 02:15:27 +00:00