PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,778 Commits 1 Branch 0 Tags
a38fac3b8d59ece24c8d2e7376c318b6e51f68d5
Commit Graph

10778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
50702355f2 am 5d3ef571: am a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode" 
* commit '5d3ef5715c43ca9c3c969deaf25c76a7d3e27624':
  Dont enable Wi-Fi if it's not toggleable in flight mode
 2013-06-28 08:08:17 -07:00
Robert Greenwalt
5d3ef5715c am a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode" 
* commit 'a1454529c3eb6d0e87b254888abfea3bb714f7fe':
  Dont enable Wi-Fi if it's not toggleable in flight mode
 2013-06-28 08:06:25 -07:00
Robert Greenwalt
a1454529c3 Merge "Dont enable Wi-Fi if it's not toggleable in flight mode" 2013-06-28 15:05:16 +00:00
Johan Redestig
2acaf22ad1 Dont enable Wi-Fi if it's not toggleable in flight mode 
Dont enable Wi-Fi if it's not toggleable in flight mode
by restoring the return which was removed by
e78c187905

Change-Id: I8ca5a3e9b3f36f148f08ce97b8a2b854bf7de21c
 2013-06-28 10:37:07 +02:00
Elliott Hughes
74a14ed364 am 29bed78d: am add37ef4: am 5f6e4339: Merge "Use SimpleDateFormat for time zone formatting." 
* commit '29bed78df624789d951eb6f491742bd29d7859ff':
  Use SimpleDateFormat for time zone formatting.
 2013-06-27 15:02:35 -07:00
Elliott Hughes
29bed78df6 am add37ef4: am 5f6e4339: Merge "Use SimpleDateFormat for time zone formatting." 
* commit 'add37ef4f2721bc791319e6794b310cfbd802533':
  Use SimpleDateFormat for time zone formatting.
 2013-06-27 14:59:08 -07:00
Elliott Hughes
add37ef4f2 am 5f6e4339: Merge "Use SimpleDateFormat for time zone formatting." 
* commit '5f6e43394dd89432b241f32cd2c96d87c3ad5040':
  Use SimpleDateFormat for time zone formatting.
 2013-06-27 14:55:54 -07:00
Amith Yamasani
962dc5681d am 9495b2f9: am 51d2ff75: am bf87f7d7: Fix inconsistent string 
* commit '9495b2f9379edd3564142c1153b862e3386ca569':
  Fix inconsistent string
 2013-06-27 14:54:10 -07:00
Elliott Hughes
5f6e43394d Merge "Use SimpleDateFormat for time zone formatting." 2013-06-27 21:52:24 +00:00
Amith Yamasani
9495b2f937 am 51d2ff75: am bf87f7d7: Fix inconsistent string 
* commit '51d2ff7561dafdb1371c46e5a5f1e0505bdbbb5e':
  Fix inconsistent string
 2013-06-27 14:52:24 -07:00
Amith Yamasani
51d2ff7561 am bf87f7d7: Fix inconsistent string 
* commit 'bf87f7d78d7c09f6b928cc0a33e77c5130436c72':
  Fix inconsistent string
 2013-06-27 14:46:36 -07:00
Amith Yamasani
bf87f7d78d Fix inconsistent string 
Bug: 9602425
Change-Id: I2c5a2350668e48f12e821e0553df56ed08d373f5
 2013-06-27 09:41:15 -07:00
Satoshi Kataoka
f64e3b7b92 Improve the language list in the personal dictionary 
Bug: 9117704
Change-Id: I0b0fdb9418baa634eeaf4b8a65aebabe291aa005
 2013-06-27 20:29:01 +09:00
Amith Yamasani
18d2b2816a Merge "Single-user restrictions" 2013-06-26 23:05:38 +00:00
Baligh Uddin
d53efc7677 Import translations. DO NOT MERGE 
Change-Id: I5917cd6f9fe5ce66a35315433a04841587b9b227
Auto-generated-cl: translation import
 2013-06-26 11:14:20 -07:00
The Android Open Source Project
ad0b03a765 am 42dc6df1: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit '42dc6df115a0177f5459fecdf0236c73b1e2bdbe':
 2013-06-25 17:02:28 -07:00
Amith Yamasani
0ca80fe4cd Single-user restrictions 
New restrictions panel for restricting list of available apps for the user.
Apps that support restrictions can also be configured here.
Restrictions screen is PIN protected and will ask you to create a PIN the
first time you use it.

Change-Id: I7a5267df4272521ad80e6a8b6a18932d07179eb8
 2013-06-25 16:49:38 -07:00
Elliott Hughes
d3b689984f am 2295035a: am b17fef80: am 02e23fb0: Merge "Clamp date setting for the SetupWizard as well as Settings." 
* commit '2295035a85b02d1b876bb76093cfcafa890ff0fb':
  Clamp date setting for the SetupWizard as well as Settings.
 2013-06-25 16:30:45 -07:00
The Android Open Source Project
42dc6df115 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: Ia9e51b0778c662f1da131e33627cacf6356898fc
 2013-06-25 16:13:54 -07:00
Russell Brenner
cc145c628d Merge "Setup fontsize change" 2013-06-25 22:20:33 +00:00
Baligh Uddin
77e0923839 Merge "Import translations. DO NOT MERGE" 2013-06-25 19:47:35 +00:00
Elliott Hughes
81faf895d7 Use SimpleDateFormat for time zone formatting. 
There's no need to do time zone formatting manually.

Change-Id: Ibef222d11d04a327e9ef64ddc48322558028555d
 2013-06-25 10:16:27 -07:00
Elliott Hughes
2295035a85 am b17fef80: am 02e23fb0: Merge "Clamp date setting for the SetupWizard as well as Settings." 
* commit 'b17fef801f4c26fdf116d706c3b9e30b522cb229':
  Clamp date setting for the SetupWizard as well as Settings.
 2013-06-25 09:57:43 -07:00
Elliott Hughes
b17fef801f am 02e23fb0: Merge "Clamp date setting for the SetupWizard as well as Settings." 
* commit '02e23fb0eb96280c7874d8b5d65b56bb9fc284ba':
  Clamp date setting for the SetupWizard as well as Settings.
 2013-06-25 09:56:06 -07:00
Elliott Hughes
02e23fb0eb Merge "Clamp date setting for the SetupWizard as well as Settings." 2013-06-25 16:53:21 +00:00
Baligh Uddin
877a4db124 Import translations. DO NOT MERGE 
Change-Id: Id325314bba55c1c01716745c50337d92cfbb266f
Auto-generated-cl: translation import
 2013-06-24 19:10:28 -07:00
Dianne Hackborn
c911bbe247 Merge "Use FastPrintWriter." 2013-06-25 01:19:25 +00:00
Dianne Hackborn
6e28a4d70a Use FastPrintWriter. 
Change-Id: If7f77185d7a76f14ac63f9c2af9911fb67ad97d9
 2013-06-24 17:54:06 -07:00
Svetoslav
51a671c3f2 Fix broken strings in Settings 
Change-Id: I97b3b140b96894982d5d7753b6b3fc6dde2994a8
 2013-06-24 17:49:38 -07:00
Elliott Hughes
b85d48fa43 Clamp date setting for the SetupWizard as well as Settings. 
We fixed this for Settings in 7ccfa0614c,
but @sonymobile.com point out that it's still broken for SetupWizard.

Change-Id: I59348200105246f3ed7c0892e5f19b901d3e95ac
 2013-06-24 17:24:01 -07:00
The Android Automerger
51248d42a0 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-24 14:55:10 -07:00
The Android Automerger
66789bbbca Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD 2013-06-24 14:42:16 -07:00
Svetoslav Ganov
d4c7b497fb Print - Settings 
Change-Id: Id662a41fb189823c6d06aafc7e98996f3ef6c930
 2013-06-21 17:46:37 -07:00
The Android Open Source Project
fb0c7c703c am 11f5f984: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit '11f5f98482e8cf1f237488aef6fef5cea8f9a900':
 2013-06-21 12:02:15 -07:00
The Android Open Source Project
11f5f98482 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: Ide168995c4998dc00d65ced6e3187985566f8f49
 2013-06-21 11:57:15 -07:00
The Android Automerger
623bb0c79e merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-21 11:35:55 -07:00
Dianne Hackborn
ef2cfa7ad3 am 7f74dea7: am 67571084: am 5da4c907: Merge "Fix issue #9486022: Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev 
* commit '7f74dea7a833b7c9c0370ce81decc21d44bda7b3':
  Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps
 2013-06-20 14:42:18 -07:00
Dianne Hackborn
7f74dea7a8 am 67571084: am 5da4c907: Merge "Fix issue #9486022: Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev 
* commit '675710849a1209f929e387b19e3a7705f702f5bd':
  Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps
 2013-06-20 14:40:57 -07:00
Dianne Hackborn
675710849a am 5da4c907: Merge "Fix issue #9486022: Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev 
* commit '5da4c9079cc06c4ff4117cf6021d2e0800c99f37':
  Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps
 2013-06-20 14:39:39 -07:00
Dianne Hackborn
5da4c9079c Merge "Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps" into jb-mr2-dev 2013-06-20 21:38:30 +00:00
cecarrol
2a0affe499 Setup fontsize change 
Changed the title font unit from sp to dp on setup screens.

Bug: 7680955
Change-Id: I2f5776d155a6ce1cec92622025f4434e2ae72aba
 2013-06-20 10:14:58 -07:00
Baligh Uddin
02cc36b31f am 793ed6e0: (-s ours) am 178baecf: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 
* commit '793ed6e051e96b4188ec3d7bd384fa0d47c6c85c':
  Import translations. DO NOT MERGE
 2013-06-20 09:33:38 -07:00
Baligh Uddin
793ed6e051 am 178baecf: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 
* commit '178baecf987e3aee0c29edfdf0b9ea5c3de1ec1d':
  Import translations. DO NOT MERGE
 2013-06-20 09:31:52 -07:00
Baligh Uddin
7ae4ec5df1 Merge "Import translations. DO NOT MERGE" 2013-06-20 16:27:54 +00:00
Baligh Uddin
178baecf98 Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 2013-06-20 16:27:38 +00:00
Baligh Uddin
dfa983ee58 am 86d2f720: (-s ours) am e0878e35: am 80a0d9a3: Import translations. DO NOT MERGE 
* commit '86d2f720fbd464053d6506bf7b5291fcffe1b600':
  Import translations. DO NOT MERGE
 2013-06-20 08:37:36 -07:00
Baligh Uddin
86d2f720fb am e0878e35: am 80a0d9a3: Import translations. DO NOT MERGE 
* commit 'e0878e357023c260ed41dec8b20da7e9a265b2fa':
  Import translations. DO NOT MERGE
 2013-06-20 08:36:12 -07:00
Baligh Uddin
e0878e3570 am 80a0d9a3: Import translations. DO NOT MERGE 
* commit '80a0d9a37c4c70c538bce0ae7bc2fd83339e15ac':
  Import translations. DO NOT MERGE
 2013-06-20 08:33:56 -07:00
The Android Open Source Project
0e635252ad am 9b78ee91: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '9b78ee911303a9b9564f7225d02c0193f02b6aba':
  Fix NullPointerException at RunningState
 2013-06-20 07:20:14 -07:00
The Android Open Source Project
9b78ee9113 Reconcile with jb-mr2-release - do not merge 
Change-Id: I4e1415d265b543bcfb24dc7b520162fee1f48806
 2013-06-20 07:18:40 -07:00