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

11822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
2496a32ca6 Import translations. DO NOT MERGE 
Change-Id: I2aba430c7c862ee16f7adb93503877a4e79a1117
Auto-generated-cl: translation import
 2013-10-17 14:21:57 -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
025b6ecff2 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-17 17:21:34 +00: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
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
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
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
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)
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
Torne (Richard Coles)
f88e5442f5 Merge "Remove experimental WebView setting." into klp-dev 2013-10-15 10:31:46 +00:00
Baligh Uddin
81d0f1b93c am 9f9a9652: (-s ours) am 740702ce: (-s ours) Import translations. DO NOT MERGE 
* commit '9f9a9652099204c2e15f1c1660e6886162932943':
  Import translations. DO NOT MERGE
 2013-10-14 19:01:01 -07:00
Baligh Uddin
9f9a965209 am 740702ce: (-s ours) Import translations. DO NOT MERGE 
* commit '740702ced3d69f3c0b8208ace86e88e4a76ccba0':
  Import translations. DO NOT MERGE
 2013-10-14 17:19:28 -07:00
Baligh Uddin
740702ced3 Import translations. DO NOT MERGE 
Change-Id: I53c3eb76acc7cfd73101c70e2db66f66da45e8c3
Auto-generated-cl: translation import
 2013-10-14 15:24:56 -07:00
Torne (Richard Coles)
0bf324c628 Remove experimental WebView setting. 
The experimental WebView is no longer experimental; remove the setting
from the settings app.

Bug: 10427705
Change-Id: Iaad17b132f21cad3d32ee5800a9274863962cc87
 2013-10-14 17:35:43 +01:00
The Android Automerger
9ece30cb75 merge in klp-release history after reset to klp-dev 2013-10-13 06:02:42 -07:00
Baligh Uddin
ce4a93f3f4 am fea253e0: (-s ours) am 37473121: (-s ours) Import translations. DO NOT MERGE 
* commit 'fea253e00a835ed876211dba9d0f37edc9f162e9':
  Import translations. DO NOT MERGE
 2013-10-12 06:46:01 -07:00
Baligh Uddin
fea253e00a am 37473121: (-s ours) Import translations. DO NOT MERGE 
* commit '37473121937ad62b616e849e21954cf39583e465':
  Import translations. DO NOT MERGE
 2013-10-12 06:43:48 -07:00
Baligh Uddin
3747312193 Import translations. DO NOT MERGE 
Change-Id: Ib4e08a38decb3b697e53959546b74baaf0836211
Auto-generated-cl: translation import
 2013-10-12 00:56:01 -07:00
Baligh Uddin
d7e8a7f813 am 84c377f5: (-s ours) am 9c861f80: (-s ours) Import translations. DO NOT MERGE 
* commit '84c377f51a0995b2f70028df12abb9f98c44e915':
  Import translations. DO NOT MERGE
 2013-10-11 15:03:27 -07:00
Baligh Uddin
7508ef29dc am 8dd824b6: (-s ours) Import translations. DO NOT MERGE 
* commit '8dd824b60b9345df7409bbd35e1b9ff7b3b051e6':
  Import translations. DO NOT MERGE
 2013-10-11 15:03:26 -07:00
Baligh Uddin
84c377f51a am 9c861f80: (-s ours) Import translations. DO NOT MERGE 
* commit '9c861f80a2f87d007c7bce7493a154d33702f785':
  Import translations. DO NOT MERGE
 2013-10-11 15:01:27 -07:00
Baligh Uddin
8dd824b60b Import translations. DO NOT MERGE 
Change-Id: Iab8ff1d8541b26f8bc44905b98dd847ca4faa870
Auto-generated-cl: translation import
 2013-10-11 14:51:44 -07:00
Baligh Uddin
9c861f80a2 Import translations. DO NOT MERGE 
Change-Id: Id47b239bd151fd77314c38caf065c8f0d24ed62b
Auto-generated-cl: translation import
 2013-10-11 14:47:56 -07:00
Zhihai Xu
c326942dfd am cf71c2d3: am 83936d96: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev 
* commit 'cf71c2d3e31375fa68fd65f1ec39fcce62a4b4c3':
  BT keeps on asking me if I want to allow car to do stuff
 2013-10-11 14:10:13 -07:00
Zhihai Xu
cf71c2d3e3 am 83936d96: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev 
* commit '83936d967d0e880401843161feda649c5bd96bc1':
  BT keeps on asking me if I want to allow car to do stuff
 2013-10-11 14:06:13 -07:00
Zhihai Xu
83936d967d Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev 2013-10-11 21:02:51 +00:00
Dianne Hackborn
47be2e84d0 am 4f00b368: am b1e33884: Allow tapping on memory status regions to filter proc stats. 
* commit '4f00b368f9fcc27d43dfc63c3ac9d6fedf8a070d':
  Allow tapping on memory status regions to filter proc stats.
 2013-10-11 12:50:07 -07:00
Zhihai Xu
9998639a65 BT keeps on asking me if I want to allow car to do stuff 
We can remember it as a non persist global value when user click no.
This value won't be saved when power down.
We will restore the permission choice
when we are disconnected with the remote device.
So the "no" choice selected by user will only take effect
until we are disconnected with the remote device.

bug:11176511
Change-Id: Ic0c0829587cf7a812b5fa96fbd381921f67c186f
 2013-10-11 12:15:19 -07:00
Dianne Hackborn
4f00b368f9 am b1e33884: Allow tapping on memory status regions to filter proc stats. 
* commit 'b1e33884190732a58bfbfe659898e02d41fe39f4':
  Allow tapping on memory status regions to filter proc stats.
 2013-10-11 11:59:51 -07:00