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

13519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
e4255d3c3b am af87ce09: am 04119285: am cb8a5354: am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide" 
* commit 'af87ce09915ae1b5cc3c3a46ab9fb241df1be13d':
  'When to daydream' dialog does not follow the JB dialog design guide
 2014-01-28 15:52:03 +00:00
John Spurlock
af87ce0991 am 04119285: am cb8a5354: am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide" 
* commit '041192855ed8b025246578d80f0b372bf346a2f1':
  'When to daydream' dialog does not follow the JB dialog design guide
 2014-01-28 15:48:12 +00:00
John Spurlock
041192855e am cb8a5354: am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide" 
* commit 'cb8a53541ec142ee5d57f163496583518ddb5c6e':
  'When to daydream' dialog does not follow the JB dialog design guide
 2014-01-28 15:44:53 +00:00
John Spurlock
cb8a53541e am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide" 
* commit '3f0f02b94e5be6724659f860aef5e637ff61d3aa':
  'When to daydream' dialog does not follow the JB dialog design guide
 2014-01-28 15:40:45 +00:00
John Spurlock
3f0f02b94e Merge "'When to daydream' dialog does not follow the JB dialog design guide" 2014-01-28 14:03:41 +00:00
The Android Automerger
af2a9992d7 merge in master-release history after reset to master 2014-01-28 05:50:18 -08:00
Baligh Uddin
a101937354 Import translations. DO NOT MERGE 
Change-Id: I675d41b04b76436681f56c81ffa8986dfda5dfaf
Auto-generated-cl: translation import
 2014-01-27 12:13:36 -08:00
The Android Automerger
0c2e120ffb merge in master-release history after reset to master 2014-01-27 05:50:50 -08:00
Dianne Hackborn
f87420af4c Merge "Update to follow per-version proc stats change." 2014-01-24 23:30:59 +00:00
Dianne Hackborn
627b4e2eb5 Merge "Battery: report calculated power, tweak signal strength colors." 2014-01-24 02:02:08 +00:00
Dianne Hackborn
ab89566e82 Update to follow per-version proc stats change. 
Change-Id: Iea44f1c7e9bd59a2eeaa1739bbaa5c0bdc349b0b
 2014-01-23 17:59:49 -08:00
Baligh Uddin
e22559c5f5 Import translations. DO NOT MERGE 
Change-Id: Id0ec338a7ae2f850b102eff2f2a5f8df5cc0e493
Auto-generated-cl: translation import
 2014-01-23 10:03:30 -08:00
Per Allard
6251d707b1 'When to daydream' dialog does not follow the JB dialog design guide 
The dialog is a single selection popup and according to the
dialogs design guide the popup should close when the user
has make his/her choice, but in this case it does not.

Change-Id: Iac6bc19146a88236d3253d2d846212ce09b4925b
 2014-01-23 18:15:56 +09:00
Dianne Hackborn
18083b1eb7 Battery: report calculated power, tweak signal strength colors. 
BatteryHistoryHelper now computes the total power to be the total
including the unaccounted, so we don't go > 100%.  However for the
unaccounted/over-counted details, we want to report the actual
computed amount.  Use a new API to do this.

Also tweak the signal strength colors so that the "no signal" state
is stronger, by being reddish instead of bright yellow.

Change-Id: I6af9fbcce8c3324883db0184f7ac215cb41b6230
 2014-01-22 14:18:39 -08:00
Dave Daynard
a3c0a535d1 Allow tablets to send SMS if enabled in device overlays (1/2) 
Change-Id: I51771c28415352ee0838fa1507a1461c652d56e8
 2014-01-20 12:29:56 -05:00
The Android Automerger
7d666967d1 merge in master-release history after reset to master 2014-01-20 05:50:31 -08:00
Wei Wang
e179bb0133 Merge "Fix misspell of "otherdevices"" 2014-01-16 23:26:57 +00:00
Wei Wang
aa6e665a02 Fix misspell of "otherdevices" 
Bug: 12569650

Change-Id: I2c75ddfed22ded6a15291956c0c167acf6d67b0b
 2014-01-16 22:13:38 +00:00
The Android Automerger
e73a613d1c merge in master-release history after reset to master 2014-01-16 05:50:22 -08:00
Dianne Hackborn
c140590060 Merge "Switch to BatteryStatsHelper implementation in the framework." 2014-01-16 01:39:22 +00:00
Geoff Mendal
df062746f9 Merge "Import translations. DO NOT MERGE" 2014-01-16 00:59:05 +00:00
Dianne Hackborn
7c80af410b Switch to BatteryStatsHelper implementation in the framework. 
Change-Id: I3ad051e029885af70a6bd14a1351b32860ba565d
 2014-01-15 16:24:28 -08:00
Fabrice Di Meglio
56ba582647 Merge "More code cleaning (missing items)" 2014-01-16 00:06:46 +00:00
Geoff Mendal
fda2b12fea Import translations. DO NOT MERGE 
Change-Id: I7aa8da8f75c22a70283b7125d993c3e38164cf4e
Auto-generated-cl: translation import
 2014-01-15 13:20:24 -08:00
Selim Gurun
617e0897ee Merge "Display certificate chain" 2014-01-15 19:46:24 +00:00
The Android Automerger
d0fca8ae0c merge in master-release history after reset to master 2014-01-15 05:50:45 -08:00
Wei Wang
ab4029665b Merge commit 'f4f8d9f3' into manualmerge 
Conflicts:
	res/values/strings.xml

Change-Id: Ifbcd6ef2447dbb95aab0ed1971f63a16ecf8035c
 2014-01-14 23:42:41 -08:00
Wei Wang
eeb60f9473 Merge commit 'fc8d2556' into manualmerge 
Conflicts:
	res/values/strings.xml

Change-Id: Ia2a4480d13f5afae7ecef321dadf5c4686907d99
 2014-01-14 22:33:21 -08:00
Wei Wang
f4f8d9f346 BLE peripheral mode (4/4): Settings change for advertising preference. 
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
 2014-01-14 18:06:42 -08:00
Wei Wang
fc8d255671 Add ble settings strings. 
Change-Id: If8685aac2f36f56a534f3ba47b1cc60fed88a8a3
 2014-01-14 18:06:32 -08:00
Wei Wang
c0af0c4633 Merge "BLE peripheral mode (4/4): Settings change for advertising preference." 2014-01-15 01:43:37 +00:00
Fabrice Di Meglio
a3d0158ff6 More code cleaning (missing items) 
- corrected the missed "switch_" variable naming
- optimize imports more

Change-Id: I8501c99d65e91f26fc56f589e02a1fd1be3d81a3
 2014-01-14 16:32:10 -08:00
Fabrice Di Meglio
d45cf417bc Merge "More code cleaning" 2014-01-14 22:23:50 +00:00
Fabrice Di Meglio
ad38a88b95 More code cleaning 
- remove some dead code
- better variable naming
- add debug log for exception
- clean some unused imports

Change-Id: Iec4239a7e75f29d860f286ab089e748e8a672281
 2014-01-14 14:04:04 -08:00
The Android Automerger
0a0f10462c merge in master-release history after reset to master 2014-01-14 05:50:43 -08:00
Jun Su
f3a9578910 Fix memory leak in ManageApplication 
ApplicationsAdapter new a Session member and make it has a reference to
it self. If we don't release it explicitly, the cross reference will
cause memory leak.

Change-Id: Iecce35ae1d56d98cee6347e84d3a3ff57f3b15a5
 2014-01-14 03:47:01 +00:00
Dianne Hackborn
4792823f71 Merge "Add "unaccounted" item to battery use UI." 2014-01-14 01:52:12 +00:00
Wei Wang
eb56b9ccb8 BLE peripheral mode (4/4): Settings change for advertising preference. 
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
 2014-01-13 17:41:02 -08:00
Dianne Hackborn
5b6f59a072 Add "unaccounted" item to battery use UI. 
Kind-of informative.

Change-Id: I10d2ee1ad8fe598a1ce1989df6628da11b82d906
 2014-01-13 17:40:50 -08:00
Andres Morales
96b0b43a8a Merge "Reduce timeout of dismissing pairing dialog on success" 2014-01-14 00:26:37 +00:00
Geoff Mendal
dde5db16b9 Import translations. DO NOT MERGE 
Change-Id: I0637da71be16cac3c7f383840b4ad293e13dcf0e
Auto-generated-cl: translation import
 2014-01-13 14:04:01 -08:00
The Android Automerger
d5e430ef62 merge in master-release history after reset to master 2014-01-13 05:50:18 -08:00
Jeff Sharkey
6235eb5466 am ba646e3a: am 0cd68e04: am 859909fe: am b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor" 
* commit 'ba646e3af11db80936ad9f8df20deb7a318ed46a':
  Fix null pointer exceptions in NetworkPolicyEditor
 2014-01-10 23:16:22 +00:00
Jeff Sharkey
ba646e3af1 am 0cd68e04: am 859909fe: am b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor" 
* commit '0cd68e04a9f74aa5afc3e843db498568dd5fa173':
  Fix null pointer exceptions in NetworkPolicyEditor
 2014-01-10 23:14:20 +00:00
Jeff Sharkey
0cd68e04a9 am 859909fe: am b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor" 
* commit '859909fee87d4dab6964977834a780acfd2310b2':
  Fix null pointer exceptions in NetworkPolicyEditor
 2014-01-10 23:11:35 +00:00
Jeff Sharkey
859909fee8 am b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor" 
* commit 'b5377a7165a1f09c3cbd5c76f5a5745f6efc28e5':
  Fix null pointer exceptions in NetworkPolicyEditor
 2014-01-10 15:08:40 -08:00
Jeff Sharkey
b5377a7165 Merge "Fix null pointer exceptions in NetworkPolicyEditor" 2014-01-10 23:04:31 +00:00
Fabrice Di Meglio
57a7329cf6 Merge "Code cleaning for removing dual pane meta data as it is no more used" 2014-01-10 22:23:50 +00:00
Jorim Jaggi
5f37dda3d8 Merge "Remove outdated custom background for password field." 2014-01-10 02:15:15 +00:00
The Android Automerger
02aba0448a merge in master-release history after reset to master 2014-01-09 05:50:26 -08:00