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

10458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
0d7cc3b5ea am 6dca6273: am 61b6c47e: am e71a8772: Import translations. DO NOT MERGE 
* commit '6dca62736d1bf83b2236094dbea76d0e79cd91fa':
  Import translations. DO NOT MERGE
 2012-11-22 11:21:21 -08:00
Baligh Uddin
6dca62736d am 61b6c47e: am e71a8772: Import translations. DO NOT MERGE 
* commit '61b6c47e6c93ab20e8362517c48bd515c5647bdf':
  Import translations. DO NOT MERGE
 2012-11-22 11:19:32 -08:00
Baligh Uddin
61b6c47e6c am e71a8772: Import translations. DO NOT MERGE 
* commit 'e71a8772bbc92a72e68484bb6c0aa2e3c0baa64d':
  Import translations. DO NOT MERGE
 2012-11-22 11:17:40 -08:00
Danielle Millett
12c1451f1f Removing tutorial for choosing a pattern as part of b/7459863 
Removing the tutorial that is shown the first time a user sets up
a pattern as their lock type.

Change-Id: If73c936e41458af729740fe5b178b9452c7dd2c0
 2012-11-21 15:44:16 -05:00
Baligh Uddin
e71a8772bb Import translations. DO NOT MERGE 
Change-Id: I275d3bec8048e4da0d30b6deabc6966f6b0785fe
Auto-generated-cl: translation import
 2012-11-21 00:04:32 -08:00
Jake Hamby
95c1003f1c Fix Bluetooth enable dialog to match Android style guide. 
When an app requests to enable Bluetooth and/or Bluetooth discovery,
we show a dialog for user confirmation. Remove the dialog title,
update the message text and button labels to be more descriptive,
and use the standard dialog layout instead of a custom layout.

Also fixes the button layout on the Bluetooth permission test app so
that the "Discoverable" button doesn't wrap to two lines.

Bug: 6001468
Change-Id: I731e2f31b4c822395fc3f83584a092550d9ae7d3
 2012-11-20 18:21:44 -08:00
The Android Automerger
6c1d5b105b merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-19 16:13:33 -08:00
Baligh Uddin
38fbf32013 am aaa9d694: (-s ours) am 1fd5703d: am e9f89cfb: am 7ed1879f: Import translations. DO NOT MERGE 
* commit 'aaa9d694019a1afaf98fb70285098bc981764d80':
  Import translations. DO NOT MERGE
 2012-11-16 18:06:13 -08:00
Baligh Uddin
aaa9d69401 am 1fd5703d: am e9f89cfb: am 7ed1879f: Import translations. DO NOT MERGE 
* commit '1fd5703d5e67d42a3a8819aa0db675b987671791':
  Import translations. DO NOT MERGE
 2012-11-16 18:04:17 -08:00
Baligh Uddin
1fd5703d5e am e9f89cfb: am 7ed1879f: Import translations. DO NOT MERGE 
* commit 'e9f89cfbf5309453e8efc2826815592660e9e1c2':
  Import translations. DO NOT MERGE
 2012-11-16 18:02:20 -08:00
Baligh Uddin
e9f89cfbf5 am 7ed1879f: Import translations. DO NOT MERGE 
* commit '7ed1879f283e4c92fe47ab345c5fdf405e95f233':
  Import translations. DO NOT MERGE
 2012-11-16 17:59:01 -08:00
Baligh Uddin
7ed1879f28 Import translations. DO NOT MERGE 
Change-Id: If48dc63e0112cc63e76b635047b38cde4b33ea06
Auto-generated-cl: translation import
 2012-11-16 15:51:59 -08:00
Eric Laurent
35a2d0fd09 am 4f103c0c: am ccc1d614: am 15c27bb4: Merge "fix dock audio enable dialog" into jb-mr1.1-dev 
* commit '4f103c0c1aed90e771b9f1d02b07ebb8b7780636':
  fix dock audio enable dialog
 2012-11-16 14:12:17 -08:00
Eric Laurent
4f103c0c1a am ccc1d614: am 15c27bb4: Merge "fix dock audio enable dialog" into jb-mr1.1-dev 
* commit 'ccc1d614899459e2bb34ff977760bbb1cb225e95':
  fix dock audio enable dialog
 2012-11-16 14:09:47 -08:00
Eric Laurent
ccc1d61489 am 15c27bb4: Merge "fix dock audio enable dialog" into jb-mr1.1-dev 
* commit '15c27bb40bc493e898442e8e4ac9b52dd89dae58':
  fix dock audio enable dialog
 2012-11-16 14:07:07 -08:00
Eric Laurent
15c27bb40b Merge "fix dock audio enable dialog" into jb-mr1.1-dev 2012-11-16 14:05:00 -08:00
Amith Yamasani
775176cbb4 am 21b5aacf: am 0aa79c73: am 60977265: Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev 
* commit '21b5aacf34e5249b59cdbf0cc349fa2d604a25a4':
  Use AlarmManager calls to set date/time, instead of SystemClock.setTime
 2012-11-16 11:37:30 -08:00
The Android Automerger
eb63a1f228 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-16 11:29:50 -08:00
Amith Yamasani
21b5aacf34 am 0aa79c73: am 60977265: Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev 
* commit '0aa79c73948af7600f289928b18b3231d9679f81':
  Use AlarmManager calls to set date/time, instead of SystemClock.setTime
 2012-11-16 10:48:59 -08:00
Amith Yamasani
0aa79c7394 am 60977265: Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev 
* commit '609772652250a4408c4cfef2560d145fd365db2b':
  Use AlarmManager calls to set date/time, instead of SystemClock.setTime
 2012-11-16 10:45:44 -08:00
Amith Yamasani
6097726522 Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev 2012-11-16 10:43:04 -08:00
Vikram Aggarwal
c7da73229e am 8761a053: am 49a87243: am f15f9d67: Merge "Remove back button entirely when disabled" into jb-mr1.1-dev 
* commit '8761a0536b618c3dd2711b26142469b6a6591423':
  Remove back button entirely when disabled
 2012-11-16 10:38:13 -08:00
Amith Yamasani
afbf58aab3 am f6c07cab: am 4c326c2d: am 940f6f0c: Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev 
* commit 'f6c07cab362219ef4457b9fc418c6e11e34b17e0':
  Fix a race condition when switching between settings panels
 2012-11-16 10:38:04 -08:00
Jeff Sharkey
62bafa5935 am 282aacb5: am 05407e77: am 733bd437: Merge "Internationalize bytes and percentages." into jb-mr1.1-dev 
* commit '282aacb5c372bf8beece536ce3b2510f87be59db':
  Internationalize bytes and percentages.
 2012-11-16 10:37:37 -08:00
Jeff Sharkey
1b4dbed53f am 8f7d5cac: am 1fde57fe: am 6992d407: Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev 
* commit '8f7d5cac7a78a203bb77a3086bf7b380c0c451f0':
  Align "Make passwords visible" setting.
 2012-11-16 10:37:36 -08:00
Baligh Uddin
46b36703f8 am b8fc41ff: (-s ours) am 68c7237a: am 3058022c: am add9d21f: Import translations. DO NOT MERGE 
* commit 'b8fc41ffeeb97c52c52e352d92f67480439f12cd':
  Import translations. DO NOT MERGE
 2012-11-16 10:37:13 -08:00
Baligh Uddin
4cc77634d5 am 0d459d6e: (-s ours) am 58a55157: am ec5c2a46: Import translations. DO NOT MERGE 
* commit '0d459d6e745736c59ad98cecdc56f2161df69d1c':
  Import translations. DO NOT MERGE
 2012-11-16 10:37:10 -08:00
Baligh Uddin
2c9eff0147 am e11331c8: (-s ours) am 29483a53: Import translations. DO NOT MERGE 
* commit 'e11331c8140656fe81605bbb86aadf5fc4cfc7b6':
  Import translations. DO NOT MERGE
 2012-11-16 10:37:08 -08:00
Amith Yamasani
5f05010438 Use AlarmManager calls to set date/time, instead of SystemClock.setTime 
This way secondary users' settings app can request the system server to
set the time. Alarm driver cannot be opened as a secondary user.

Bug: 7459635
Change-Id: I1ae1630dc448021d35280a297c5d9960f8e8fc2e
 2012-11-15 14:44:41 -08:00
Vikram Aggarwal
8761a0536b am 49a87243: am f15f9d67: Merge "Remove back button entirely when disabled" into jb-mr1.1-dev 
* commit '49a872436c660cff19c2cfd50d3de5b8bcb3a7ac':
  Remove back button entirely when disabled
 2012-11-15 12:58:33 -08:00
Vikram Aggarwal
49a872436c am f15f9d67: Merge "Remove back button entirely when disabled" into jb-mr1.1-dev 
* commit 'f15f9d67652dacc7f8d2764245f79b25d2c6c67b':
  Remove back button entirely when disabled
 2012-11-15 12:55:36 -08:00
Vikram Aggarwal
f15f9d6765 Merge "Remove back button entirely when disabled" into jb-mr1.1-dev 2012-11-15 12:53:25 -08:00
Amith Yamasani
f6c07cab36 am 4c326c2d: am 940f6f0c: Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev 
* commit '4c326c2d2dac4b8f0394d96aae1012d4143ff427':
  Fix a race condition when switching between settings panels
 2012-11-15 12:25:25 -08:00
Amith Yamasani
4c326c2d2d am 940f6f0c: Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev 
* commit '940f6f0c46d2558bc30d1fe788150ae6d295779b':
  Fix a race condition when switching between settings panels
 2012-11-15 12:23:50 -08:00
Amith Yamasani
940f6f0c46 Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev 2012-11-15 12:21:31 -08:00
Jeff Sharkey
282aacb5c3 am 05407e77: am 733bd437: Merge "Internationalize bytes and percentages." into jb-mr1.1-dev 
* commit '05407e77e060e8b62a197065538e44a2b0cf8e38':
  Internationalize bytes and percentages.
 2012-11-15 11:50:11 -08:00
Jeff Sharkey
8f7d5cac7a am 1fde57fe: am 6992d407: Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev 
* commit '1fde57fed5431b7d03764beed6cf201c55e70a24':
  Align "Make passwords visible" setting.
 2012-11-15 11:50:10 -08:00
Jeff Sharkey
05407e77e0 am 733bd437: Merge "Internationalize bytes and percentages." into jb-mr1.1-dev 
* commit '733bd43798c292b35d06b02fe3722a52481886a8':
  Internationalize bytes and percentages.
 2012-11-15 11:47:37 -08:00
Jeff Sharkey
1fde57fed5 am 6992d407: Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev 
* commit '6992d407760b1b5ed3744566c1d9bca9ae1a77be':
  Align "Make passwords visible" setting.
 2012-11-15 11:47:35 -08:00
Jeff Sharkey
733bd43798 Merge "Internationalize bytes and percentages." into jb-mr1.1-dev 2012-11-15 11:44:44 -08:00
Jeff Sharkey
6992d40776 Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev 2012-11-15 11:44:38 -08:00
Baligh Uddin
b8fc41ffee am 68c7237a: am 3058022c: am add9d21f: Import translations. DO NOT MERGE 
* commit '68c7237ace163222c7403a9d84d051e54f472a6e':
  Import translations. DO NOT MERGE
 2012-11-15 09:07:10 -08:00
Baligh Uddin
68c7237ace am 3058022c: am add9d21f: Import translations. DO NOT MERGE 
* commit '3058022c169b04680cb48f143364ab799e75ee85':
  Import translations. DO NOT MERGE
 2012-11-15 09:04:59 -08:00
Baligh Uddin
0d459d6e74 am 58a55157: am ec5c2a46: Import translations. DO NOT MERGE 
* commit '58a551575915a73ffbb1b20066bf8c39c515aa1d':
  Import translations. DO NOT MERGE
 2012-11-15 09:03:22 -08:00
Baligh Uddin
e11331c814 am 29483a53: Import translations. DO NOT MERGE 
* commit '29483a5334360921f39694175daaaed57d68dd02':
  Import translations. DO NOT MERGE
 2012-11-15 09:03:20 -08:00
Baligh Uddin
3058022c16 am add9d21f: Import translations. DO NOT MERGE 
* commit 'add9d21f581272a957f8df4c9895d5c03515db13':
  Import translations. DO NOT MERGE
 2012-11-15 09:02:00 -08:00
Baligh Uddin
58a5515759 am ec5c2a46: Import translations. DO NOT MERGE 
* commit 'ec5c2a4603848cbf2027367b7942014f9fae48c5':
  Import translations. DO NOT MERGE
 2012-11-15 09:01:30 -08:00
Baligh Uddin
284fd80603 Merge "Import translations. DO NOT MERGE" 2012-11-15 08:59:23 -08:00
Björn Lundén
f34e6b4939 Settings: Fix Swedish translations 
The translation of "Time on" to "Tid funktionen varit på"
is too long. The result is that it covers the actual counter.

(Fix for issue 23804.)

The translation of "Not in range" to "Inte i intervall"
for wifi_not_in_range is a literal translation. When
talking about range for a radio signal, the correct
Swedish word is "räckhåll".

(Fixes issue mentioned in 22608.)

Change-Id: Iecf2acdd1acf8831c3f71d6f16cb17be5ce90d75
 2012-11-15 06:36:52 -08:00
Jeff Sharkey
8ef71dbcbc Align "Make passwords visible" setting. 
Bug: 7545894
Change-Id: I46113676c46055bd7468a0aa7289c9475e714232
 2012-11-14 17:00:12 -08:00