PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,484 Commits 1 Branch 0 Tags
fb03058dc9827c9f588cc4f42a74201b8ae06e8c
Commit Graph

12484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
5dd4a09679 am 7fe57374: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '7fe57374cdb67b19b98d0170e10add876f0823b1':
  Import translations. DO NOT MERGE
 2013-10-22 13:00:31 -07:00
Baligh Uddin
351a3dce1e Merge "Import translations. DO NOT MERGE" 2013-10-22 19:54:15 +00:00
Baligh Uddin
7fe57374cd Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-22 19:54:11 +00:00
Lifu Tang
f31559601c am 7077e646: am 75099b67: am cace3d8d: Modified the strings according to the specs 
* commit '7077e6460e393e567d3b80da6190ff1ebe7d834a':
  Modified the strings according to the specs
 2013-10-21 16:06:09 -07:00
Lifu Tang
7077e6460e am 75099b67: am cace3d8d: Modified the strings according to the specs 
* commit '75099b672338213e9f74462cd9ff96dd51bdd9d5':
  Modified the strings according to the specs
 2013-10-21 16:03:20 -07:00
Lifu Tang
75099b6723 am cace3d8d: Modified the strings according to the specs 
* commit 'cace3d8d28f005e6226a3eb909f8ebc3668ef805':
  Modified the strings according to the specs
 2013-10-21 16:00:32 -07:00
Baligh Uddin
393798c73d Import translations. DO NOT MERGE 
Change-Id: Ie22a6c9bff23e69d4ed2fbf21c92cea4283797fe
Auto-generated-cl: translation import
 2013-10-21 11:08:18 -07:00
Baligh Uddin
0e036f24af Import translations. DO NOT MERGE 
Change-Id: Ic7fb5ee337d953a38cd86957054f550aa4ccc88c
Auto-generated-cl: translation import
 2013-10-21 11:04:20 -07:00
Zhihai Xu
1b5bd091eb need persist adding bluetooth MAP profile to profile list in case the settings process being killed 
bug:11303213
Change-Id: I1f227839931872ba6fdca0b5932a24e0b002ec44
 2013-10-19 23:37:35 -07:00
Lifu Tang
cace3d8d28 Modified the strings according to the specs 
- Fix b/11290711

Change-Id: I23827ad5bef4cf4bda14bb08f0e502cc4e9d2727
 2013-10-18 17:49:47 -07:00
Zhihai Xu
21d9dced4a am ce62f3ef: am 592ed214: am 55f03857: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev 
* commit 'ce62f3efc05fe515a93cc6c368eb37be6a8657c1':
  BT keeps on asking me if I want to allow car to do stuff
 2013-10-18 11:57:56 -07:00
Zhihai Xu
ce62f3efc0 am 592ed214: am 55f03857: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev 
* commit '592ed21459e543dc70c3845e808834d3226492cb':
  BT keeps on asking me if I want to allow car to do stuff
 2013-10-18 11:55:21 -07:00
Zhihai Xu
592ed21459 am 55f03857: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev 
* commit '55f03857b7ebe7663cf4873d059afced15e30081':
  BT keeps on asking me if I want to allow car to do stuff
 2013-10-18 11:54:03 -07:00
Zhihai Xu
55f03857b7 Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev 2013-10-18 18:51:16 +00:00
Satoshi Kataoka
8d4d9fa172 am 544db7fa: (-s ours) am 56f47bf1: am ea90cd2f: Do not merge. Refresh "InputMethodPreference"s onResume 
* commit '544db7fad02457d96ae0d69fb458cf7c10f03b1c':
  Do not merge. Refresh "InputMethodPreference"s onResume
 2013-10-18 11:24:03 -07:00
Satoshi Kataoka
544db7fad0 am 56f47bf1: am ea90cd2f: Do not merge. Refresh "InputMethodPreference"s onResume 
* commit '56f47bf11bb041eff3333c9047a6ebef5d50a59e':
  Do not merge. Refresh "InputMethodPreference"s onResume
 2013-10-18 11:21:32 -07:00
Satoshi Kataoka
56f47bf11b am ea90cd2f: Do not merge. Refresh "InputMethodPreference"s onResume 
* commit 'ea90cd2fca08e5c65e54d8df1c208337e08fc541':
  Do not merge. Refresh "InputMethodPreference"s onResume
 2013-10-18 11:18:29 -07:00
Satoshi Kataoka
ea90cd2fca Do not merge. Refresh "InputMethodPreference"s onResume 
Corresponding change is I015075d57ebed94d6b

Bug: 11245599
Change-Id: I8be2b9a81d41fab979afe000bd1bce6fc57550c7
 2013-10-18 18:55:07 +09:00
Satoshi Kataoka
aa71b635b8 Refresh "InputMethodPreference"s onResume 
Bug: 11245599

Change-Id: I015075d57ebed94d6b76a66de135ee748e27e3a6
 2013-10-18 18:50:37 +09:00
Zhihai Xu
1083b4726b BT keeps on asking me if I want to allow car to do stuff 
Persist the "no" count
bug:11176511

Change-Id: I39674334fe8bf09d1f3f2b07c12513a6c46f053b
 2013-10-17 17:11:38 -07:00
Baligh Uddin
94c2a0322d am e9e80ada: (-s ours) am 3796a55e: (-s ours) am 2496a32c: (-s ours) Import translations. DO NOT MERGE 
* commit 'e9e80ada85bb124df6b9ede805a349e345a84bb3':
  Import translations. DO NOT MERGE
 2013-10-17 14:40:48 -07:00
Baligh Uddin
e9e80ada85 am 3796a55e: (-s ours) am 2496a32c: (-s ours) Import translations. DO NOT MERGE 
* commit '3796a55ed221dd4e3c5eda1fc1699c539b2dd54d':
  Import translations. DO NOT MERGE
 2013-10-17 14:33:37 -07:00
Baligh Uddin
3796a55ed2 am 2496a32c: (-s ours) Import translations. DO NOT MERGE 
* commit '2496a32ca67270e5570f97b780ae47aade080e0d':
  Import translations. DO NOT MERGE
 2013-10-17 14:31:54 -07:00
Baligh Uddin
2b22e29f3e Import translations. DO NOT MERGE 
Change-Id: I41a338eda7e5ea66266315fab7808b0b04ec3ed9
Auto-generated-cl: translation import
 2013-10-17 14:30:00 -07:00
Baligh Uddin
2496a32ca6 Import translations. DO NOT MERGE 
Change-Id: I2aba430c7c862ee16f7adb93503877a4e79a1117
Auto-generated-cl: translation import
 2013-10-17 14:21:57 -07:00
Baligh Uddin
bb11d35b75 am fba7df30: (-s ours) am 2fa95373: (-s ours) am 025b6ecf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'fba7df3034a3470b32e01653dfad0aca200ac3ae':
  Import translations. DO NOT MERGE
 2013-10-17 10:28:56 -07:00
Baligh Uddin
fba7df3034 am 2fa95373: (-s ours) am 025b6ecf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2fa95373a5b8f7e2753f396240cad9f2615d3b3e':
  Import translations. DO NOT MERGE
 2013-10-17 10:27:16 -07:00
Baligh Uddin
2fa95373a5 am 025b6ecf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '025b6ecff220b3117b892df1d9f4bd35a4fb4527':
  Import translations. DO NOT MERGE
 2013-10-17 10:25:29 -07:00
Baligh Uddin
6ccf477d91 Merge "Import translations. DO NOT MERGE" 2013-10-17 17:21:38 +00:00
Baligh Uddin
025b6ecff2 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-17 17:21:34 +00:00
Baligh Uddin
d093024297 Import translations. DO NOT MERGE 
Change-Id: Ifb0c8c8555ee014dbab39fab6d9f19442eb28410
Auto-generated-cl: translation import
 2013-10-16 23:18:02 -07:00
Baligh Uddin
50a64d9dcf Import translations. DO NOT MERGE 
Change-Id: I837e1a31e3443781597b7de28f44fc332c6a84fd
Auto-generated-cl: translation import
 2013-10-16 23:13:11 -07:00
Zhihai Xu
0b4aec4d7b am e7f63626: am 820e7010: am 3f90a454: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev 
* commit 'e7f636264b769918ca46148f1db1038d1cd84830':
  BT keeps on asking me if I want to allow car to do stuff
 2013-10-16 19:35:03 -07:00
Zhihai Xu
e7f636264b am 820e7010: am 3f90a454: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev 
* commit '820e70102e61e290a59ad545f42fac4336aa4e9c':
  BT keeps on asking me if I want to allow car to do stuff
 2013-10-16 19:31:52 -07:00
Zhihai Xu
820e70102e am 3f90a454: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev 
* commit '3f90a454480c227e58300f8c6fb88cc022ff237e':
  BT keeps on asking me if I want to allow car to do stuff
 2013-10-16 19:29:49 -07:00
Zhihai Xu
3f90a45448 Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev 2013-10-17 02:27:10 +00:00
Ed Heyl
18997d9eed am bc6aa63a: am 5af7e568: am 67390aad: merge in klp-release (no-op) 
* commit 'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e':
  updated launcher settings icon to gray gear
  Load account type icons in a background thread before scrolling down
  Updated de-blued backgrounds for settings power widget.
  Add print job settings screen.
 2013-10-16 18:02:13 -07:00
Ed Heyl
bc6aa63a1a am 5af7e568: am 67390aad: merge in klp-release (no-op) 
* commit '5af7e568115097a6759f6bfc11620690944381c8':
  updated launcher settings icon to gray gear
  Load account type icons in a background thread before scrolling down
  Updated de-blued backgrounds for settings power widget.
  Add print job settings screen.
 2013-10-16 17:56:40 -07:00
Ed Heyl
5af7e56811 am 67390aad: merge in klp-release (no-op) 
* commit '67390aad4f8a091dc14ea825ede292f8a52efb47':
  updated launcher settings icon to gray gear
  Load account type icons in a background thread before scrolling down
  Updated de-blued backgrounds for settings power widget.
  Add print job settings screen.
 2013-10-16 17:52:06 -07:00
Ed Heyl
67390aad4f merge in klp-release (no-op) 2013-10-16 17:46:24 -07:00
Christopher Tate
605a49867a am 06c0a90d: am a31d8b71: am 235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE 
* commit '06c0a90d7805a8fdce4156af839a6e4d14b33702':
  User ID, not uid, in an EXTRA_USER_HANDLE
 2013-10-16 13:46:45 -07:00
Christopher Tate
06c0a90d78 am a31d8b71: am 235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE 
* commit 'a31d8b7194793a2ef01f36bd07d70043762de02e':
  User ID, not uid, in an EXTRA_USER_HANDLE
 2013-10-16 13:43:46 -07:00
Christopher Tate
a31d8b7194 am 235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE 
* commit '235e5d686fc73cfd82605bac86dcc9673916c5b7':
  User ID, not uid, in an EXTRA_USER_HANDLE
 2013-10-16 13:41:43 -07:00
Christopher Tate
235e5d686f User ID, not uid, in an EXTRA_USER_HANDLE 
Bug 11208808

Change-Id: Ica30c2114c922fc38460cafc14c02f10051717c9
 2013-10-16 13:27:27 -07:00
Kenny Root
94d4f23dcc Accessibility: filter touches to Enable button 
To prevent tap-jacking, filter touches to the enable button if there is
another window obscuring the screen.

Bug: 11242907
Change-Id: I0228cd480faf8e7ebf70394d9bb60fa2e4138fb4
 2013-10-16 10:10:47 -07:00
Zhihai Xu
3fd5e2839f BT keeps on asking me if I want to allow car to do stuff 
remember how many time the user choose the "no",
if user choose "no" twice, we will make it persist.
bug:11176511

Change-Id: I7234e7b4ba4586065dea462029e2da5ddaf53316
 2013-10-15 11:27:54 -07:00
The Android Automerger
89f46886e4 merge in klp-release history after reset to klp-dev 2013-10-15 06:01:17 -07:00
Torne (Richard Coles)
deb0a156bb Resolved conflicts for merge of 67e72aa4 to master 
Change-Id: Ib3904427c8f6bcc19895b39e4ce65eaa626e8396
 2013-10-15 13:37:35 +01:00
Torne (Richard Coles)
67e72aa49e am 9880646e: am f88e5442: Merge "Remove experimental WebView setting." into klp-dev 
* commit '9880646e197331b99ba9824b7d47f12391c82bf4':
  Remove experimental WebView setting.
 2013-10-15 03:37:07 -07:00
Torne (Richard Coles)
9880646e19 am f88e5442: Merge "Remove experimental WebView setting." into klp-dev 
* commit 'f88e5442f5d2492d415864d1cd118d610b0005d0':
  Remove experimental WebView setting.
 2013-10-15 03:34:15 -07:00