PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,174 Commits 1 Branch 0 Tags
1aa938ea56aba25cb3118f4c87993c3e6fb44ba9
Commit Graph

11174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhihai Xu
1aa938ea56 am 97fb8dbb: am 3d74aeaa: Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev 
* commit '97fb8dbbe8473fb53e33d6bb844773f69be7d776':
  LE: Add support for the HID-over-GATT profile (3/3)
 2013-08-15 17:28:39 -07:00
Zhihai Xu
97fb8dbbe8 am 3d74aeaa: Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev 
* commit '3d74aeaa85285425fc5f20cf93f615a4ead6d2fd':
  LE: Add support for the HID-over-GATT profile (3/3)
 2013-08-15 17:24:54 -07:00
Zhihai Xu
3d74aeaa85 Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev 2013-08-16 00:22:33 +00:00
Lifu Tang
b2877651df am 5c12d789: am c3e9ac93: Linked the recent location apps to battery page 
* commit '5c12d789f520b5b9542c6826c521490a16aa9ee0':
  Linked the recent location apps to battery page
 2013-08-15 17:01:08 -07:00
Lifu Tang
5c12d789f5 am c3e9ac93: Linked the recent location apps to battery page 
* commit 'c3e9ac937a4ba948d47cbb83f6999af34fd00b65':
  Linked the recent location apps to battery page
 2013-08-15 16:59:25 -07:00
Andre Eisenbach
79f3384eaa LE: Add support for the HID-over-GATT profile (3/3) 
bug:8330048
Change-Id: I0999c3af999939aec88eba4c38bca4358c554e69
 2013-08-15 15:21:27 -07:00
Lifu Tang
c3e9ac937a Linked the recent location apps to battery page 
* Extracted BatteryStatsHelper from PowerUsageSummary

* Dropped the "pause" and "resume" method from the
RadioButtonPreference

* Opening battery usage page when the user clicks the recent location
apps item

Change-Id: I5a2d03271434765780154265976d8caa7f8060d8
 2013-08-15 14:49:08 -07:00
Lifu Tang
bde5225714 am adb9f2b9: am 5db411db: Merge "Shows "App Info" for system apps" into klp-dev 
* commit 'adb9f2b9929d4aa9086902f5976388ed61181674':
  Shows "App Info" for system apps
 2013-08-15 12:19:05 -07:00
Lifu Tang
adb9f2b992 am 5db411db: Merge "Shows "App Info" for system apps" into klp-dev 
* commit '5db411db9881ea9ec48f2a607b711d8daa74d1ca':
  Shows "App Info" for system apps
 2013-08-15 12:17:03 -07:00
Lifu Tang
5db411db98 Merge "Shows "App Info" for system apps" into klp-dev 2013-08-15 19:13:42 +00:00
Robert Greenwalt
1a1bec1a97 am 9e96c453: am a1fa7cef: am 1faefa06: Merge "Fix one NPE in tethering setting" 
* commit '9e96c453fb84ec4832bde217617958121947128b':
  Fix one NPE in tethering setting
 2013-08-15 07:21:07 -07:00
Robert Greenwalt
9e96c453fb am a1fa7cef: am 1faefa06: Merge "Fix one NPE in tethering setting" 
* commit 'a1fa7cef5d88d0f515efa07d0f7274c41fa6d712':
  Fix one NPE in tethering setting
 2013-08-15 07:19:36 -07:00
Robert Greenwalt
a1fa7cef5d am 1faefa06: Merge "Fix one NPE in tethering setting" 
* commit '1faefa06a3a742123af8ea5be5bbfb730db16c7c':
  Fix one NPE in tethering setting
 2013-08-15 07:17:11 -07:00
Robert Greenwalt
1faefa06a3 Merge "Fix one NPE in tethering setting" 2013-08-15 14:13:10 +00:00
Jianzheng Zhou
508c7c16ab Fix one NPE in tethering setting 
Once we not declare BT feature, go Setting->more->tethering
will trigger this NPE.

Change-Id: I4736e7bade261475acda74e26250a81452018ffa
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
 2013-08-15 14:34:52 +08:00
Lifu Tang
5d4e69a527 Shows "App Info" for system apps 
If a specific Uid contains only one package, we show the "App Info"
button, even if it's a system app

Change-Id: Ie39b6d90e62ae432c636d50729f0aa45405ce67c
 2013-08-14 17:25:12 -07:00
The Android Open Source Project
741b2b94c3 am c4cdd59e: (-s ours) Reconcile with klp-release - do not merge 
* commit 'c4cdd59e025e574a78c47bb6db83b31e46e66b04':
  Fix bug when sharing to bluetooth.
  Fix for TTS settings crash.
  Restriction pin changes.
  Remove Restrictions UI
  Add some missing fragments to the whitelist
  Potential fix for Settings instability on x-large.
  Fix accidental creation of restriction entry for required apps
  Fix broken strings in Settings
  Always allow formatting of physical storage.
  Guard against missing terminal app.
 2013-08-14 14:30:02 -07:00
The Android Open Source Project
c4cdd59e02 Reconcile with klp-release - do not merge 
Change-Id: Ibab39b9c65854cd80f8b125eace08eea87fb4a95
 2013-08-14 14:25:51 -07:00
Martijn Coenen
49583c9362 am 9995bcbc: am fcfd865d: Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev 
* commit '9995bcbc820a2ef923dd77b0dfa100b754c9efe6':
  NFC: Allow to get result from tap-pay default dialog.
 2013-08-14 09:02:30 -07:00
Martijn Coenen
9995bcbc82 am fcfd865d: Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev 
* commit 'fcfd865d5c1f2e20952d64196922840a63e83411':
  NFC: Allow to get result from tap-pay default dialog.
 2013-08-14 09:00:01 -07:00
Martijn Coenen
fcfd865d5c Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev 2013-08-14 15:58:07 +00:00
Martijn Coenen
e0a38911a3 NFC: Allow to get result from tap-pay default dialog. 
Change-Id: Ic9e88dca5577a4f553dca56e0ff387c1e96f2ed2
 2013-08-14 08:57:11 -07:00
The Android Automerger
278640ca83 merge in klp-release history after reset to klp-dev 2013-08-14 06:06:53 -07:00
Tom O'Neill
4a41f33c5a am 0574c26c: am cabe7e82: Merge "Settings app supports location settings injection" into klp-dev 
* commit '0574c26c36b1b760d80107fb4171cdcb642aabf1':
  Settings app supports location settings injection
 2013-08-13 17:37:55 -07:00
Tom O'Neill
0574c26c36 am cabe7e82: Merge "Settings app supports location settings injection" into klp-dev 
* commit 'cabe7e821886f560e2bff7d2528069308458dc98':
  Settings app supports location settings injection
 2013-08-13 17:34:20 -07:00
Tom O'Neill
cabe7e8218 Merge "Settings app supports location settings injection" into klp-dev 2013-08-14 00:30:30 +00:00
Maggie Benthall
d0e9f6ada3 Fix bug when sharing to bluetooth. 
Bug:10259347
Change-Id: I860a758333947c4207d7acda41e43b8bd1d671df
 2013-08-13 13:29:45 -07:00
Przemyslaw Szczepaniak
72f078a310 Fix for TTS settings crash. 
Play an example is wrongly enabled before TTS engine is initialized.

Bug: 10288565
Change-Id: I9204d8dda7f8de5c67aba2bb73b25589eeac5cef
 2013-08-13 13:29:35 -07:00
Maggie Benthall
b8bdd1a0c9 am fa6faf95: am cd3eb97c: Merge "Fix bug when sharing to bluetooth." into klp-dev 
* commit 'fa6faf95bc70fee95093f7c7bd1b6a540a95fe03':
  Fix bug when sharing to bluetooth.
 2013-08-13 10:05:36 -07:00
Maggie Benthall
fa6faf95bc am cd3eb97c: Merge "Fix bug when sharing to bluetooth." into klp-dev 
* commit 'cd3eb97ce57e9811cb7129d4d493a08480e9a56e':
  Fix bug when sharing to bluetooth.
 2013-08-13 10:04:09 -07:00
Maggie Benthall
cd3eb97ce5 Merge "Fix bug when sharing to bluetooth." into klp-dev 2013-08-13 17:00:25 +00:00
Przemyslaw Szczepaniak
2dc0e493ab am d92af47f: am 0e01f128: Fix for TTS settings crash. 
* commit 'd92af47f9369f50edac2d5c36f78aee4997bbe8d':
  Fix for TTS settings crash.
 2013-08-13 06:44:49 -07:00
Przemyslaw Szczepaniak
d92af47f93 am 0e01f128: Fix for TTS settings crash. 
* commit '0e01f128ab8a8525a4d3fd72980e468f4de1e56c':
  Fix for TTS settings crash.
 2013-08-13 06:43:09 -07:00
The Android Automerger
d4434eae68 merge in klp-release history after reset to klp-dev 2013-08-13 06:04:16 -07:00
Przemyslaw Szczepaniak
0e01f128ab Fix for TTS settings crash. 
Play an example is wrongly enabled before TTS engine is initialized.

Bug: 10288565
Change-Id: I9204d8dda7f8de5c67aba2bb73b25589eeac5cef
 2013-08-13 13:05:48 +01:00
Baligh Uddin
c3c89394fc am 3b3a8b09: (-s ours) am 0782e629: (-s ours) am 508997ad: (-s ours) am 728da455: (-s ours) am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE 
* commit '3b3a8b097225a5667e4ad69ac3fb9e6e1bf89f9c':
  Import translations. DO NOT MERGE
 2013-08-13 00:56:28 -07:00
Baligh Uddin
3b3a8b0972 am 0782e629: (-s ours) am 508997ad: (-s ours) am 728da455: (-s ours) am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE 
* commit '0782e6293bec6f51e5ecd23525f945823e5b4632':
  Import translations. DO NOT MERGE
 2013-08-13 00:53:52 -07:00
Baligh Uddin
b305ebe6db am 965d7569: (-s ours) am fff94ce8: (-s ours) am 08f1d439: (-s ours) am 05404105: (-s ours) Import translations. DO NOT MERGE 
* commit '965d756920d556d95178d48127ee14abcda85916':
  Import translations. DO NOT MERGE
 2013-08-13 00:51:57 -07:00
Baligh Uddin
0782e6293b am 508997ad: (-s ours) am 728da455: (-s ours) am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE 
* commit '508997ad0729e16eb04c475f9be3e33ca5ed60cf':
  Import translations. DO NOT MERGE
 2013-08-13 00:48:30 -07:00
Baligh Uddin
c41b1e93d0 am b142c946: (-s ours) am a45cd5a6: (-s ours) Import translations. DO NOT MERGE 
* commit 'b142c9462f138de363ea1f6c42eaf5884ff2b645':
  Import translations. DO NOT MERGE
 2013-08-13 00:47:30 -07:00
Baligh Uddin
965d756920 am fff94ce8: (-s ours) am 08f1d439: (-s ours) am 05404105: (-s ours) Import translations. DO NOT MERGE 
* commit 'fff94ce8cc24861de614bedb193e926e62179e04':
  Import translations. DO NOT MERGE
 2013-08-13 00:47:21 -07:00
Baligh Uddin
508997ad07 am 728da455: (-s ours) am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE 
* commit '728da4558087e5b3fe25fad7eedb4f5de5c4068f':
  Import translations. DO NOT MERGE
 2013-08-13 00:45:32 -07:00
Baligh Uddin
fff94ce8cc am 08f1d439: (-s ours) am 05404105: (-s ours) Import translations. DO NOT MERGE 
* commit '08f1d439c7a278b0cd9afd60f2ba41e846f40543':
  Import translations. DO NOT MERGE
 2013-08-13 00:44:04 -07:00
Baligh Uddin
b142c9462f am a45cd5a6: (-s ours) Import translations. DO NOT MERGE 
* commit 'a45cd5a60ef71e70c4d4530370f46766d517541a':
  Import translations. DO NOT MERGE
 2013-08-13 00:43:55 -07:00
Baligh Uddin
728da45580 am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE 
* commit '03ae9bf0e90c02ec1afcd13c9993d2d9672eb36f':
  Import translations. DO NOT MERGE
 2013-08-13 00:42:15 -07:00
Baligh Uddin
08f1d439c7 am 05404105: (-s ours) Import translations. DO NOT MERGE 
* commit '054041058f9706c95b3d72ca421fcb656ad59d1e':
  Import translations. DO NOT MERGE
 2013-08-13 00:42:11 -07:00
Tom O'Neill
e2921c9566 Settings app supports location settings injection 
- Partial fix for b/10287745

Change-Id: Ia5eb05670957125e70717c86a686a54b77b22455
 2013-08-12 16:22:48 -07:00
Maggie Benthall
3343d1aabb Fix bug when sharing to bluetooth. 
Bug:10259347
Change-Id: I860a758333947c4207d7acda41e43b8bd1d671df
 2013-08-12 18:40:45 -04:00
Baligh Uddin
f5ecf575da Import translations. DO NOT MERGE 
Change-Id: Id616ecb4c01bfd2a4ee8fa3199c3e2dfc0140f62
Auto-generated-cl: translation import
 2013-08-12 11:54:53 -07:00
Baligh Uddin
a45cd5a60e Import translations. DO NOT MERGE 
Change-Id: I6770486a959f0bd90fe6621ba8e6348f7f5381f0
Auto-generated-cl: translation import
 2013-08-12 11:51:11 -07:00