PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,322 Commits 1 Branch 0 Tags
8302df1804130203f3f7a46ba27b3c598c7c110c
Commit Graph

7322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
b9d64539b2 am f62df931: am 8e1981cc: Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev 
* commit 'f62df931faefaece80059af39742f123e8d7f4e9':
  Show full summary for network location sercice even for wifi-only devices
 2012-06-19 16:03:33 -07:00
Amith Yamasani
f62df931fa am 8e1981cc: Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev 
* commit '8e1981ccd314bf3e41601314e78cc9626a4299af':
  Show full summary for network location sercice even for wifi-only devices
 2012-06-19 16:01:50 -07:00
Eric Fischer
5ad50ac860 Import translations. DO NOT MERGE 
Change-Id: I097248fa64ec4f5d75ca4ddda3a17d49c29647a7
 2012-06-19 16:01:49 -07:00
Amith Yamasani
8e1981ccd3 Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev 2012-06-19 15:59:48 -07:00
Amith Yamasani
1270eb5e43 Show full summary for network location sercice even for wifi-only devices 
Bug: 6694051
Change-Id: Ic2446aa640bc2688fd74885eeb55f179c51e7691
 2012-06-19 10:53:49 -07:00
The Android Open Source Project
0f734f8ee2 am 21fbab8d: Reconcile with jb-release 
* commit '21fbab8d3195b3accc70bfbd68a38b94ce8dd497':
 2012-06-19 07:20:39 -07:00
The Android Open Source Project
21fbab8d31 Reconcile with jb-release 
Change-Id: I2b3e50f3304a3e5bd0e23e70b30db6e10d546f1c
 2012-06-19 07:16:04 -07:00
The Android Automerger
7116f061f6 merge in jb-release history after reset to jb-dev 2012-06-19 07:05:23 -07:00
The Android Open Source Project
e5f002f651 am ab1ae4c7: Reconcile with jb-release 
* commit 'ab1ae4c7c6a00acf922bbb9520b0cec881079163':
 2012-06-19 06:16:13 -07:00
The Android Open Source Project
ab1ae4c7c6 Reconcile with jb-release 
Change-Id: Ia9498cdf747581bb837e57129b89c4f1e6e15a6f
 2012-06-19 06:13:55 -07:00
Ying Wang
e9f37316ab am 922eed65: (-s ours) am fae5978e: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '922eed658a954c35cb3bef6f8986f7ac4f9451c5':
  Import translations. DO NOT MERGE
 2012-06-18 14:55:09 -07:00
Ying Wang
922eed658a am fae5978e: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'fae5978e4a89aa2b8e6a9e1cf95c910a0609923a':
  Import translations. DO NOT MERGE
 2012-06-18 14:53:11 -07:00
Ying Wang
fae5978e4a Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-18 14:51:26 -07:00
Ying Wang
ac9c4c24f8 Merge "Import translations. DO NOT MERGE" 2012-06-18 14:51:13 -07:00
Ying Wang
ce670cbe91 Import translations. DO NOT MERGE 
Change-Id: I899bf73fbcdeb84593fafd2b29953577034458e5
 2012-06-18 14:44:02 -07:00
Ying Wang
be4ac92791 Import translations. DO NOT MERGE 
Change-Id: I8ba16c5a7895850d429ae355bf2c27e384bb248e
 2012-06-18 14:40:20 -07:00
Jim Miller
c14422ce96 am 4a3435f8: am 284c9872: Merge "Fix 6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev 
* commit '4a3435f86ee0dda6b824810ce439509cb61a8721':
  Fix 6663465: remove flagNoEnterAction in favor of actionNext
 2012-06-18 13:23:25 -07:00
Jim Miller
4a3435f86e am 284c9872: Merge "Fix 6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev 
* commit '284c9872cea3a5d97e1b1dd0016ac376da695175':
  Fix 6663465: remove flagNoEnterAction in favor of actionNext
 2012-06-18 13:22:05 -07:00
Jim Miller
284c9872ce Merge "Fix 6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev 2012-06-18 13:19:42 -07:00
Dianne Hackborn
29c749b653 am 2027328c: am 4d8dac07: Merge "Implement issue #6633077: Improve permissions display for..." into jb-dev 
* commit '2027328c7bca44ff6a0dc8c2ff64a8af052f4ea2':
  Implement issue #6633077: Improve permissions display for...
 2012-06-18 10:52:33 -07:00
Dianne Hackborn
dba120535f am fe5a72da: am ed99a81e: Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev 
* commit 'fe5a72dae2e7abc985b90641945e754492a20b67':
  Fix issue #6664140: Time to lock should work even Stay awake...
 2012-06-18 10:52:33 -07:00
Ying Wang
02638f106e am 7622ce29: (-s ours) am 9d6d89ef: Import translations. DO NOT MERGE 
* commit '7622ce295543b9275fd18da1e2b66f8dff448d33':
  Import translations. DO NOT MERGE
 2012-06-18 10:52:32 -07:00
Dianne Hackborn
2027328c7b am 4d8dac07: Merge "Implement issue #6633077: Improve permissions display for..." into jb-dev 
* commit '4d8dac0792ec7994f9f4cbf2648cf8f3185876ca':
  Implement issue #6633077: Improve permissions display for...
 2012-06-18 10:33:07 -07:00
Dianne Hackborn
fe5a72dae2 am ed99a81e: Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev 
* commit 'ed99a81e1595c25d7070866ee0c2aa1d94103955':
  Fix issue #6664140: Time to lock should work even Stay awake...
 2012-06-18 10:33:00 -07:00
Ying Wang
7622ce2955 am 9d6d89ef: Import translations. DO NOT MERGE 
* commit '9d6d89ef82f07ef54238699619d4875c4f2ae833':
  Import translations. DO NOT MERGE
 2012-06-18 10:32:07 -07:00
The Android Automerger
135eb8bb2b merge in jb-release history after reset to jb-dev 2012-06-16 07:04:45 -07:00
Jim Miller
feeafe2e79 Fix 6663465: remove flagNoEnterAction in favor of actionNext 
This fixes a bug where the return key was showing in some layouts
for choose/confirm password screens in Settings.  Now we just use
"actionNext" which ensures we see consistent behavior across
devices.

Change-Id: I4bf3033654b85f14c55de6f418caaf1ce563c33a
 2012-06-15 17:56:49 -07:00
Dianne Hackborn
4d8dac0792 Merge "Implement issue #6633077: Improve permissions display for..." into jb-dev 2012-06-15 17:53:40 -07:00
Dianne Hackborn
ed99a81e15 Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev 2012-06-15 17:23:55 -07:00
Dianne Hackborn
f34a8d7517 Fix issue #6664140: Time to lock should work even Stay awake... 
...in Developer options is on

Disable the stay awake while on option in settings if a lock limit
is being enforced.

Bug: 6664140
Change-Id: I8da1b8c734ceef10662d33392609c35e645315c3
 2012-06-15 17:07:14 -07:00
Nick Pelly
239f56ff91 Merge "Include WIFI scan time in per-application power usage summary." 2012-06-15 16:56:06 -07:00
Nick Pelly
cafe527dcd Include WIFI scan time in per-application power usage summary. 
Also, improve logging to more easily show power break-down for
each UID.

Bug: 6642581
Change-Id: Ib36f4bf9c8c579797225cf887e5b2d323cca61b0
 2012-06-15 16:14:23 -07:00
Ying Wang
c4551bed33 Import translations. DO NOT MERGE 
Change-Id: I3311d40c77570583a5c1d26acf89dc9e544300ff
 2012-06-15 14:36:14 -07:00
Ying Wang
9d6d89ef82 Import translations. DO NOT MERGE 
Change-Id: I861590828a57951c72001e0c6c6ab2222be320c8
 2012-06-15 14:33:14 -07:00
Dianne Hackborn
e458832c76 Implement issue #6633077: Improve permissions display for... 
...inherited permissions from shared UIDs

Bug: 6633077
Change-Id: I91917339e83b79a3dfcfcb70a68d571c9a7f7e14
 2012-06-15 11:00:17 -07:00
Eric Fischer
e147531fe8 am aac5d9f6: (-s ours) am 5ea994c5: Import translations. DO NOT MERGE 
* commit 'aac5d9f60e71a0bf60b1de3efaa12ae27320629b':
  Import translations. DO NOT MERGE
 2012-06-14 14:49:07 -07:00
Eric Fischer
aac5d9f60e am 5ea994c5: Import translations. DO NOT MERGE 
* commit '5ea994c552ea72385022c0c81b8b69acbe30a113':
  Import translations. DO NOT MERGE
 2012-06-14 14:46:18 -07:00
Eric Fischer
6f395a5bda Merge "Import translations. DO NOT MERGE" 2012-06-14 13:58:24 -07:00
Eric Fischer
8d5509cd34 Import translations. DO NOT MERGE 
Change-Id: Ib3f37708c28402968d799deb4d918204457638d5
 2012-06-14 13:47:54 -07:00
Eric Fischer
5ea994c552 Import translations. DO NOT MERGE 
Change-Id: Ife956408e146ad876b860968dacd8f3095ed84e1
 2012-06-14 13:44:39 -07:00
Jean-Baptiste Queru
b3b10b2625 am 5cca2411: am 60ec22d1: (-s ours) Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on" 
* commit '5cca2411fd83f59417be7792800d2f69bdc23a63':
  Settings: Fixed German translation for turning WLAN/Bluetooth on
 2012-06-14 10:33:22 -07:00
Amith Yamasani
c6dc91e1fa am e5147e49: am 5b7a8204: Merge "Show only the language if there\'s only one locale for the language." into jb-dev 
* commit 'e5147e4933e61c762f63b115e41c5aa8a2e37bd4':
  Show only the language if there's only one locale for the language.
 2012-06-14 10:33:05 -07:00
Eric Fischer
825710cd08 am 5b97798c: (-s ours) am 612a0c10: Import translations. DO NOT MERGE 
* commit '5b97798cbd2cad3448a9adec8f4cc249e95e5de7':
  Import translations. DO NOT MERGE
 2012-06-14 10:32:59 -07:00
Danielle Millett
cfe8c4b0cd Fix 6654057: Fixing crash if device is rotated during confirm password 
In onActivityResult, mBiometricWeakLiveliness can be null if the device was rotated
during confirm password.  To fix this, the line accessing mBiometricWeakLiveliness can
safely be removed.  It's unnecessary because when onActivityResult finishes, onResume is
always called when it displays the security settings again.  Since onResume sets the
checkmark value based on the stored value in lockPatternUtils, the check mark will always
show the correct value when settings is displayed.

Change-Id: Idba9ae1d829911a9581bb6678c4d1f3b44784c63
 2012-06-14 11:59:10 -04:00
The Android Automerger
2c33bde431 merge in jb-release history after reset to jb-dev 2012-06-14 07:04:26 -07:00
Jean-Baptiste Queru
5cca2411fd am 60ec22d1: (-s ours) Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on" 
* commit '60ec22d1bdaa6124311a720717e3c522f839441e':
  Settings: Fixed German translation for turning WLAN/Bluetooth on
 2012-06-13 17:39:33 -07:00
Jean-Baptiste Queru
60ec22d1bd Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on" 2012-06-13 17:05:38 -07:00
Amith Yamasani
e5147e4933 am 5b7a8204: Merge "Show only the language if there\'s only one locale for the language." into jb-dev 
* commit '5b7a8204d875c901782ff482b68fde8da7a0081f':
  Show only the language if there's only one locale for the language.
 2012-06-13 15:24:12 -07:00
Amith Yamasani
5b7a8204d8 Merge "Show only the language if there's only one locale for the language." into jb-dev 2012-06-13 15:21:29 -07:00
Eric Fischer
5b97798cbd am 612a0c10: Import translations. DO NOT MERGE 
* commit '612a0c106bc3991a074f6f15361b357494e70e62':
  Import translations. DO NOT MERGE
 2012-06-13 14:32:38 -07:00