PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,050 Commits 1 Branch 0 Tags
54c0837bbee5554558c9f9c9caecaf6d8f6cbe3c
Commit Graph

2050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
0b53ac733c merge from open-source master 
Change-Id: Iab9eddbfea000b9403c92a211c37b93772f2a9c7
 2010-05-12 09:33:50 -07:00
Henrik Hall
a7ece710fe Fixing Swedish translations of a few texts under "Phone info". 
* Build number
* Firmware version

Change-Id: Ifb8e84bcea86c7b95073e455f97f9b13c720c400
 2010-05-11 13:38:44 -07:00
Romain Guy
d2bfade8f6 Merge "The password in the APN settings is shown instead of stars" 2010-05-11 10:51:12 -07:00
Robert Greenwalt
b12913368a am ddde146f: am 482eadea: am e434bfb2: String change - wifi tether = hotspot 2010-05-10 10:20:15 -07:00
Robert Greenwalt
ddde146f8d am 482eadea: am e434bfb2: String change - wifi tether = hotspot 
Merge commit '482eadeae85a1764b86133172d11364df6ce7227' into kraken

* commit '482eadeae85a1764b86133172d11364df6ce7227':
  String change - wifi tether = hotspot
 2010-05-10 10:16:29 -07:00
Robert Greenwalt
482eadeae8 am e434bfb2: String change - wifi tether = hotspot 
Merge commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7' into froyo-plus-aosp

* commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7':
  String change - wifi tether = hotspot
 2010-05-10 10:14:36 -07:00
Michael Chan
f21dc705f4 am c56a35e3: am 15bb4754: am d2c81986: b/2652059 Refresh UI after bond state change 2010-05-10 09:55:46 -07:00
Michael Chan
c56a35e3c6 am 15bb4754: am d2c81986: b/2652059 Refresh UI after bond state change 
Merge commit '15bb47545686395c0d94b54dd67c4f080fe625e5' into kraken

* commit '15bb47545686395c0d94b54dd67c4f080fe625e5':
  b/2652059 Refresh UI after bond state change
 2010-05-10 09:50:04 -07:00
Michael Chan
15bb475456 am d2c81986: b/2652059 Refresh UI after bond state change 
Merge commit 'd2c81986c236ed680cfae5e420561028ae4cc0d2' into froyo-plus-aosp

* commit 'd2c81986c236ed680cfae5e420561028ae4cc0d2':
  b/2652059 Refresh UI after bond state change
 2010-05-10 09:43:38 -07:00
Robert Greenwalt
e434bfb216 String change - wifi tether = hotspot 
bug:2664412
Change-Id: I6ca955e7fcc299ae1d69892c93c9250229610b19
 2010-05-08 17:20:26 -07:00
Michael Chan
d2c81986c2 b/2652059 Refresh UI after bond state change 
Change-Id: I8f8a939ba3f383aae36091986cea4e8a6eae13fb
 2010-05-07 15:24:22 -07:00
Michael Chan
7ab5a6e330 am d4869a99: am d17eb48e: am 1308453b: b/2652059 Fixed the broken BT connects/disconnects after unpair 2010-05-04 17:45:58 -07:00
Michael Chan
d4869a99df am d17eb48e: am 1308453b: b/2652059 Fixed the broken BT connects/disconnects after unpair 
Merge commit 'd17eb48e9c87e02cbcb42899915dbfc921075231' into kraken

* commit 'd17eb48e9c87e02cbcb42899915dbfc921075231':
  b/2652059 Fixed the broken BT connects/disconnects after unpair
 2010-05-04 12:45:29 -07:00
Michael Chan
d17eb48e9c am 1308453b: b/2652059 Fixed the broken BT connects/disconnects after unpair 
Merge commit '1308453b16c2ca85a456bd4bb7f3c71c916bd83e' into froyo-plus-aosp

* commit '1308453b16c2ca85a456bd4bb7f3c71c916bd83e':
  b/2652059 Fixed the broken BT connects/disconnects after unpair
 2010-05-04 12:36:27 -07:00
Michael Chan
1308453b16 b/2652059 Fixed the broken BT connects/disconnects after unpair 
The unpair command was stuck in the queue.

Change-Id: I803cb10adcfaedbe6fd202e0db463593880e4280
 2010-05-03 23:06:51 -07:00
Kenny Root
c1b1ee694b am b458ec28: am a359fb77: (-s ours) am 6d409870: Import revised translations 2010-04-29 17:09:48 -07:00
Kenny Root
b458ec285f am a359fb77: (-s ours) am 6d409870: Import revised translations 
Merge commit 'a359fb77d41ab3ac00a1020b42fa2e898904c1af' into kraken

* commit 'a359fb77d41ab3ac00a1020b42fa2e898904c1af':
  Import revised translations
 2010-04-29 16:45:47 -07:00
Kenny Root
a359fb77d4 am 6d409870: Import revised translations 
Merge commit '6d409870981361af2f547fba05877e7f405af75a' into froyo-plus-aosp

* commit '6d409870981361af2f547fba05877e7f405af75a':
  Import revised translations
 2010-04-29 16:03:30 -07:00
Kenny Root
6d40987098 Import revised translations 
Change-Id: If5691d275bf86c94038a53beed65a93dad65b450
 2010-04-29 16:01:54 -07:00
Michael Chan
b50d2baea6 am cb29eb04: am 3a1204f7: am 6078d450: Merge "b/2630339 Fixed the crash when an app requests BT to be enabled" into froyo 2010-04-28 13:25:37 -07:00
Michael Chan
cb29eb04f5 am 3a1204f7: am 6078d450: Merge "b/2630339 Fixed the crash when an app requests BT to be enabled" into froyo 
Merge commit '3a1204f7cd231ed1c451ca90901eae082541b9ef' into kraken

* commit '3a1204f7cd231ed1c451ca90901eae082541b9ef':
  b/2630339 Fixed the crash when an app requests BT to be enabled
 2010-04-28 13:17:36 -07:00
Michael Chan
3a1204f7cd am 6078d450: Merge "b/2630339 Fixed the crash when an app requests BT to be enabled" into froyo 
Merge commit '6078d4503d6bc29fe6d2ff7784124a66fe48186e' into froyo-plus-aosp

* commit '6078d4503d6bc29fe6d2ff7784124a66fe48186e':
  b/2630339 Fixed the crash when an app requests BT to be enabled
 2010-04-28 13:14:35 -07:00
Michael Chan
6078d4503d Merge "b/2630339 Fixed the crash when an app requests BT to be enabled" into froyo 2010-04-28 12:43:00 -07:00
Michael Chan
a0de1dcd19 b/2630339 Fixed the crash when an app requests BT to be enabled 
For AlertActivity, the dialog needs to display at onCreate() time.
Otherwise, the decor view would be made. Trying to display the
dialog afterward would crash. Changed to AlertDialog instead.

Change-Id: I2ea8463b4c475b9b54746d0a722fa80eea3d4529
 2010-04-28 11:24:00 -07:00
Kenny Root
cecc0c8899 am 19b4bdca: am 9fef437e: am b3c872bf: Merge "Import revised translations" into froyo 2010-04-28 09:56:36 -07:00
Kenny Root
19b4bdca55 am 9fef437e: am b3c872bf: Merge "Import revised translations" into froyo 
Merge commit '9fef437e04edd18f6406a49095403a1b71becf58' into kraken

* commit '9fef437e04edd18f6406a49095403a1b71becf58':
  Import revised translations
 2010-04-28 09:47:07 -07:00
Kenny Root
9fef437e04 am b3c872bf: Merge "Import revised translations" into froyo 
Merge commit 'b3c872bf581e3f1ec3c6f03fbb90e43690de75b5' into froyo-plus-aosp

* commit 'b3c872bf581e3f1ec3c6f03fbb90e43690de75b5':
  Import revised translations
 2010-04-28 09:34:05 -07:00
Kenny Root
b3c872bf58 Merge "Import revised translations" into froyo 2010-04-28 09:23:34 -07:00
Kenny Root
eab62faea7 Import revised translations 
Change-Id: I91401f661d61a86d166baac1cad14b8897d0a467
 2010-04-28 09:20:52 -07:00
Amith Yamasani
e76c4e1297 am e6245178: am 567ca080: am 64ab5338: Fix regression in removing settings that aren\'t relevant for a platform. 2010-04-27 18:56:47 -07:00
Amith Yamasani
e62451789f am 567ca080: am 64ab5338: Fix regression in removing settings that aren\'t relevant for a platform. 
Merge commit '567ca0805e884c124e537edc7eac5cecf8d4e202' into kraken

* commit '567ca0805e884c124e537edc7eac5cecf8d4e202':
  Fix regression in removing settings that aren't relevant for a platform.
 2010-04-27 15:09:49 -07:00
Amith Yamasani
567ca0805e am 64ab5338: Fix regression in removing settings that aren\'t relevant for a platform. 
Merge commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e' into froyo-plus-aosp

* commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e':
  Fix regression in removing settings that aren't relevant for a platform.
 2010-04-27 15:08:20 -07:00
Amith Yamasani
64ab5338cb Fix regression in removing settings that aren't relevant for a platform. 
Bug: 2630695

The PreferenceCategories added into the hierarchy caused removePreference() to
not work, since the preferences to be removed were not immediate children of
the preference screen.

Create empty PreferenceCategory elements and pull the preferences to the same
depth as the categories.

Change-Id: I34826ea4d84cda0ecab75c66a73febe3d51e7c68
 2010-04-27 13:35:12 -07:00
Michael Chan
fbbbf3d332 am 84a4b9e4: am 0bca1653: am 6368b25c: Merge "b/2608693 Fix the problem where BT was automatically reconnecting ... after the user unpaired while docked." into froyo 2010-04-23 10:58:07 -07:00
Michael Chan
84a4b9e4f3 am 0bca1653: am 6368b25c: Merge "b/2608693 Fix the problem where BT was automatically reconnecting ... after the user unpaired while docked." into froyo 
Merge commit '0bca1653cb78693e2c892efb48b944ddad98b66d' into kraken

* commit '0bca1653cb78693e2c892efb48b944ddad98b66d':
  b/2608693 Fix the problem where BT was automatically reconnecting
 2010-04-23 10:51:54 -07:00
Michael Chan
0bca1653cb am 6368b25c: Merge "b/2608693 Fix the problem where BT was automatically reconnecting ... after the user unpaired while docked." into froyo 
Merge commit '6368b25c09992172b1900da3fd326c4fd2fdd203' into froyo-plus-aosp

* commit '6368b25c09992172b1900da3fd326c4fd2fdd203':
  b/2608693 Fix the problem where BT was automatically reconnecting
 2010-04-23 10:50:18 -07:00
Michael Chan
6368b25c09 Merge "b/2608693 Fix the problem where BT was automatically reconnecting ... after the user unpaired while docked." into froyo 2010-04-23 10:46:43 -07:00
Suchi Amalapurapu
2741867194 am 937dc855: am b12b21a5: am b99e029d: Fix string for uninstall button for system apps. 2010-04-22 21:10:38 -07:00
Suchi Amalapurapu
937dc855eb am b12b21a5: am b99e029d: Fix string for uninstall button for system apps. 
Merge commit 'b12b21a5b02468d601190de23f91675973ead44d' into kraken

* commit 'b12b21a5b02468d601190de23f91675973ead44d':
  Fix string for uninstall button for system apps.
 2010-04-22 21:06:31 -07:00
Suchi Amalapurapu
b12b21a5b0 am b99e029d: Fix string for uninstall button for system apps. 
Merge commit 'b99e029db14ae276a47da39da9378b6af9aef403' into froyo-plus-aosp

* commit 'b99e029db14ae276a47da39da9378b6af9aef403':
  Fix string for uninstall button for system apps.
 2010-04-22 21:04:01 -07:00
Michael Chan
96b0c1dc08 b/2608693 Fix the problem where BT was automatically reconnecting 
... after the user unpaired while docked.

Change-Id: I65642f440109968387401fc3c103da0f2b15f49f
 2010-04-22 16:07:35 -07:00
Suchi Amalapurapu
b99e029db1 Fix string for uninstall button for system apps. 
Change-Id: Iad26aae3d99447eddb6997e66c84080cdce727da
 2010-04-22 16:06:30 -07:00
Suchi Amalapurapu
7d18d3027e am 830e4811: am a6bde3c9: am a3683a51: Enable moving packages when install location is set to auto. 2010-04-22 16:04:59 -07:00
Suchi Amalapurapu
830e4811e2 am a6bde3c9: am a3683a51: Enable moving packages when install location is set to auto. 
Merge commit 'a6bde3c9cd0db85538ff6166cb35f626c303352b' into kraken

* commit 'a6bde3c9cd0db85538ff6166cb35f626c303352b':
  Enable moving packages when install location is set to auto.
 2010-04-22 15:57:28 -07:00
Suchi Amalapurapu
a6bde3c9cd am a3683a51: Enable moving packages when install location is set to auto. 
Merge commit 'a3683a51faab316c1577cd13c708a41938bcc646' into froyo-plus-aosp

* commit 'a3683a51faab316c1577cd13c708a41938bcc646':
  Enable moving packages when install location is set to auto.
 2010-04-22 15:54:34 -07:00
Suchi Amalapurapu
a3683a51fa Enable moving packages when install location is set to auto. 
Change-Id: If081ad949cb2aed6b3555275c582e951e579ffc9
 2010-04-22 13:42:41 -07:00
Daniel Sandler
039acfbdbf am a9523ed0: am dd379184: am f0746678: Merge "Redesign vibration settings." into froyo 2010-04-21 18:28:03 -07:00
Daniel Sandler
70bb98ecd5 am 94440bd9: am 9e2810bb: am 19340d21: Merge "Labeled categories to help clarify Sound prefs." into froyo 2010-04-21 18:28:01 -07:00
Daniel Sandler
a9523ed0fb am dd379184: am f0746678: Merge "Redesign vibration settings." into froyo 
Merge commit 'dd3791844f7172fc9f231e4d7666a8f81f86daa7' into kraken

* commit 'dd3791844f7172fc9f231e4d7666a8f81f86daa7':
  Redesign vibration settings.
 2010-04-21 18:19:34 -07:00
Daniel Sandler
94440bd999 am 9e2810bb: am 19340d21: Merge "Labeled categories to help clarify Sound prefs." into froyo 
Merge commit '9e2810bbed6a84b9e6de3464ec855f0b6c241ef1' into kraken

* commit '9e2810bbed6a84b9e6de3464ec855f0b6c241ef1':
  Labeled categories to help clarify Sound prefs.
 2010-04-21 18:19:31 -07:00