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

4524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
b4730b8a9e am 2439b7c0: (-s ours) am 84c90053: (-s ours) am fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread 
* commit '2439b7c00d86fb490b48e2bc0927fd581bf59e0e':
  Reimport Settings translations.  DO NOT MERGE
 2011-04-11 14:28:21 -07:00
Simon Wilson
184f8f085e am 719e1e43: (-s ours) am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread 
* commit '719e1e43173155cbe0d77298c3d1ca05f143048b':
  DO NOT MERGE Put additional update package names in config.xml
 2011-04-11 14:28:20 -07:00
Eric Fischer
8b73905e6a am 1985e381: (-s ours) am 6735ae14: (-s ours) am b4bd78f5: Revert "Import revised translations. DO NOT MERGE" 
* commit '1985e381cbcb817adc26f4f612f96583b692e397':
  Revert "Import revised translations.  DO NOT MERGE"
 2011-04-11 14:28:18 -07:00
Eric Fischer
2439b7c00d am 84c90053: (-s ours) am fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread 
* commit '84c90053751ae1bcb07a845f5ac9747a808198b1':
  Reimport Settings translations.  DO NOT MERGE
 2011-04-11 14:24:30 -07:00
Simon Wilson
719e1e4317 am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread 
* commit '2ca7add59f2437c4584029ba081bd4d222445ff9':
  DO NOT MERGE Put additional update package names in config.xml
 2011-04-11 14:24:28 -07:00
Eric Fischer
1985e381cb am 6735ae14: (-s ours) am b4bd78f5: Revert "Import revised translations. DO NOT MERGE" 
* commit '6735ae141fee012409a2eaa0310538f3b0173263':
  Revert "Import revised translations.  DO NOT MERGE"
 2011-04-11 14:24:25 -07:00
Simon Wilson
f927cccd79 am 37063d6a: DO NOT MERGE Clarify additional system update string length/usage 
* commit '37063d6adf9b472a8bb4bd58493517e04aafba95':
  DO NOT MERGE Clarify additional system update string length/usage
 2011-04-11 14:12:43 -07:00
Glenn Kasten
6a523c0816 am fc52971f: am b72f1b0f: am 858fd9a0: HDCP debugging in setting app part 2 of 2 
* commit 'fc52971f7e0e4409d4a78686e23a5e330e559fb8':
  HDCP debugging in setting app part 2 of 2
 2011-04-11 12:49:00 -07:00
Glenn Kasten
fc52971f7e am b72f1b0f: am 858fd9a0: HDCP debugging in setting app part 2 of 2 
* commit 'b72f1b0f45401a3fb8abe8e5e40eb5eab12e2710':
  HDCP debugging in setting app part 2 of 2
 2011-04-11 12:46:36 -07:00
Glenn Kasten
b72f1b0f45 am 858fd9a0: HDCP debugging in setting app part 2 of 2 
* commit '858fd9a0302c6d34781133137a048a9bf668632a':
  HDCP debugging in setting app part 2 of 2
 2011-04-11 12:43:22 -07:00
Simon Wilson
37063d6adf DO NOT MERGE Clarify additional system update string length/usage 
Change-Id: I627c3d50de1af23a620fe6ca3abac03ad3aa7d49
 2011-04-11 12:38:54 -07:00
Glenn Kasten
858fd9a030 HDCP debugging in setting app part 2 of 2 
Change-Id: I931c50938526adce521a7bf02301aba75abaacaf
 2011-04-11 11:11:56 -07:00
Brian Carlstrom
5298d488b7 Merge "Tolerate missing AccountManager resource, not just missing resource name" 2011-04-08 10:28:37 -07:00
Joe Onorato
cedfdd9d17 Remove the deprecated things from Config.java. These havent been working since before 1.0. 
Change-Id: I88ea860fd6edf7c128cf1a201329f09428ab382c
 2011-04-07 18:41:13 -07:00
Eric Fischer
89882974d6 Merge "Import revised translations." 2011-04-07 14:08:01 -07:00
Eric Fischer
c821f6d8f8 Import revised translations. 
Change-Id: I176df34d590daa670ac132759d7f4cb91e4b3747
 2011-04-07 13:59:28 -07:00
Brian Carlstrom
d26321eecb Tolerate missing AccountManager resource, not just missing resource name 
Change-Id: I29ceed33a9cc8e697bfd3226f6ec58291c36daae
 2011-04-07 11:58:39 -07:00
Joe Onorato
74562a13a3 Merge "advanced settings" 2011-04-06 18:45:33 -07:00
Joe Onorato
4c0c2bea9e advanced settings 
Change-Id: Ibc3889e2ab0569f851ec46fe4d1cb1b4920ea5be
 2011-04-06 18:26:20 -07:00
Eric Fischer
cdef44c985 am 94cdd67d: (-s ours) am 84edd9d5: am 8214c76e: Import revised translations. DO NOT MERGE 
* commit '94cdd67dcf67b5c25bc063d887bdb1e5864cd35d':
  Import revised translations.  DO NOT MERGE
 2011-04-06 14:21:43 -07:00
Eric Fischer
94cdd67dcf am 84edd9d5: am 8214c76e: Import revised translations. DO NOT MERGE 
* commit '84edd9d5281cb8e03ea31631aa232b8458136f32':
  Import revised translations.  DO NOT MERGE
 2011-04-06 14:19:10 -07:00
Eric Fischer
84edd9d528 am 8214c76e: Import revised translations. DO NOT MERGE 
* commit '8214c76e27de37a663cf8ce7a30091bf23c9be02':
  Import revised translations.  DO NOT MERGE
 2011-04-06 14:16:10 -07:00
Eric Fischer
8214c76e27 Import revised translations. DO NOT MERGE 
Change-Id: I5096f0341965e767187b8444f93804cad934ada9
 2011-04-06 13:51:27 -07:00
Eric Fischer
0aa34b70d0 Reimport Settings translations. DO NOT MERGE 
Change-Id: I90c528fe4f87a3f53875eae9f98b2a6aaa4d1b6a
 2011-04-06 13:47:49 -07:00
Simon Wilson
bcb8ec76e8 DO NOT MERGE Put additional update package names in config.xml 
Prevents them from being duplicated to other language resources,
which in turn prevents the overlay from working. This fixes the
bug where we see a blank menu item in Settings->About phone
when the non-default language is selected.

Change-Id: I73056716156c580606433bb63abfdd35c1b9892a
 2011-04-06 13:47:27 -07:00
Eric Fischer
5efe251f40 Revert "Import revised translations. DO NOT MERGE" 
This reverts commit 955ab98f03.

Bug 4204088 requires that these strings not be translated.

Change-Id: I98044cc669a9ee70a8892123a05c0fc33599d404
 2011-04-06 13:46:58 -07:00
Eric Fischer
7c79299672 am b7185a54: (-s ours) am dfb78827: (-s ours) am 955ab98f: Import revised translations. DO NOT MERGE 
* commit 'b7185a549ca04c098ce050fa1da172a06ecdf230':
  Import revised translations.  DO NOT MERGE
 2011-04-05 10:26:27 -07:00
Eric Fischer
b7185a549c am dfb78827: (-s ours) am 955ab98f: Import revised translations. DO NOT MERGE 
* commit 'dfb78827767e14c8db205d8a7200f3f4025a0831':
  Import revised translations.  DO NOT MERGE
 2011-04-04 17:42:55 -07:00
Eric Fischer
84c9005375 am fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread 
* commit 'fcb089c94280dd3b5a1ed8f90610d258a43abb78':
  Reimport Settings translations.  DO NOT MERGE
 2011-04-04 14:43:04 -07:00
Simon Wilson
2ca7add59f am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread 
* commit 'ca572fb64b77a2fe3ff93874ee5956214368b104':
  DO NOT MERGE Put additional update package names in config.xml
 2011-04-04 14:43:02 -07:00
Eric Fischer
6735ae141f am b4bd78f5: Revert "Import revised translations. DO NOT MERGE" 
* commit 'b4bd78f52305aa1b47fe9ac09d99e00116f201a6':
  Revert "Import revised translations.  DO NOT MERGE"
 2011-04-04 14:42:59 -07:00
Eric Fischer
dfb7882776 am 955ab98f: Import revised translations. DO NOT MERGE 
* commit '955ab98f030cd198d838bdff8768ff87a17be9a8':
  Import revised translations.  DO NOT MERGE
 2011-04-04 12:21:25 -07:00
Eric Fischer
fcb089c942 Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread 2011-04-01 16:52:28 -07:00
Simon Wilson
ca572fb64b Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread 2011-04-01 16:47:22 -07:00
Eric Fischer
3ac5c8cfd2 Reimport Settings translations. DO NOT MERGE 
Change-Id: I90c528fe4f87a3f53875eae9f98b2a6aaa4d1b6a
 2011-04-01 16:42:38 -07:00
Eric Fischer
b4bd78f523 Revert "Import revised translations. DO NOT MERGE" 
This reverts commit 955ab98f03.

Bug 4204088 requires that these strings not be translated.

Change-Id: I98044cc669a9ee70a8892123a05c0fc33599d404
 2011-04-01 16:13:11 -07:00
Simon Wilson
5014f281d7 DO NOT MERGE Put additional update package names in config.xml 
Prevents them from being duplicated to other language resources,
which in turn prevents the overlay from working. This fixes the
bug where we see a blank menu item in Settings->About phone
when the non-default language is selected.

Change-Id: I73056716156c580606433bb63abfdd35c1b9892a
 2011-04-01 13:59:32 -07:00
The Android Automerger
bc294b551d merge in gingerbread-release history after reset to gingerbread 2011-04-01 13:28:16 -07:00
Jim Miller
b368342504 Merge "Fix LockScreen Settings on phones." 2011-03-31 13:24:19 -07:00
Jim Miller
30cf12cc17 Fix LockScreen Settings on phones. 
Change-Id: Ibbb0bcb4f34ba442d9ec678277718d3141f9d807
 2011-03-30 21:16:48 -07:00
The Android Automerger
b49792e1a4 merge in gingerbread-release history after reset to gingerbread 2011-03-30 18:33:05 -07:00
Park Sanghyun
1a7b8a8996 am ebfc5e3e: (-s ours) am 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add support for additional System Update menu item 
* commit 'ebfc5e3ed65d3d015b50372fb216782c4af7a3ac':
  DO NOT MERGE Add support for additional System Update menu item
 2011-03-30 16:40:49 -07:00
Kenny Root
5b12490abf am 42f178d1: resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp 
* commit '42f178d10bcad0a8c04f20b2dfd2e3c28117a7cf':
  Settings: Improved UX when viewing open source license info.
 2011-03-30 16:38:52 -07:00
Park Sanghyun
ebfc5e3ed6 am 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add support for additional System Update menu item 
* commit '2b2959b32141e86a0de880ded77c3ef63a081e0f':
  DO NOT MERGE Add support for additional System Update menu item
 2011-03-30 15:29:48 -07:00
Kenny Root
42f178d10b resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp 
Change-Id: I1df4d790b070acbf89b9ee16bd750918486fce58
 2011-03-30 09:36:40 -07:00
Park Sanghyun
2b2959b321 am e5da8565: DO NOT MERGE Add support for additional System Update menu item 
* commit 'e5da8565ca7930483c2e8c6467710716cf51ba51':
  DO NOT MERGE Add support for additional System Update menu item
 2011-03-30 09:31:15 -07:00
Eric Fischer
fd78f3dd31 am f701fd1a: (-s ours) am 573235d9: am 142f4533: am 429687b9: (-s ours) Import revised translations. DO NOT MERGE 
* commit 'f701fd1a962180b75531bea555ff9e60ff2647dc':
  Import revised translations.  DO NOT MERGE
 2011-03-29 16:59:28 -07:00
Kenny Root
70a1ff0357 am 7fceefa7: Merge "Settings: Improved UX when viewing open source license info." 
* commit '7fceefa79229ece2efab0446841543a8f8f20a1d':
  Settings: Improved UX when viewing open source license info.
 2011-03-29 15:43:38 -07:00
Kenny Root
7fceefa792 Merge "Settings: Improved UX when viewing open source license info." 2011-03-29 15:03:25 -07:00
Henrik Carlsson
2cb19ab9e2 Settings: Improved UX when viewing open source license info. 
Added spinning progress indicator to the open source license dialog.
The actual file loading is now handled by a separate thread, in
order to provide user feedback and reduce risk for ANR.

Change-Id: Ia12727ecc2fe8114e0d1384769b568142c8a1db6
 2011-03-29 15:02:44 -07:00