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

8802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
a4eabfde00 am bc3cab99: Merge "Fix issue #7330867: Cannot disable a built-in app if you\'ve downloaded updates" into jb-mr1-dev 
* commit 'bc3cab99e36e3e757770eaaa02664c1ec193367a':
  Fix issue #7330867: Cannot disable a built-in app if you've downloaded updates
 2012-10-14 11:09:38 -07:00
Dianne Hackborn
bc3cab99e3 Merge "Fix issue #7330867: Cannot disable a built-in app if you've downloaded updates" into jb-mr1-dev 2012-10-14 11:07:46 -07:00
The Android Automerger
d1d08621c5 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-13 03:50:23 -07:00
Adam Powell
fcf460eb87 am cc7f6e92: am a5f6762a: Show the overflow in the right place for keyguard settings 
* commit 'cc7f6e924de10778ca035385bdc5735ef821dee8':
  Show the overflow in the right place for keyguard settings
 2012-10-13 01:29:47 -07:00
Adam Powell
cc7f6e924d am a5f6762a: Show the overflow in the right place for keyguard settings 
* commit 'a5f6762adfe90007be69bab9cfd22515753da82b':
  Show the overflow in the right place for keyguard settings
 2012-10-13 01:28:00 -07:00
Adam Powell
a5f6762adf Show the overflow in the right place for keyguard settings 
Change-Id: Ie8b2c8acf97736041bf09a64c0f1d77f80350f4c
 2012-10-13 01:20:28 -07:00
Dianne Hackborn
9072d9efc6 Fix issue #7330867: Cannot disable a built-in app if you've downloaded updates 
Change-Id: Ie9dfe4a9195e4583bead8066807e4bba8274801f
 2012-10-12 19:20:09 -07:00
The Android Automerger
aa0e45c8ed merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-12 16:34:40 -07:00
The Android Automerger
1c0ee7e1ee merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-12 16:33:00 -07:00
Jason Chen
6e0e3e5145 Let's enhance 
Add mipmap-xxhdpi launcher icon asset.
Remove unneeded drawable-based launcher icon assets while we're at it.

Bug: 6718166
Change-Id: I0f9ed4968569e0c2bce44e617a0586f0672d916a
 2012-10-12 16:23:10 -07:00
Baligh Uddin
ec9bcadd28 Import translations. DO NOT MERGE 
Change-Id: Ibccc9691d27fec1b597ca3e8fae1d82f6a8943d7
Auto-generated-cl: translation import
 2012-10-12 13:54:47 -07:00
Baligh Uddin
757cc75de0 Import translations. DO NOT MERGE 
Change-Id: I4ecd65d9576631bdd6bb466560a95df76e17ff2b
Auto-generated-cl: translation import
 2012-10-12 13:52:37 -07:00
Jim Miller
0b0f1ea2c2 am 17963414: am afc0036e: Merge "Disable security widgets for now" into jb-mr1-dev 
* commit '179634148e809b606090f68d34a4ebd20ae5fcee':
  Disable security widgets for now
 2012-10-12 13:23:52 -07:00
Jim Miller
179634148e am afc0036e: Merge "Disable security widgets for now" into jb-mr1-dev 
* commit 'afc0036e27d4240a354595b1aa08e8f497995e0c':
  Disable security widgets for now
 2012-10-12 13:21:25 -07:00
Jim Miller
afc0036e27 Merge "Disable security widgets for now" into jb-mr1-dev 2012-10-12 13:20:16 -07:00
The Android Automerger
016d448a65 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-12 11:50:19 -07:00
Baligh Uddin
2ce8da24cb am ae34ca32: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'ae34ca32e28b57287b68f60b16399c4b74ab342f':
  Import translations. DO NOT MERGE
 2012-10-12 11:04:33 -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
The Android Automerger
e636a9525d merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-12 10:27:25 -07:00
Baligh Uddin
ae34ca32e2 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-12 09:16:27 -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
The Android Automerger
0ac02879e2 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-12 06:59:44 -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
Baligh Uddin
d66c16c2ab Import translations. DO NOT MERGE 
Change-Id: Ib9c7e11980c3a96767486303dd786f031c6d9b37
Auto-generated-cl: translation import
 2012-10-11 20:20:41 -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
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
The Android Automerger
e437c664b9 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-11 16:27:00 -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 Automerger
1b333afbe5 merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-11 08:19:47 -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
9a6b238aae Reconcile with jb-mr1-release - do not merge 
Change-Id: Icba100b3a0655cdcdabfa2e162af28c943a15c7e
 2012-10-11 05:57:58 -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
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
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
73d49b3bd9 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-10 21:47:57 -07:00