Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,029 Commits 1 Branch 0 Tags
a60df34ea19ea95cf8ebbe778a7abcb7908a50ff
Commit Graph

2034 Commits

Author SHA1 Message Date
Danielle Millett
5e83b2faeb am cc571cc4: Merge "Changed header to specify backup lock" 
* commit 'cc571cc4fe626517482435a8ffd3bd461bf4bbbd':
  Changed header to specify backup lock
 2011-09-27 07:27:24 -07:00
Danielle Millett
cc571cc4fe Merge "Changed header to specify backup lock" 2011-09-27 06:14:01 -07:00
satok
377706654b am e12b4cd5: Merge "Fix the alignment of the preference in IME settings on Tablet" 
* commit 'e12b4cd54da737f29f50a033bdf655a214722144':
  Fix the alignment of the preference in IME settings on Tablet
 2011-09-27 01:55:41 -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
01c2387bae am 44e32ab4: Merge "Tweak IME settings" 
* commit '44e32ab40fa1421a564801d2bfba0407575d7e37':
  Tweak IME settings
 2011-09-27 00:12:16 -07: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
Jeff Sharkey
28a345ac84 am dc2c5ae2: Merge "Data usage strings, sweep touches, fixes." 
* commit 'dc2c5ae2b0b123df1c2256672be9e2ec8bde248b':
  Data usage strings, sweep touches, fixes.
 2011-09-26 19:16:57 -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
Kenny Root
2ee896a519 am 3f1fb4f1: Merge "Make verifier device id information visible" 
* commit '3f1fb4f1549c3ff32cd85e85bbe13765a02d6960':
  Make verifier device id information visible
 2011-09-26 14:39:26 -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
Wink Saville
1ec34bfedd am bde64e3d: am 426fc66a: Add persist.radio.ramdump. 
* commit 'bde64e3d93b0144cd8b7c0ff65103ffb63fddba7':
  Add persist.radio.ramdump.
 2011-09-25 15:27:11 -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
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
Eric Fischer
86b49eea5e Import revised translations. DO NOT MERGE 
Change-Id: Iebee5d29b6baa4e479a03ae7058e891f852968f6
 2011-09-23 15:28:41 -07:00
Wink Saville
310b39fffa am 9fe945b8: am fbea38fd: Merge "Add a button to enable/disable Mobile Terminated SMS over IMS" into ics-factoryrom 
* commit '9fe945b854f92314ad387705ad20a129e46c317a':
  Add a button to enable/disable Mobile Terminated SMS over IMS
 2011-09-22 23:42:46 -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
2e56b15ae7 am 16a9b14f: Merge "Don\'t append list of accounts every time we return to this screen." 
* commit '16a9b14fa748c742c62f621586244303da4f4d8e':
  Don't append list of accounts every time we return to this screen.
 2011-09-22 17:05:41 -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
Jeff Hamilton
041a34075c am 4cfe1055: am 0d299625: Merge "Bring back the Android Beam settings panel." into ics-factoryrom 
* commit '4cfe105506035f151242080e0ac7bd205542a2d9':
  Bring back the Android Beam settings panel.
 2011-09-22 10:49:53 -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
8ccddfd8d4 am a1b6fdf4: am 4a2aabc4: Merge "Add strings for translation." into ics-factoryrom 
* commit 'a1b6fdf4738e0d0aec4eb389316a7c354fe37c00':
  Add strings for translation.
 2011-09-22 10:43: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
Jeff Hamilton
3d670de5ce Bring back the Android Beam settings panel. 
Bug: 5350022
Change-Id: I22d2c6f91f7ab86501021fe97a2d57b109ed10bf
 2011-09-22 12:35:55 -05:00
Jeff Hamilton
7c430090c9 Add strings for translation. 2011-09-22 12:35:54 -05:00
Amith Yamasani
8a73ef8434 am 7e911169: am bce7b69a: Merge "Move "Pulse notification light" to Display settings." into ics-factoryrom 
* commit '7e9111695d42b6d794a5a9beb422b6727c6f6559':
  Move "Pulse notification light" to Display settings.
 2011-09-20 17:01:51 -07:00
Amith Yamasani
7e9111695d am bce7b69a: Merge "Move "Pulse notification light" to Display settings." into ics-factoryrom 
* commit 'bce7b69a27731ae9a58dbfa8f446c3b93d1f1cc6':
  Move "Pulse notification light" to Display settings.
 2011-09-20 16:58:52 -07:00
Amith Yamasani
bce7b69a27 Merge "Move "Pulse notification light" to Display settings." into ics-factoryrom 2011-09-20 16:57:32 -07:00
Freeman Ng
d60e977d84 am d6b8856b: am 01b20096: Merge "adjust char limit for translations" into ics-factoryrom 
* commit 'd6b8856bc1152994ddfb8055ac6a1c292b0dda61':
  adjust char limit for translations
 2011-09-20 16:25:45 -07:00
Eric Fischer
f85b8b1a17 Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 2011-09-20 15:37:04 -07:00
Freeman Ng
d6b8856bc1 am 01b20096: Merge "adjust char limit for translations" into ics-factoryrom 
* commit '01b2009608a1ce58711efac4541f4acad62e038c':
  adjust char limit for translations
 2011-09-20 15:36:33 -07:00
Eric Fischer
513fd05c38 Import revised translations. DO NOT MERGE 
Change-Id: I9f4fbeded8f7d068d70fb1ed29b414d1cc9e4d11
 2011-09-20 15:24:00 -07:00
Freeman Ng
f471c4ece8 adjust char limit for translations 
bug: 5348039
Change-Id: I2c7153b3b8281398644a9a0ebdb1a4921af4f261
 2011-09-20 15:18:05 -07:00
Amith Yamasani
883d850ede Move "Pulse notification light" to Display settings. 
Bug: 5242350
Change-Id: I91cb23ca8f49c1c053710031b0316b10d55fbab4
 2011-09-20 14:41:03 -07:00
Eric Fischer
c4caeeb994 am 367bb497: Merge "Import revised translations." 
* commit '367bb497be57bb4504daf2f9f11ee004348be6d8':
  Import revised translations.
 2011-09-20 14:16:19 -07:00
Luca Zanolin
fc8bad9f17 am c8caf47c: Merge "Change title in the setting for "Speech" category" 
* commit 'c8caf47c7ab8897a9416ad9df188bbc760a99461':
  Change title in the setting for "Speech" category
 2011-09-20 14:15:30 -07:00
Eric Fischer
367bb497be Merge "Import revised translations." 2011-09-20 11:02:16 -07:00
Eric Fischer
24c4fb1567 Import revised translations. 
Change-Id: Id6474f106ab35f9f0b9c799f3d9c3888868c6f58
 2011-09-20 10:37:57 -07:00
Luca Zanolin
8cb280ddff Change title in the setting for "Speech" category 
Bug: 5049218
Change-Id: I42a6726600459b9ff3f3ab25118f1c7896f705a8
 2011-09-20 17:58:45 +01:00
Wink Saville
82650a18a6 am 37dceac5: am 1e596f30: Add Button to *#*#INFO#*#* for ims registration. 
* commit '37dceac57199c4ce135b8eb060ad22d9d697a2c5':
  Add Button to *#*#INFO#*#* for ims registration.
 2011-09-19 15:06:31 -07:00
Wink Saville
37dceac571 am 1e596f30: Add Button to *#*#INFO#*#* for ims registration. 
* commit '1e596f303520d211aebc87dfc0c08108efe80921':
  Add Button to *#*#INFO#*#* for ims registration.
 2011-09-19 15:02:02 -07:00
Wink Saville
1e596f3035 Add Button to *#*#INFO#*#* for ims registration. 
For testing add a button to toggle SystemProperty
persist.radio.imsregrequired

Bug: 5337311
Change-Id: Id2d8ffa4c67992245d80b0ccafb6ed719fa749cc
 2011-09-19 14:24:39 -07:00
Jeff Sharkey
c8657d38fc am 3361663e: am 2ae88521: Merge "Surface tethering stats in data usage." into ics-factoryrom 
* commit '3361663e37154b19316179e05955f05887d9ddc4':
  Surface tethering stats in data usage.
 2011-09-18 16:19:39 -07:00