PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,590 Commits 1 Branch 0 Tags
01b7ae29600f934d491cdc6dafdacf22821baf8d
Commit Graph

11590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
01b7ae2960 am 83671ff8: Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev 
* commit '83671ff815f59a977b34297c94aa05b4b4e97d01':
  Display remaining attempts when using or changing SIM PIN
 2013-10-25 09:46:29 -07:00
Wink Saville
83671ff815 Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev 2013-10-25 16:41:09 +00:00
Baligh Uddin
315e78bd4d am 2ba49855: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2ba4985526779a52826b933597b7817952e1d0a0':
  Import translations. DO NOT MERGE
 2013-10-23 20:35:30 -07:00
Baligh Uddin
2ba4985526 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-24 03:33:34 +00:00
Baligh Uddin
855d40a569 Import translations. DO NOT MERGE 
Change-Id: Iea5d9695008ddc258cfead84f2494fb3111eefea
Auto-generated-cl: translation import
 2013-10-23 19:50:57 -07:00
Wink Saville
8246579fa1 Display remaining attempts when using or changing SIM PIN 
Bug: 9928717
Change-Id: I73718c9e6a8aa7244097e0dd4593a6226ff0ac08
 2013-10-23 17:07:10 -07:00
Vineeta Srivastava
7a40def17c am 47963424: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev 
* commit '479634248d2c9833d7315a6382f491460f48da0f':
  Remove Manage Mobile Plan when config_show_mobile_plan is set to false
 2013-10-23 16:11:45 -07:00
John Spurlock
ada38ffa3b am 311a7845: Merge "Inherit translucent bars in keyguard widget picker." into klp-dev 
* commit '311a78455a75955b53412abcd0c41872e20f686e':
  Inherit translucent bars in keyguard widget picker.
 2013-10-23 16:11:44 -07:00
Vineeta Srivastava
479634248d Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev 2013-10-23 23:09:48 +00:00
Sungmin Choi
2490315e49 Remove Manage Mobile Plan when config_show_mobile_plan is set to false 
config_show_mobile_plan is set to true by default.
When you don't want to show "Manage mobile plan" set config_show_mobile_plan to false in overlay.

Bug: 10819853
Change-Id: Ic3c69fb4246cc0de38518ef6c9950cee7fa4d987
 2013-10-23 21:29:14 +00:00
John Spurlock
311a78455a Merge "Inherit translucent bars in keyguard widget picker." into klp-dev 2013-10-23 15:47:53 +00:00
John Spurlock
daace3fa2e Inherit translucent bars in keyguard widget picker. 
Bug:11337231
Change-Id: Ie65d5474328cec859637ba7771da5e93509236ae
 2013-10-22 16:12:58 -04:00
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
7fe57374cd Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-22 19:54:11 +00: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
0e036f24af Import translations. DO NOT MERGE 
Change-Id: Ic7fb5ee337d953a38cd86957054f550aa4ccc88c
Auto-generated-cl: translation import
 2013-10-21 11:04:20 -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
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
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
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
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
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
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
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)
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
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
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
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
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
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