PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,989 Commits 1 Branch 0 Tags
65b1230ea9829246d2bc8073974440a3a49af55c
Commit Graph

6989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
d27fa50a0a Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-26 14:06:13 -07:00
Ed Heyl
b9cd9bd532 reset to ics-mr1, but keep history 2011-10-26 18:50:24 +00:00
Eric Fischer
624673c2ca am 3e17577e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '3e17577e859a370eb6701bbfd671db7142674929':
  Import revised translations.  DO NOT MERGE
 2011-10-26 18:32:17 +00:00
Eric Fischer
3e17577e85 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-10-26 11:27:35 -07:00
Eric Fischer
59ecd1667a Import revised translations. DO NOT MERGE 
Change-Id: I9d5e132b9d4a9e505269ef9998acabfba8ffa975
 2011-10-26 11:09:44 -07:00
Eric Fischer
c57348f035 Import revised translations. DO NOT MERGE 
Change-Id: I7d78b6f42431a906f9a8f624c9f0e573859ea4bc
 2011-10-26 10:24:56 -07:00
The Android Automerger
c92cd9f738 merge in ics-release history after reset to master 2011-10-26 09:53:56 -07:00
Todd Poynor
12028a78b8 am f97709ca: am 296f2d27: am a94320e3: Settings use minimum manual brightness from config 
* commit 'f97709ca956c16690a9dea8bd041962c2a351f5c':
  Settings use minimum manual brightness from config
 2011-10-26 07:56:02 -07:00
Ed Heyl
249c10685d am 24491bbc: am 5f4cda38: (-s ours) merge ics-mr0 
* commit '24491bbc7ca2b43ce7f9e957d3e7fbefd8e9986b':
 2011-10-26 07:56:01 -07:00
Todd Poynor
f97709ca95 am 296f2d27: am a94320e3: Settings use minimum manual brightness from config 
* commit '296f2d270f23b27446d1d85450ac0310eb9fd3ea':
  Settings use minimum manual brightness from config
 2011-10-26 14:54:14 +00:00
Ed Heyl
24491bbc7c am 5f4cda38: (-s ours) merge ics-mr0 
* commit '5f4cda3888934cf9bfa01695c098beedcc45247f':
 2011-10-26 14:54:14 +00:00
The Android Automerger
f36cf0da90 merge in ics-mr1-release history after reset to ics-mr1 2011-10-26 07:05:34 -07:00
Todd Poynor
296f2d270f am a94320e3: Settings use minimum manual brightness from config 
* commit 'a94320e332f3c14b6ebb2359cc3fe363b8dfe688':
  Settings use minimum manual brightness from config
 2011-10-26 12:22:41 +00:00
Todd Poynor
a94320e332 Settings use minimum manual brightness from config 
Remove use of deprecated android.os.Power.BRIGHTNESS_DIM (20) + 10.

Change-Id: I24aff7d7fc93b4b67dedb1047bbbd4dbe3fae382
Signed-off-by: Todd Poynor <toddpoynor@google.com>
 2011-10-25 17:14:33 -07:00
Ed Heyl
5f4cda3888 merge ics-mr0 
Change-Id: I264e87a888059ada62b56a3ff7acf44cb0657cb8
 2011-10-25 20:19:41 +00:00
Eric Fischer
23a93001db am 6bf9bfac: Merge "Import revised translations." 
* commit '6bf9bfac0726f5283821a53348765e46db258c3d':
  Import revised translations.
 2011-10-25 11:47:45 -07:00
Eric Fischer
6bf9bfac07 Merge "Import revised translations." 2011-10-25 11:46:00 -07:00
Eric Fischer
6492021d3d Import revised translations. 
Change-Id: I85d5a78e41a780050884cec4669b45525bbeac0f
 2011-10-25 11:00:07 -07:00
Eric Fischer
906902376f am 66e034cb: (-s ours) am caf76c08: (-s ours) Import revised translations. DO NOT MERGE 
* commit '66e034cb7bb07d419dd5229630cd729ea81a7aa7':
  Import revised translations.  DO NOT MERGE
 2011-10-24 17:16:01 -07:00
Eric Fischer
66e034cb7b am caf76c08: (-s ours) Import revised translations. DO NOT MERGE 
* commit 'caf76c08b3d7044ef5cb55b1df4fd245e68889f7':
  Import revised translations.  DO NOT MERGE
 2011-10-24 17:14:12 -07:00
Eric Fischer
caf76c08b3 Import revised translations. DO NOT MERGE 
Change-Id: I7df445e1dff14ef16380b371d8e14af1b6a98295
 2011-10-24 17:09:58 -07:00
The Android Automerger
e4248f7ba8 merge in ics-release history after reset to master 2011-10-23 07:02:32 -07:00
Eric Fischer
5eca8c5c29 am 5907e060: (-s ours) am b8568b21: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '5907e06007fa7a15975294e4db28c5807e3ece25':
  Import revised translations.  DO NOT MERGE
 2011-10-21 16:05:58 -07:00
Eric Fischer
5907e06007 am b8568b21: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit 'b8568b21118a423c6e30e736c5702b3f946b6179':
  Import revised translations.  DO NOT MERGE
 2011-10-21 16:02:31 -07:00
Eric Fischer
b8568b2111 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-21 16:00:30 -07:00
Eric Fischer
d27a632d94 Import revised translations. DO NOT MERGE 
Change-Id: I1ccc1ed633e301bb2db039ea8ce1041a00daccc3
 2011-10-21 14:41:59 -07:00
Irfan Sheriff
28e8abc95b am cd5b0233: am cb5fa5a4: Merge "Remove wifidirect UI listing" into ics-mr0 
* commit 'cd5b0233bb73880e4d2f40633d33f1a6eb63e4b9':
  Remove wifidirect UI listing
 2011-10-21 14:40:48 -07:00
Irfan Sheriff
cd5b0233bb am cb5fa5a4: Merge "Remove wifidirect UI listing" into ics-mr0 
* commit 'cb5fa5a44779f790fae87102a573816ecc15dd3d':
  Remove wifidirect UI listing
 2011-10-21 14:38:39 -07:00
Peter Ng
c70f77f4ca am 31373a62: Merge "Settings applications processes viewer color updates" 
* commit '31373a62213d00dad20ed10ae8b1b4ffb85e4242':
  Settings applications processes viewer color updates
 2011-10-21 14:16:13 -07:00
Peter Ng
31373a6221 Merge "Settings applications processes viewer color updates" 2011-10-21 14:14:44 -07:00
Eric Fischer
2760259942 am 97fb1e8e: (-s ours) am 388c9e2f: (-s ours) Import revised translations. DO NOT MERGE 
* commit '97fb1e8e78bd62d044750f2be71a4625bff314f4':
  Import revised translations.  DO NOT MERGE
 2011-10-21 13:54:24 -07:00
Eric Fischer
97fb1e8e78 am 388c9e2f: (-s ours) Import revised translations. DO NOT MERGE 
* commit '388c9e2f14c4b533ec9d19c1513e51353de89e75':
  Import revised translations.  DO NOT MERGE
 2011-10-21 13:52:11 -07:00
Irfan Sheriff
cb5fa5a447 Merge "Remove wifidirect UI listing" into ics-mr0 2011-10-21 13:29:53 -07:00
Irfan Sheriff
74fda1065a Remove wifidirect UI listing 
Was used for testing. remove it until proper UI is
added

Bug: 5497909
Change-Id: Ic8bd1afbe348ede9031f2446b30a99d7efc88f7c
 2011-10-21 13:11:37 -07:00
Eric Fischer
388c9e2f14 Import revised translations. DO NOT MERGE 
Change-Id: Ib962f495098fdcffdcf5f75d5813bb5fb1e94d7c
 2011-10-20 18:04:50 -07:00
Peter Ng
8e26e6a216 Settings applications processes viewer color updates 
Change-Id: I233bed85c331aa909aebcd3358f7b985d9eaa473
 2011-10-20 14:04:53 -07:00
Eric Fischer
84ba32c91b am db4a4fd7: (-s ours) am 49a681c4: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit 'db4a4fd7180810656ab7ce390ab7c82c4790fd53':
  Import revised translations.  DO NOT MERGE
 2011-10-20 11:34:29 -07:00
Eric Fischer
db4a4fd718 am 49a681c4: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '49a681c4928d63b86fca0a546ee60b4f95d16669':
  Import revised translations.  DO NOT MERGE
 2011-10-20 11:32:06 -07:00
Eric Fischer
49a681c492 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-20 11:29:07 -07:00
Eric Fischer
e373aa16f7 Import revised translations. DO NOT MERGE 
Change-Id: Ic01568aa596d6aa3b36ee03d37f5d128e0744886
 2011-10-20 11:16:21 -07:00
The Android Automerger
ccd3aa0497 merge in ics-release history after reset to master 2011-10-20 07:01:56 -07:00
Danielle Millett
697476f856 am d4227b03: am 8123493e: Fix 5428748: Added more options for biometric weak 
* commit 'd4227b03869be8dff3150aaf62f435c39f1f6771':
  Fix 5428748: Added more options for biometric weak
 2011-10-19 15:16:14 -07:00
Danielle Millett
d4227b0386 am 8123493e: Fix 5428748: Added more options for biometric weak 
* commit '8123493ef905a210bd00b0c623459f4c86505298':
  Fix 5428748: Added more options for biometric weak
 2011-10-19 15:14:41 -07:00
Danielle Millett
8123493ef9 Fix 5428748: Added more options for biometric weak 
Adding make pattern visible (for pattern backup only) and vibrate
on touch as options for when biometric weak is enabled.

Change-Id: I6319f4f321779ebc6cf4acbfc0dd49b5014c0c88
 2011-10-19 13:58:30 -04:00
The Android Automerger
aacab48ecc merge in ics-release history after reset to master 2011-10-19 07:45:04 -07:00
Chih-Chung Chang
92f7fc5f14 am e790a067: am 0bcd8a95: Fix 5352588: Accept view intent without URI. 
* commit 'e790a067cbed209bc0bcf1d5e47c91904f032869':
  Fix 5352588: Accept view intent without URI.
 2011-10-19 03:36:08 -07:00
Chih-Chung Chang
e790a067cb am 0bcd8a95: Fix 5352588: Accept view intent without URI. 
* commit '0bcd8a95a96566d9e2c97c3305ee0dccf758ca7a':
  Fix 5352588: Accept view intent without URI.
 2011-10-19 03:33:46 -07:00
Chih-Chung Chang
0bcd8a95a9 Fix 5352588: Accept view intent without URI. 
Change-Id: Ibfcf32a7d27c3ac2d3fa3695e430b3e29f3ecd20
 2011-10-19 11:07:19 +08:00
Eric Fischer
77e9229cfc am 05a81a95: Merge "Import revised translations." 
* commit '05a81a9521b7462ae07e83aa6be15137a38fe57a':
  Import revised translations.
 2011-10-18 16:36:52 -07:00
Eric Fischer
05a81a9521 Merge "Import revised translations." 2011-10-18 16:35:18 -07:00