PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,517 Commits 1 Branch 0 Tags
03bec5dc1e1f236c33728ddc4ca42737c0a44f78
Commit Graph

7517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
03bec5dc1e am d47a0d6c: am 677e2ff6: am d7db6baa: Merge "Don\'t direct to market if no markets installed" 
* commit 'd47a0d6c51cc8529f7e4e7bfcbb4de139e339941':
  Don't direct to market if no markets installed
 2012-08-13 16:07:39 -07:00
Jean-Baptiste Queru
463b501e6c am 9e8e9a17: am 6fb425e2: am eefa61ed: Merge "Settings: Use ICS alert drawable" 
* commit '9e8e9a17836654f041f8c032e4f9c88341a63d4e':
  Settings: Use ICS alert drawable
 2012-08-13 16:07:37 -07:00
Jeff Sharkey
d47a0d6c51 am 677e2ff6: am d7db6baa: Merge "Don\'t direct to market if no markets installed" 
* commit '677e2ff670eb48adf252e1bb9d1e2e5b3af558ee':
  Don't direct to market if no markets installed
 2012-08-13 16:03:22 -07:00
Jean-Baptiste Queru
9e8e9a1783 am 6fb425e2: am eefa61ed: Merge "Settings: Use ICS alert drawable" 
* commit '6fb425e2805a1c27c048fc954d402f4612cbf74d':
  Settings: Use ICS alert drawable
 2012-08-13 16:03:15 -07:00
Baligh Uddin
dd7857e28f am 70372dcf: Import translations. DO NOT MERGE 
* commit '70372dcfc382c78c41013fa4d9e4a8bdcc7838ae':
  Import translations. DO NOT MERGE
 2012-08-13 15:46:48 -07:00
Jeff Sharkey
677e2ff670 am d7db6baa: Merge "Don\'t direct to market if no markets installed" 
* commit 'd7db6baac7e7d6742916cf1f80e9cbf832b1c64d':
  Don't direct to market if no markets installed
 2012-08-13 14:11:00 -07:00
Baligh Uddin
70372dcfc3 Import translations. DO NOT MERGE 
Change-Id: I98801e0b6cf3096a394a367ed93b49a2f7f851dc
Auto-generated-cl: translation import
 2012-08-13 13:27:25 -07:00
Jeff Sharkey
d7db6baac7 Merge "Don't direct to market if no markets installed" 2012-08-13 13:14:08 -07:00
Jean-Baptiste Queru
6fb425e280 am eefa61ed: Merge "Settings: Use ICS alert drawable" 
* commit 'eefa61ed2e8583f659e868f3057f195d7cb2bb11':
  Settings: Use ICS alert drawable
 2012-08-13 12:02:26 -07:00
Jean-Baptiste Queru
eefa61ed2e Merge "Settings: Use ICS alert drawable" 2012-08-13 11:53:46 -07:00
Amith Yamasani
032aa5a5ba am 32630395: Use UserManager instead of PackageManager for user management 
* commit '32630395eb7dd8401f344599640c8bcf1e289bb0':
  Use UserManager instead of PackageManager for user management
 2012-08-11 21:57:51 -07:00
Amith Yamasani
32630395eb Use UserManager instead of PackageManager for user management 
Show Accounts in secondary settings
Move Users & restrictions to Device section

Change-Id: Idcd7ed44801fe92c847cff81d11f3d6f6d06ba81
 2012-08-10 19:53:29 -07:00
Baligh Uddin
424111dd2a am 5ef3293e: Import translations. DO NOT MERGE 
* commit '5ef3293ed2bfd43e6a179121e6b562e56ced3feb':
  Import translations. DO NOT MERGE
 2012-08-10 15:36:48 -07:00
Baligh Uddin
5ef3293ed2 Import translations. DO NOT MERGE 
Change-Id: Ifc7f0f0796b3cd9b46dc913083ea38c146feb086
Auto-generated-cl: translation import
 2012-08-10 11:21:05 -07:00
The Android Open Source Project
9698d3624c Reconcile with jb-mr1-release - do not merge 
Change-Id: I73e4c2917ac2df4341096582c1a1d1eab7df8a66
 2012-08-10 08:53:55 -07:00
Przemyslaw Szczepaniak
06649d02b2 am 923187a1: Keep speech rate dialog after rotate 
* commit '923187a159cb0c192a2f978a6bf1dd51275ea916':
  Keep speech rate dialog after rotate
 2012-08-10 07:17:36 -07:00
Przemyslaw Szczepaniak
923187a159 Keep speech rate dialog after rotate 
It also adds some missing @Override

Bug: 5997716
Change-Id: I33a7b8ad16cd067af960a4808ae6003dde1d7693
 2012-08-10 07:13:52 -07:00
Baligh Uddin
2dc3d55196 am 658f909d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '658f909d711b1598ec6f49447679569f0bc19c15':
  Import translations. DO NOT MERGE
 2012-08-09 19:52:40 -07:00
Baligh Uddin
658f909d71 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-09 19:50:14 -07:00
Irfan Sheriff
6a88ef4bd2 am aae0659e: Setting to turn off power optimizations 
* commit 'aae0659e18e013401b83717a83ec25393d4ba626':
  Setting to turn off power optimizations
 2012-08-09 15:58:13 -07:00
Irfan Sheriff
aae0659e18 Setting to turn off power optimizations 
Bug: 5885175
Change-Id: I55bfabdffea95d151af6bb4d9da9137124bcb763
 2012-08-09 15:16:07 -07:00
Baligh Uddin
0ad6982813 Import translations. DO NOT MERGE 
Change-Id: Iae1a278483147ad7497d207856bb9cf6a56a0bb1
Auto-generated-cl: translation import
 2012-08-09 12:39:18 -07:00
The Android Automerger
9daa72c4e8 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-09 09:29:59 -07:00
John Spurlock
aeb7b57105 am eaffad37: Merge "Fix NPE in Dreams settings." into jb-mr1-dev 
* commit 'eaffad37c19ac5859539c232a7dc8d2f47159f61':
  Fix NPE in Dreams settings.
 2012-08-09 06:20:50 -07:00
John Spurlock
eaffad37c1 Merge "Fix NPE in Dreams settings." into jb-mr1-dev 2012-08-09 06:18:45 -07:00
John Spurlock
7a99b21a4b Fix NPE in Dreams settings. 
Handle the null case to avoid crashing Settings.

Change-Id: I257b766370bd604e0af5b332241619258fb732c9
 2012-08-09 09:03:48 -04:00
Baligh Uddin
8aa634529c am 702cdf4c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '702cdf4c9a84fd9bcb258cdb26c57fd8d50961d6':
  Import translations. DO NOT MERGE
 2012-08-08 20:04:24 -07:00
Baligh Uddin
702cdf4c9a Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-08 20:02:24 -07:00
Jean-Baptiste Queru
17d915b7fd am 66321184: am 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings app." 
* commit '66321184570da9e93c089b2a1065fc3d4c7230a3':
  Add support for SE Android to the Settings app.
 2012-08-08 14:09:11 -07:00
Jean-Baptiste Queru
6632118457 am 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings app." 
* commit '7526636406087666d005d389ddc0cdacd79499fd':
  Add support for SE Android to the Settings app.
 2012-08-08 14:06:31 -07:00
Jean-Baptiste Queru
7526636406 am 5d72b272: Merge "Add support for SE Android to the Settings app." 
* commit '5d72b2726797374e402943182d8132045ed32d3a':
  Add support for SE Android to the Settings app.
 2012-08-08 14:04:11 -07:00
Baligh Uddin
24fb893381 Import translations. DO NOT MERGE 
Change-Id: I7a08f18c8f4ed45612e5491aa2b0ba2812373013
Auto-generated-cl: translation import
 2012-08-08 13:40:29 -07:00
Jean-Baptiste Queru
5d72b27267 Merge "Add support for SE Android to the Settings app." 2012-08-08 13:19:26 -07:00
The Android Open Source Project
a01ab9e576 Reconcile with jb-mr1-release - do not merge 
Change-Id: I6809fcad464f90b62407ba5e19da9a226ca3be83
 2012-08-08 08:18:04 -07:00
The Android Automerger
3f793b5654 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-08 06:47:58 -07:00
Matthew Xie
83457dd79b am a1f463cb: Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev 
* commit 'a1f463cb1930e806420844d4915def2dcfe7ae72':
  Remove Profile Auto connection specific logic
 2012-08-08 00:35:29 -07:00
Matthew Xie
a1f463cb19 Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev 2012-08-08 00:33:38 -07:00
The Android Open Source Project
422446e1ef am 4325cf22: am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '4325cf22ef3d381bc9d28d264571ba305da94d57':
 2012-08-07 15:16:20 -07:00
The Android Open Source Project
4325cf22ef am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '7e107a0903707876c0ad7dd4ee2702fd5baed7ae':
 2012-08-07 15:14:14 -07:00
The Android Open Source Project
7e107a0903 Reconcile with jb-mr0-release - do not merge 
Change-Id: Iea656c0ea3a18a0a9874e271f18c8ebed540feb5
 2012-08-07 14:59:46 -07:00
Baligh Uddin
eb2de9e879 am 6ac8bae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '6ac8bae6a927c918391224277ff3c1524e7565a4':
  Import translations. DO NOT MERGE
 2012-08-07 14:55:55 -07:00
Baligh Uddin
6ac8bae6a9 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-07 14:54:02 -07:00
Baligh Uddin
7eac4706a8 Import translations. DO NOT MERGE 
Change-Id: I9d1d42585e5e2f0299a2a761089bb7984ca55531
Auto-generated-cl: translation import
 2012-08-07 14:24:33 -07:00
The Android Automerger
9a85ed20ee merge in jb-mr0-release history after reset to jb-dev 2012-08-07 13:01:34 -07:00
Dianne Hackborn
eb657dc8eb am f621435e: Merge "Add dev setting to enable global actions bug report button." into jb-mr1-dev 
* commit 'f621435eafcb46f69b35b8a6b8119ab87801e9ef':
  Add dev setting to enable global actions bug report button.
 2012-08-07 11:51:11 -07:00
Dianne Hackborn
f621435eaf Merge "Add dev setting to enable global actions bug report button." into jb-mr1-dev 2012-08-07 11:49:15 -07:00
Dianne Hackborn
2d803a3931 Add dev setting to enable global actions bug report button. 
Change-Id: I3768f95e1c6fbec9c10186093e5e1d48b0ef6ae4
 2012-08-07 11:26:32 -07:00
The Android Open Source Project
5acc909860 Reconcile with jb-mr1-release - do not merge 
Change-Id: Ie33aa8887f43fe794d289a745451db6fa73a9c20
 2012-08-07 11:04:56 -07:00
The Android Automerger
1b77762212 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-07 06:35:02 -07:00
Ganesh Ganapathi Batta
0654b71534 Remove Profile Auto connection specific logic 
Remove  profile auto connection specific logic as it is not implemented in
Bluetooth app
Disconnect PBAP server connection  when user initiates device level disconnection

Change-Id: I381ed96f6b57f414bbaccd694f55d2b992e330a4
 2012-08-06 23:27:27 -07:00