PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,822 Commits 1 Branch 0 Tags
e82b6b15fdaf85fdbce8ed40803de902f763bc05
Commit Graph

8822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
e82b6b15fd am 37fc060e: (-s ours) am 016579ed: am acc0e56e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '37fc060e7b0558968269376511344bbf277cba24':
  Import translations. DO NOT MERGE
 2012-10-12 11:10:32 -07:00
Amith Yamasani
b417ffc768 am a6b3ecbe: am 85cd2c56: am 9b8055b3: Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev 
* commit 'a6b3ecbebfa2d5de7525184747116edaea1c148f':
  Fix a regression in exiting the activity on picking a locale
 2012-10-12 11:10:31 -07:00
Baligh Uddin
37fc060e7b am 016579ed: am acc0e56e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '016579ed0b60372eba2404f662ee54396c42d64c':
  Import translations. DO NOT MERGE
 2012-10-12 11:04:29 -07:00
Amith Yamasani
a6b3ecbebf am 85cd2c56: am 9b8055b3: Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev 
* commit '85cd2c562545ce1d498f52430a9094071d164311':
  Fix a regression in exiting the activity on picking a locale
 2012-10-12 11:03:26 -07:00
Baligh Uddin
016579ed0b am acc0e56e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'acc0e56ea768f13ffa0e6303c658a9a2fb142d14':
  Import translations. DO NOT MERGE
 2012-10-12 09:15:00 -07:00
Baligh Uddin
acc0e56ea7 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-12 09:14:11 -07:00
Baligh Uddin
d5d942f71d Merge "Import translations. DO NOT MERGE" 2012-10-12 09:07:05 -07:00
Baligh Uddin
7b75c46b24 Import translations. DO NOT MERGE 
Change-Id: I2cf8b723f6cb6339427545d57c6b5858c305763a
Auto-generated-cl: translation import
 2012-10-11 20:25:04 -07:00
Baligh Uddin
b07c809caf Import translations. DO NOT MERGE 
Change-Id: Iab3d6f1b9911ed3b1ef2472e083a3f55faa4a474
Auto-generated-cl: translation import
 2012-10-11 20:22:24 -07:00
Amith Yamasani
85cd2c5625 am 9b8055b3: Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev 
* commit '9b8055b337c5b3efe80d87d318bf0d1df67ecf14':
  Fix a regression in exiting the activity on picking a locale
 2012-10-11 18:27:53 -07:00
Amith Yamasani
9b8055b337 Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev 2012-10-11 18:25:41 -07:00
Amith Yamasani
8d7148c4d5 am 33e8e04d: am 552bebe0: am 35bbbc6c: Merge "Launch account addition activity from Settings instead of from AccountManager" into jb-mr1-dev 
* commit '33e8e04d844713f59ca0193bb93f8ae9bedbe72c':
  Launch account addition activity from Settings instead of from AccountManager
 2012-10-11 17:17:57 -07:00
Dianne Hackborn
59fde8ef9d am 2ab44c07: am 4d35affe: am 85badb09: Merge "Fix issue #7328934: change threshold of developer options countdown toast" into jb-mr1-dev 
* commit '2ab44c0711743ab64bd55208b7fc97bfa954a053':
  Fix issue #7328934: change threshold of developer options countdown toast
 2012-10-11 17:17:55 -07:00
Charles Chen
bcad5f84f7 am a5e44149: am e66bfff4: am ac15b48b: Merge "Fix accessibility gesture summary text." into jb-mr1-dev 
* commit 'a5e44149cc2fac9da66027c769a1f1d67029cb7b':
  Fix accessibility gesture summary text.
 2012-10-11 17:17:54 -07:00
Amith Yamasani
33e8e04d84 am 552bebe0: am 35bbbc6c: Merge "Launch account addition activity from Settings instead of from AccountManager" into jb-mr1-dev 
* commit '552bebe04f221966ab5d002c285e765ef60c664b':
  Launch account addition activity from Settings instead of from AccountManager
 2012-10-11 17:11:45 -07:00
Dianne Hackborn
2ab44c0711 am 4d35affe: am 85badb09: Merge "Fix issue #7328934: change threshold of developer options countdown toast" into jb-mr1-dev 
* commit '4d35affe1b5fbe2e135604594f5d90dce6b49d19':
  Fix issue #7328934: change threshold of developer options countdown toast
 2012-10-11 17:11:25 -07:00
Charles Chen
a5e44149cc am e66bfff4: am ac15b48b: Merge "Fix accessibility gesture summary text." into jb-mr1-dev 
* commit 'e66bfff464c8eebc9874cb98c6bc25d62d615afb':
  Fix accessibility gesture summary text.
 2012-10-11 17:10:43 -07:00
Amith Yamasani
552bebe04f am 35bbbc6c: Merge "Launch account addition activity from Settings instead of from AccountManager" into jb-mr1-dev 
* commit '35bbbc6ca40c93c4174f426be295ea912aad82e0':
  Launch account addition activity from Settings instead of from AccountManager
 2012-10-11 11:54:44 -07:00
Amith Yamasani
35bbbc6ca4 Merge "Launch account addition activity from Settings instead of from AccountManager" into jb-mr1-dev 2012-10-11 11:51:35 -07:00
Dianne Hackborn
4d35affe1b am 85badb09: Merge "Fix issue #7328934: change threshold of developer options countdown toast" into jb-mr1-dev 
* commit '85badb09a5489d29ea5c916f38c2c09288d9ba56':
  Fix issue #7328934: change threshold of developer options countdown toast
 2012-10-11 11:26:55 -07:00
Dianne Hackborn
85badb09a5 Merge "Fix issue #7328934: change threshold of developer options countdown toast" into jb-mr1-dev 2012-10-11 11:25:29 -07:00
Dianne Hackborn
d6a24d505a Fix issue #7328934: change threshold of developer options countdown toast 
Delay showing toasts until the third tap.  Also harden the dev
settings code that pokes system property changes to not crash
if a system service throws an exception back.

Change-Id: I1351e2c950f2bcc4fc72afb60995fd7f84319e3d
 2012-10-11 11:07:05 -07:00
Charles Chen
e66bfff464 am ac15b48b: Merge "Fix accessibility gesture summary text." into jb-mr1-dev 
* commit 'ac15b48b2b18a3096fa596fdc6f9308047f3e694':
  Fix accessibility gesture summary text.
 2012-10-11 10:28:54 -07:00
Charles Chen
ac15b48b2b Merge "Fix accessibility gesture summary text." into jb-mr1-dev 2012-10-11 10:27:06 -07:00
The Android Open Source Project
9a18c6ff18 am 5dff2acd: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '5dff2acddaab4a99b2b752c5f7ce00cba3c5705f':
 2012-10-11 08:11:29 -07:00
The Android Open Source Project
5dff2acdda Reconcile with jb-mr1-release - do not merge 
Change-Id: I392d116e42fa2428a2389d12995a79bc282559f5
 2012-10-11 08:06:03 -07:00
The Android Automerger
02e209a93e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-11 07:04:18 -07:00
The Android Open Source Project
861c4229ae am 9a6b238a: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '9a6b238aae5ca1554ce9b6a08d7d9dfb7e66de16':
 2012-10-11 06:02:13 -07:00
The Android Open Source Project
9a6b238aae Reconcile with jb-mr1-release - do not merge 
Change-Id: Icba100b3a0655cdcdabfa2e162af28c943a15c7e
 2012-10-11 05:57:58 -07:00
Amith Yamasani
7ce98e0dac am 3021168d: am 01f76885: am 4465bbb7: Merge "Fix crash in Settings for secondary users" into jb-mr1-dev 
* commit '3021168d06bb891f38b212d3338e8397b898b25d':
  Fix crash in Settings for secondary users
 2012-10-10 22:32:02 -07:00
Amith Yamasani
3021168d06 am 01f76885: am 4465bbb7: Merge "Fix crash in Settings for secondary users" into jb-mr1-dev 
* commit '01f7688555377feeced5da19129ea5c04505d279':
  Fix crash in Settings for secondary users
 2012-10-10 22:29:42 -07:00
Amith Yamasani
01f7688555 am 4465bbb7: Merge "Fix crash in Settings for secondary users" into jb-mr1-dev 
* commit '4465bbb7e14020e10620cda70fc51896b57ced67':
  Fix crash in Settings for secondary users
 2012-10-10 22:28:19 -07:00
Amith Yamasani
4465bbb7e1 Merge "Fix crash in Settings for secondary users" into jb-mr1-dev 2012-10-10 22:27:04 -07:00
Baligh Uddin
2e4b2ec1ef am 78df9396: (-s ours) am 55dba5ea: am 73d49b3b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '78df93961fe6c260e7dd0b3f344ca0e37097d0fe':
  Import translations. DO NOT MERGE
 2012-10-10 21:53:01 -07:00
Baligh Uddin
78df93961f am 55dba5ea: am 73d49b3b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '55dba5ea08166a09c04dc2b6da706a6e4c358949':
  Import translations. DO NOT MERGE
 2012-10-10 21:50:42 -07:00
Baligh Uddin
c4099c4d28 am 2f8f48ca: (-s ours) am 69d8b40c: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '2f8f48ca705181e8601cd79b6d5c7cdaa46e917c':
  Import translations. DO NOT MERGE
 2012-10-10 21:50:17 -07:00
Baligh Uddin
55dba5ea08 am 73d49b3b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '73d49b3bd996f38115ea47a51d54241aee55e9de':
  Import translations. DO NOT MERGE
 2012-10-10 21:49:07 -07:00
Baligh Uddin
2f8f48ca70 am 69d8b40c: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '69d8b40c9da3587e0287296ca6609a125d950332':
  Import translations. DO NOT MERGE
 2012-10-10 21:49:02 -07:00
Baligh Uddin
2653050747 Merge "Import translations. DO NOT MERGE" 2012-10-10 21:48:59 -07:00
Baligh Uddin
73d49b3bd9 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-10 21:47:57 -07:00
Baligh Uddin
69d8b40c9d Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-10 21:47:05 -07:00
Amith Yamasani
b99f864d3f Fix crash in Settings for secondary users 
Bug: 7328485

Change-Id: If766d1f28f48fb1853ea64c2b2a9294df9bcf22b
 2012-10-10 21:44:15 -07:00
Amith Yamasani
53b14f57c3 Fix a regression in exiting the activity on picking a locale 
Bug: 7326748
Change-Id: I5db57c805c104bf01c256f65990aec6deae27789
 2012-10-10 19:45:15 -07:00
Jeff Sharkey
26efca3cc6 am 58288c43: am f4e7417e: am 84b90d53: Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-dev 
* commit '58288c43eca41e93b7e183802cedca920b44055f':
  Switch to IPackageManager.getServiceInfo().
 2012-10-10 17:23:28 -07:00
Jeff Sharkey
5a317d7e3e am c2a47691: am 631c0bde: am 2264a643: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev 
* commit 'c2a4769197a520e36d2cfe6911f669ee1a9bb63c':
  Move lockscreen to using haptic feedback setting.
 2012-10-10 17:23:04 -07:00
Jeff Sharkey
58288c43ec am f4e7417e: am 84b90d53: Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-dev 
* commit 'f4e7417e69e19e647ac95ea5abd90892659a9ae9':
  Switch to IPackageManager.getServiceInfo().
 2012-10-10 17:03:51 -07:00
Jeff Sharkey
f4e7417e69 am 84b90d53: Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-dev 
* commit '84b90d533275be792954efc37e14f0c8fd409681':
  Switch to IPackageManager.getServiceInfo().
 2012-10-10 17:01:49 -07:00
Jeff Sharkey
84b90d5332 Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-dev 2012-10-10 16:59:48 -07:00
Amith Yamasani
cbabf19cbb Launch account addition activity from Settings instead of from AccountManager 
This enables us to watch for failure cases from certain authenticators that
misbehave.

Bug: 7318390
Change-Id: I43398e7622214cabd1d1bf171502c6a988af00a3
 2012-10-10 16:42:20 -07:00
Jeff Sharkey
c2a4769197 am 631c0bde: am 2264a643: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev 
* commit '631c0bde1041c271de7aebc2842eba4796bb5f4b':
  Move lockscreen to using haptic feedback setting.
 2012-10-10 16:31:05 -07:00