PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,878 Commits 1 Branch 0 Tags
b7d94e74e1342c5583883e596fd268745a5a25b6
Commit Graph

8878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
8092adf3a9 Import translations. DO NOT MERGE 
Change-Id: I89608bcb397958bf76472adb67ec1402f4a3ed5c
Auto-generated-cl: translation import
 2012-11-29 11:05:49 -08:00
Baligh Uddin
9768cfb7df Import translations. DO NOT MERGE 
Change-Id: I42cd557944ae8f5f2da42603328eee04f5e6b25c
Auto-generated-cl: translation import
 2012-11-29 11:04:26 -08:00
Dianne Hackborn
ac4bfa607d am af604801: Merge "Be quiet!" into jb-mr1.1-dev 
* commit 'af6048010773606acf3a88df6954e1f7f3597a9f':
  Be quiet!
 2012-11-28 18:20:21 -08:00
Adam Cohen
e38d6277c8 am 9067d57a: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '9067d57a88e7bc43b7d1d0217b4b740f972bde47':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
 2012-11-28 18:18:26 -08:00
Dianne Hackborn
af60480107 Merge "Be quiet!" into jb-mr1.1-dev 2012-11-28 18:18:00 -08:00
Dianne Hackborn
79d42bb622 Be quiet! 
Change-Id: Ifcce5bf4b2fca35fe50a2684983dc726534c3d0c
 2012-11-28 18:05:00 -08:00
Adam Cohen
9067d57a88 Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 2012-11-28 17:47:19 -08:00
Adam Cohen
441588d221 Making sure keyguard and homescreen only display eligible widgets (issue 7550090) 
Change-Id: Ia1eb902618855e1a86a84c9090cdeefe5a404fd7
 2012-11-28 16:37:49 -08:00
John Spurlock
28c116f0c2 am fc4be385: Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev 
* commit 'fc4be3856f6e1cd47da742a2a30b322979a9ebd0':
  Update a few dream setting strings to ease translation.
 2012-11-28 06:31:50 -08:00
John Spurlock
fc4be3856f Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev 2012-11-28 06:30:29 -08:00
Daniel Sandler
7dee75c424 Add android.settings.DREAM_SETTINGS for Daydream settings. 
Bug: 7480927
Change-Id: I5777f7c4aec9ad7d7eb9f7eeb882d2342cb481c3
 2012-11-27 22:41:30 -05:00
Baligh Uddin
abd5b596fe am 3236571f: am 42db418f: Import translations. DO NOT MERGE 
* commit '3236571f4551bf20c4651ed9bc46380cd3ff8d67':
  Import translations. DO NOT MERGE
 2012-11-27 14:24:20 -08:00
Baligh Uddin
234ac63bea am 1e9f8d6f: Import translations. DO NOT MERGE 
* commit '1e9f8d6f5401105a3e78c28689f0be5a6b5f4072':
  Import translations. DO NOT MERGE
 2012-11-27 14:24:19 -08:00
Baligh Uddin
3236571f45 am 42db418f: Import translations. DO NOT MERGE 
* commit '42db418f963dfd200a75b518971c719215af352a':
  Import translations. DO NOT MERGE
 2012-11-27 14:23:27 -08:00
Baligh Uddin
1e9f8d6f54 Import translations. DO NOT MERGE 
Change-Id: Ibe10143bc63383ced22f10c1b7d35f90424dcb2f
Auto-generated-cl: translation import
 2012-11-27 14:22:35 -08:00
Baligh Uddin
42db418f96 Import translations. DO NOT MERGE 
Change-Id: I5b887c229653be7d975d36f96b2cdc66ebb498a9
Auto-generated-cl: translation import
 2012-11-27 14:21:30 -08:00
Baligh Uddin
20fbdbf1ec Import translations. DO NOT MERGE 
Change-Id: Icfe4b7b706f7ca8889a519688c222e35ecc5fb4e
Auto-generated-cl: translation import
 2012-11-27 14:20:22 -08:00
John Spurlock
8a9edfb1e3 Update a few dream setting strings to ease translation. 
Clarify that sleep = asleep and charging as we do in the ui.

Bug: 7564443
Change-Id: Id50938d6d4052fd4223e212125d10f4bfd0c6908
 2012-11-27 10:20:08 -05:00
Baligh Uddin
b1fdf6fd74 am 75e09c30: am 40129973: (-s ours) Import translations. DO NOT MERGE 
* commit '75e09c30a1b1eededc615d6dca319aab8ce40d2e':
  Import translations. DO NOT MERGE
 2012-11-26 09:38:44 -08:00
Baligh Uddin
75e09c30a1 am 40129973: (-s ours) Import translations. DO NOT MERGE 
* commit '401299739295b2305707810bbae2e49eadac50ba':
  Import translations. DO NOT MERGE
 2012-11-26 09:35:59 -08:00
Baligh Uddin
089773bacb am 16a4c2b2: Import translations. DO NOT MERGE 
* commit '16a4c2b2d38e2da6b26fc72029f9de0a1e282295':
  Import translations. DO NOT MERGE
 2012-11-26 09:35:10 -08:00
Baligh Uddin
16a4c2b2d3 Import translations. DO NOT MERGE 
Change-Id: Ibdf26abbd3f779772241bddcaa321ef7cec0d19b
Auto-generated-cl: translation import
 2012-11-22 23:19:57 -08:00
Baligh Uddin
4012997392 Import translations. DO NOT MERGE 
Change-Id: I21102fa6155368b3948a2606f9e30fde08b508b1
Auto-generated-cl: translation import
 2012-11-22 23:18:51 -08:00
Baligh Uddin
e1dade77d8 Import translations. DO NOT MERGE 
Change-Id: Iab1d6346ddbe0fdfa02ad21f86ff7aea66e0ea0e
Auto-generated-cl: translation import
 2012-11-22 23:17:46 -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
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
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
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
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
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
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
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
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
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
Jeff Sharkey
8ef71dbcbc Align "Make passwords visible" setting. 
Bug: 7545894
Change-Id: I46113676c46055bd7468a0aa7289c9475e714232
 2012-11-14 17:00:12 -08:00
Jeff Sharkey
f707491cfb Internationalize bytes and percentages. 
Bug: 7545890
Change-Id: I634fafe9d61a2ebbf7a0cc56d8255457ee9fe1b2
 2012-11-14 16:56:11 -08:00