PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,981 Commits 1 Branch 0 Tags
c7a15ec8e8fb30fe2b613b98c61d66e4ecc3960c
Commit Graph

4981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
2397a7391e Show in Settings->About if the device is an engineering sample. 
Don't show anything additional for a production device.

Bug: 5380778
Change-Id: I82532c37b0fc71fe5ada91a7b945b3becffbc535
 2011-09-27 18:06:33 -07:00
Mike Sipe
ce73fc83e7 Merge "Fix 5287113: rename "FaceLock" to "Face Unlock" in Settings" 2011-09-27 17:01:12 -07:00
Jim Miller
a277b56425 Fix 5287113: rename "FaceLock" to "Face Unlock" in Settings 
Change-Id: If42c7c12e5084f5c18d0959a1c1a0c538aed8ac0
 2011-09-27 16:39:20 -07:00
Jeff Sharkey
1ef9c5416d am 76ac6a9b: Merge "About." into ics-factoryrom 
* commit '76ac6a9bcb7cfc3be79e956a6207599e6910de8a':
  About.
 2011-09-27 16:27:56 -07:00
Jeff Sharkey
76ac6a9bcb Merge "About." into ics-factoryrom 2011-09-27 16:26:08 -07:00
Jeff Sharkey
246120e5ff About. 
Bug: 5337015
Change-Id: I41f302a6f329c54c9d6abb8925c228fee5cc716f
 2011-09-27 15:13:10 -07:00
Eric Fischer
48c7e2b920 am 22aca59e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 
* commit '22aca59e80d2376b89262b598a486bdd3272d969':
  Import revised translations.  DO NOT MERGE
 2011-09-27 15:01:01 -07:00
Eric Fischer
22aca59e80 Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 2011-09-27 14:57:23 -07:00
Eric Fischer
145abb6e22 Import revised translations. DO NOT MERGE 
Change-Id: Ib4fe1d2dd91618933614f68f6224c8ac48d31bc8
 2011-09-27 14:33:22 -07:00
The Android Automerger
4607994003 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-27 13:32:47 -07:00
Amith Yamasani
df5ab21d21 am ae69755a: Disable USB connection type when monkeys are running. 
* commit 'ae69755aa874dbac77e9874d9716ab891a144193':
  Disable USB connection type when monkeys are running.
 2011-09-27 13:10:47 -07:00
Amith Yamasani
ae69755aa8 Disable USB connection type when monkeys are running. 
Bug: 5375336

Also use the correct API for testing if monkeys are running.
(ActivityManager.isUserAMonkey())

Bug: 5375910
Change-Id: I2bf8e061ee5977d521de197d3a92095c1a98218d
 2011-09-27 11:33:17 -07:00
Svetoslav Ganov
522b074bda Merge "Clarify install accessibility scripts wording." 2011-09-27 11:22:06 -07:00
Svetoslav Ganov
af2a4547b9 Clarify install accessibility scripts wording. 
1. Updated the wording according to tech writer feedback to be
   more precise and avoid user confusion.

bug:5374051

Change-Id: Ica54b91f475be1d271f1588f044a5a2b72a44e51
 2011-09-27 11:13:02 -07:00
The Android Open Source Project
c287e936dd Reconcile with ics-factoryrom-release 
Change-Id: I412a835f2e84fb56191c0378cf5dc908935f7b8a
 2011-09-27 10:11:04 -07:00
Danielle Millett
cc571cc4fe Merge "Changed header to specify backup lock" 2011-09-27 06:14:01 -07:00
satok
e12b4cd54d Merge "Fix the alignment of the preference in IME settings on Tablet" 2011-09-27 01:52:00 -07:00
satok
f5acea67b4 Fix the alignment of the preference in IME settings on Tablet 
Bug: 5366586

Change-Id: I2659415fb74cca2c65bdd3171217e786d4f41aac
 2011-09-27 17:47:51 +09:00
satok
44e32ab40f Merge "Tweak IME settings" 2011-09-27 00:10:57 -07:00
satok
054fc44cae Tweak IME settings 
Change-Id: I13b044abdcb1215306ecfd5070d6e1a16e2d92d7
 2011-09-27 16:08:46 +09:00
Eric Fischer
4adcb1d2e8 am 0e5fd21b: (-s ours) Import revised translations. DO NOT MERGE 
* commit '0e5fd21beb33a39b4254d4c8dd6b60c0939dbee0':
  Import revised translations. DO NOT MERGE
 2011-09-26 19:44:31 -07:00
The Android Automerger
7c2e3c2389 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-26 16:17:56 -07:00
Jeff Sharkey
dc2c5ae2b0 Merge "Data usage strings, sweep touches, fixes." 2011-09-26 15:31:57 -07:00
Danielle Millett
940407eb6a Changed header to specify backup lock 
-Changed main header to show backup lock text
-Reworded normal header
-Changed instances of FacePass to FaceLock

Change-Id: I66cbd3ada87df30b6b7ceb1a784d365ba60a8f41
 2011-09-26 18:06:37 -04:00
Eric Fischer
0e5fd21beb Import revised translations. DO NOT MERGE 
Change-Id: I287527c2b071e0babd191b47fc1b80c160232d74
 2011-09-26 14:51:07 -07:00
Kenny Root
3f1fb4f154 Merge "Make verifier device id information visible" 2011-09-26 14:38:10 -07:00
The Android Open Source Project
4bce4dc1c3 Reconcile with ics-factoryrom-release 
Change-Id: Ic66f78817e5ae10c997cf34a35e0d8b3abade1ba
 2011-09-26 12:11:47 -07:00
Amith Yamasani
f07e46fae8 Merge "Fixes to parent fragment names and other manifest issues." 2011-09-26 11:51:39 -07:00
Kenny Root
498fbe470e Make verifier device id information visible 
This makes the verifier device identifier information for this
particular device visible in the "Development" screen of
Settings.

Bug: 5205163
Change-Id: I55e0b32fe98f898e6e8d723ce6696529fdccffd0
 2011-09-26 09:55:03 -07:00
Jeff Sharkey
461842a8c0 Data usage strings, sweep touches, fixes. 
Change strings around limiting background data.  Move limit/warning
sweeps above inspection sweeps, and teach about additional neighbors
on different axis.

Guard against DialogFragment.show(), fix pie chart to draw edges, and
remove data usage from battery UI.

Bug: 5341374, 5337650, 5337385, 5319465, 5236335
Change-Id: Iea8c2a2ab405b645d85abe34a0178d4b8874cdd5
 2011-09-25 18:41:13 -07:00
The Android Automerger
b0bb0096ad merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-25 18:16:31 -07:00
Wink Saville
bde64e3d93 am 426fc66a: Add persist.radio.ramdump. 
* commit '426fc66a8a9371e34d936d18d5b254fd002b4c11':
  Add persist.radio.ramdump.
 2011-09-25 15:25:39 -07:00
Amith Yamasani
990fb52ef7 Fixes to parent fragment names and other manifest issues. 
Bug: 5324865

Also, when jumping into a second+ level setting, make sure the header list
item is scrolled into view.

Change-Id: I714c1f80c8b20e23208763f1c30449a49f2a4082
 2011-09-25 14:49:49 -07:00
Wink Saville
426fc66a8a Add persist.radio.ramdump. 
A little refactoring to keep most everything for these "temporary"
flags in one place.

Bug: 5348373
Change-Id: I257aac616ae635e6f9d9dffd692357b4c08037e2
 2011-09-25 14:39:02 -07:00
The Android Automerger
9d55f9f625 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-25 06:30:06 -07:00
Svetoslav Ganov
22348cee27 Merge "Settings may show enabled accessiiblity services after restore even if accessibility is off." 2011-09-23 16:57:32 -07:00
Svetoslav Ganov
cb0a7a82a6 Settings may show enabled accessiiblity services after restore even if accessibility is off. 
Now the state of accessibility is determined from the number of running, i.e. enabled and
installed, accessibility services - more than zero access is on else it is off. After a
restore the device may have some enabled and installed services but disabled accessibility
setting. In such case settings should respect the restored values and the services should
be displayed as disabled initially and then enabling one of them will enable accessibility.

bug:5367404

Change-Id: If3756aba3f59e282000247e99f87ebff2b64c9fd
 2011-09-23 16:47:41 -07:00
Eric Fischer
008592e265 am 86b49eea: (-s ours) Import revised translations. DO NOT MERGE 
* commit '86b49eea5e7735f72ed72069439cc74dbcc9a878':
  Import revised translations.  DO NOT MERGE
 2011-09-23 15:44:39 -07:00
Eric Fischer
86b49eea5e Import revised translations. DO NOT MERGE 
Change-Id: Iebee5d29b6baa4e479a03ae7058e891f852968f6
 2011-09-23 15:28:41 -07:00
The Android Automerger
59dabf449e merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-23 11:36:19 -07:00
Wink Saville
9fe945b854 am fbea38fd: Merge "Add a button to enable/disable Mobile Terminated SMS over IMS" into ics-factoryrom 
* commit 'fbea38fd2b458b59b0f2a7affa158b486cdc1df5':
  Add a button to enable/disable Mobile Terminated SMS over IMS
 2011-09-22 23:39:35 -07:00
Amith Yamasani
16a9b14fa7 Merge "Don't append list of accounts every time we return to this screen." 2011-09-22 17:04:12 -07:00
Wink Saville
fbea38fd2b Merge "Add a button to enable/disable Mobile Terminated SMS over IMS" into ics-factoryrom 2011-09-22 15:29:19 -07:00
Wink Saville
382a75b105 Add a button to enable/disable Mobile Terminated SMS over IMS 
This toggles persist.radio.imsallowmtsms between 0/1 which can
be used during testing and bring up of SMS over IMS.

Change-Id: I4581bca76899445e825260e8af6a39903d029c44
 2011-09-22 15:17:00 -07:00
Amith Yamasani
3f45de559f Don't append list of accounts every time we return to this screen. 
Bug: 5355920

Remove the contents of the layout before adding the accounts.

Change-Id: Ic9256140f892968b2388f47d982eaada720df892
 2011-09-22 14:34:17 -07:00
The Android Open Source Project
2407efcf42 Reconcile with ics-factoryrom-release 
Change-Id: I5c6e500d5a097aa638399321001fec81493cc0c4
 2011-09-22 10:57:43 -07:00
Jeff Hamilton
4cfe105506 am 0d299625: Merge "Bring back the Android Beam settings panel." into ics-factoryrom 
* commit '0d299625ebadae3d8b0881979633680e16b07daa':
  Bring back the Android Beam settings panel.
 2011-09-22 10:48:20 -07:00
Jeff Hamilton
0d299625eb Merge "Bring back the Android Beam settings panel." into ics-factoryrom 2011-09-22 10:47:03 -07:00
Jeff Hamilton
a1b6fdf473 am 4a2aabc4: Merge "Add strings for translation." into ics-factoryrom 
* commit '4a2aabc4d739ded949daa721adfce55fed2be2b6':
  Add strings for translation.
 2011-09-22 10:41:34 -07:00
Jeff Hamilton
4a2aabc4d7 Merge "Add strings for translation." into ics-factoryrom 2011-09-22 10:40:23 -07:00