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

4739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eric Fischer
f701fd1a96 am 573235d9: am 142f4533: am 429687b9: (-s ours) Import revised translations. DO NOT MERGE 
* commit '573235d9a73efdf3af066e47803a6c24382e6979':
  Import revised translations.  DO NOT MERGE
 2011-03-29 14:19:44 -07:00
Eric Fischer
573235d9a7 am 142f4533: am 429687b9: (-s ours) Import revised translations. DO NOT MERGE 
* commit '142f453399a123a3f9c046f5cec626b7e7d6facd':
  Import revised translations.  DO NOT MERGE
 2011-03-29 14:15:16 -07:00
Eric Fischer
142f453399 am 429687b9: (-s ours) Import revised translations. DO NOT MERGE 
* commit '429687b9ceace0d7fab9aa65c9d93e8f3eec93ba':
  Import revised translations.  DO NOT MERGE
 2011-03-29 14:07:12 -07:00
Jake Hamby
c4d9d80906 am 823a6ee9: am e9fdee0e: am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1 
* commit '823a6ee9ec95e0278ae77b37392c873e86bfe071':
  Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.
 2011-03-29 13:36:41 -07:00
Jake Hamby
823a6ee9ec am e9fdee0e: am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1 
* commit 'e9fdee0ed0ca2f2e0e83cda161906ca3a0a673a6':
  Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.
 2011-03-29 13:34:20 -07:00
Eric Fischer
429687b9ce Import revised translations. DO NOT MERGE 
Change-Id: Id19c294af4493e0d47193ab3477d5c0a1c068669
 2011-03-29 13:32:59 -07:00
Jake Hamby
e9fdee0ed0 am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1 
* commit '81cb6be834f4604f6b58d8516f2b8e12620a3d16':
  Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.
 2011-03-29 13:31:54 -07:00
Jake Hamby
81cb6be834 Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1 2011-03-29 13:28:48 -07:00
Eric Fischer
1110d6b875 am c091a927: (-s ours) am 388fc081: am 3b4b91d4: Import revised translations. DO NOT MERGE 
* commit 'c091a9273d19efcdf29d6ec87fb02bc65ad097e1':
  Import revised translations.  DO NOT MERGE
 2011-03-29 12:28:04 -07:00
Eric Fischer
c091a9273d am 388fc081: am 3b4b91d4: Import revised translations. DO NOT MERGE 
* commit '388fc081bcca23525fa5a7cea58b8d4ae794d69c':
  Import revised translations.  DO NOT MERGE
 2011-03-29 12:24:35 -07:00
Eric Fischer
388fc081bc am 3b4b91d4: Import revised translations. DO NOT MERGE 
* commit '3b4b91d43de5be5f920b7ed931c942817970e336':
  Import revised translations.  DO NOT MERGE
 2011-03-29 12:19:35 -07:00
Eric Fischer
3b4b91d43d Import revised translations. DO NOT MERGE 
Change-Id: Ic677ab3652341f1ef35a068f7290e15145172f37
 2011-03-29 12:00:36 -07:00
Eric Fischer
955ab98f03 Import revised translations. DO NOT MERGE 
Change-Id: Ic2e2fd3330cb069f55054e08aad153c1b342e0a4
 2011-03-29 10:58:24 -07:00
Jake Hamby
f1139aab80 Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices. 
Fix NPE when entering Settings app in the SDK (and for devices without
Bluetooth). Also remove the "Bluetooth settings" item in addition to
the Bluetooth toggle item from Wireless settings when BT is missing.

Bug: 4149307
Change-Id: Iecc5960a193cf88664d3217b4d7bdbc2276dabc0
 2011-03-28 20:25:23 -07:00
The Android Automerger
4bc6021abf merge in gingerbread-release history after reset to gingerbread 2011-03-28 16:31:26 -07:00
The Android Automerger
84283381b3 merge in gingerbread-release history after reset to gingerbread 2011-03-28 05:44:08 -07:00
The Android Automerger
4a85487c14 merge in gingerbread-release history after reset to gingerbread 2011-03-25 22:26:02 -07:00
Park Sanghyun
e5da8565ca DO NOT MERGE Add support for additional System Update menu item 
Change-Id: I21bf87b5d2805da672c0617a098258e0e2b78915
 2011-03-25 19:18:01 -07:00
The Android Automerger
f23fdcfc40 merge in gingerbread-release history after reset to gingerbread 2011-03-25 14:32:35 -07:00
The Android Automerger
4d3b3b6bc5 merge in gingerbread-release history after reset to gingerbread 2011-03-25 06:04:51 -07:00
The Android Automerger
ae21674907 merge in gingerbread-release history after reset to gingerbread 2011-03-24 08:49:17 -07:00
Amith Yamasani
1dd8c92ccc am ce0976cc: am 2ba97451: am f3b325f5: Debug feature for HDCP compliance testing. 
* commit 'ce0976cccd8a283689b15e33ce2cfaf819620bf6':
  Debug feature for HDCP compliance testing.
 2011-03-23 16:03:34 -07:00
Amith Yamasani
ce0976cccd am 2ba97451: am f3b325f5: Debug feature for HDCP compliance testing. 
* commit '2ba9745180b2bb3400d0e1376552902d1b27c89a':
  Debug feature for HDCP compliance testing.
 2011-03-23 15:53:22 -07:00
Amith Yamasani
2ba9745180 am f3b325f5: Debug feature for HDCP compliance testing. 
* commit 'f3b325f54dadb482d73111ab17cf6a51784de11a':
  Debug feature for HDCP compliance testing.
 2011-03-23 15:47:40 -07:00
Amith Yamasani
f3b325f54d Debug feature for HDCP compliance testing. 
Bug: 4149811

Add a setting in Application->Development to change HDCP checking.

Change-Id: I5561b097b3fd7dbfc4eaf1977b80a37fc29572aa
 2011-03-23 14:39:43 -07:00
The Android Automerger
c735b0934a merge in gingerbread-release history after reset to gingerbread 2011-03-23 05:43:33 -07:00
Irfan Sheriff
d69210326d am d6f9c32b: am e2d30184: am 6864195a: Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1 
* commit 'd6f9c32b5691d62c157a30e295211114d401a8d9':
  Fix ANR with bypass proxy regex
 2011-03-22 19:36:15 -07:00
Irfan Sheriff
d6f9c32b56 am e2d30184: am 6864195a: Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1 
* commit 'e2d301842807bc7f1ea13672a685e5f83824140f':
  Fix ANR with bypass proxy regex
 2011-03-22 19:34:46 -07:00
Irfan Sheriff
e2d3018428 am 6864195a: Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1 
* commit '6864195aa0195831a0cfbe92cd37f76c09df43b8':
  Fix ANR with bypass proxy regex
 2011-03-22 19:33:16 -07:00
Irfan Sheriff
6864195aa0 Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1 2011-03-22 19:30:22 -07:00
Irfan Sheriff
ae3ccfd07e Fix ANR with bypass proxy regex 
Bug: 4148297
Change-Id: I5519ed297acabb65e1992c65e4b4110380983bb1
 2011-03-22 17:57:44 -07:00
Eric Fischer
6502687ccc am a02d1a8a: (-s ours) am 3b9fa42b: am 36f7f4a7: Import revised translations. DO NOT MERGE 
* commit 'a02d1a8a90908bbe04186d8f15af2ae4cd9381ec':
  Import revised translations.  DO NOT MERGE
 2011-03-22 14:06:29 -07:00
Eric Fischer
a02d1a8a90 am 3b9fa42b: am 36f7f4a7: Import revised translations. DO NOT MERGE 
* commit '3b9fa42b6bfab20022cb5760cf41a3000325bc0c':
  Import revised translations.  DO NOT MERGE
 2011-03-22 14:04:17 -07:00
Eric Fischer
3b9fa42b6b am 36f7f4a7: Import revised translations. DO NOT MERGE 
* commit '36f7f4a773b19121850699ca5b617fe3a1c6bd16':
  Import revised translations.  DO NOT MERGE
 2011-03-22 14:01:54 -07:00
Eric Fischer
36f7f4a773 Import revised translations. DO NOT MERGE 
Change-Id: I889f8414c773a57bd38d30c0b60a51216ef00b1b
 2011-03-22 13:39:43 -07:00
The Android Automerger
39f39109c0 merge in gingerbread-release history after reset to gingerbread 2011-03-22 13:10:40 -07:00