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
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
The Android Automerger
fc887fffe8 merge in gingerbread-release history after reset to gingerbread 2011-03-22 05:43:42 -07:00
The Android Automerger
7fc53428fb merge in gingerbread-release history after reset to gingerbread 2011-03-21 05:42:43 -07:00
The Android Automerger
b1482f06dd merge in gingerbread-release history after reset to gingerbread 2011-03-18 17:35:45 -07:00
Eric Fischer
aa183b91af am 5ea56365: (-s ours) am 9567622d: (-s ours) am c4eeeb29: Import revised translations. DO NOT MERGE 
* commit '5ea56365c5d3f731194e7eb88726968dfa53a4f0':
  Import revised translations.  DO NOT MERGE
 2011-03-18 17:05:14 -07:00
Eric Fischer
5ea56365c5 am 9567622d: (-s ours) am c4eeeb29: Import revised translations. DO NOT MERGE 
* commit '9567622d32e322ce866969c38ba19dfb882752d5':
  Import revised translations.  DO NOT MERGE
 2011-03-18 16:58:12 -07:00
Eric Fischer
9567622d32 am c4eeeb29: Import revised translations. DO NOT MERGE 
* commit 'c4eeeb29c5c72d9ceb16c373c4d3902c155a0f26':
  Import revised translations.  DO NOT MERGE
 2011-03-18 16:52:30 -07:00
Eric Fischer
c4eeeb29c5 Import revised translations. DO NOT MERGE 
Change-Id: I512bfadfc427f0676bce9e79c20babe006324ca1
 2011-03-18 15:17:01 -07:00
Dianne Hackborn
48147dca83 Update to follow API change. 
Change-Id: I4d65d3a8847597cdb390c22f0ee20bd5ce028509
 2011-03-18 12:29:41 -07:00
The Android Automerger
153ab94502 merge in gingerbread-release history after reset to gingerbread 2011-03-18 10:42:03 -07:00
Eric Fischer
6a01acdeaf Merge "Import revised translations." 2011-03-17 17:30:25 -07:00
Eric Fischer
88806fa5ae Import revised translations. 
Change-Id: I8146c6ff4e2c5d8cdcc9b82cf38d2baac89853f5
 2011-03-17 16:55:36 -07:00
TK MUN
9e2ffffb97 am 8c1d9468: (-s ours) am 8c2a02de: (-s ours) am e0e845fe: DO NOT MERGE Do not allow shortcut for "4G Settings" 
* commit '8c1d9468ee63734365184d5d7517df54ba6e4cb1':
  DO NOT MERGE Do not allow shortcut for "4G Settings"
 2011-03-17 16:31:22 -07:00
TK MUN
8c1d9468ee am 8c2a02de: (-s ours) am e0e845fe: DO NOT MERGE Do not allow shortcut for "4G Settings" 
* commit '8c2a02defc4139b2532861602d8e2816018f53b9':
  DO NOT MERGE Do not allow shortcut for "4G Settings"
 2011-03-17 16:27:29 -07:00
TK MUN
8c2a02defc am e0e845fe: DO NOT MERGE Do not allow shortcut for "4G Settings" 
* commit 'e0e845fee6703a1a2ed75c4fe67cb0202dd076c0':
  DO NOT MERGE Do not allow shortcut for "4G Settings"
 2011-03-17 16:20:42 -07:00