PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,772 Commits 1 Branch 0 Tags
a5326d11eaf58e1f9b78af6dcdd248ef6a2fa00c
Commit Graph

11772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
2768a5e992 Merge "Import translations. DO NOT MERGE" 2013-08-22 17:52:43 +00:00
Baligh Uddin
81eab3f04a Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-22 17:52:33 +00:00
Jonathan Dixon
4ea1ce4713 am d0780fce: am f3267d9f: Merge "Add an Are you Sure to experiemental webview" into klp-dev 
* commit 'd0780fcedaa3f6a8cf8f8c02cbe3fc6f11b71c43':
  Add an Are you Sure to experiemental webview
 2013-08-21 22:04:29 -07:00
Jonathan Dixon
d0780fceda am f3267d9f: Merge "Add an Are you Sure to experiemental webview" into klp-dev 
* commit 'f3267d9fee8f2dd675d66b00a566da06717f8664':
  Add an Are you Sure to experiemental webview
 2013-08-21 22:02:52 -07:00
Jonathan Dixon
f3267d9fee Merge "Add an Are you Sure to experiemental webview" into klp-dev 2013-08-22 05:00:20 +00:00
David Christie
277bfa942a am a99ec987: am 9fb0ab85: Merge "Update power widget to represent gps instead of location master." into klp-dev 
* commit 'a99ec987105a31d156b7170c872811d206706f72':
  Update power widget to represent gps instead of location master.
 2013-08-21 21:19:28 -07:00
David Christie
a99ec98710 am 9fb0ab85: Merge "Update power widget to represent gps instead of location master." into klp-dev 
* commit '9fb0ab85a2a6fba39a19d86361f31a693163402a':
  Update power widget to represent gps instead of location master.
 2013-08-21 21:17:53 -07:00
David Christie
9fb0ab85a2 Merge "Update power widget to represent gps instead of location master." into klp-dev 2013-08-22 04:14:56 +00:00
Jonathan Dixon
ba0ef659e1 Add an Are you Sure to experiemental webview 
Bug: 10427705

Not bothering to translate strings as this will be deleted soon

Change-Id: I26721e606649d267d1b6507bc1a16ce91a63276a
 2013-08-21 17:49:59 -07:00
David Christie
5eed792a76 Update power widget to represent gps instead of location master. 
Change-Id: I62f701b612db2e31f9ad8b016dbf37ed7fd4ef26
 2013-08-21 17:18:51 -07:00
Lifu Tang
2930f1c196 am 0edf8ecb: am 25518c3b: Sort "Location services" alphabetically 
* commit '0edf8ecbd606f7ff478f74866e7fc03d113a8f3c':
  Sort "Location services" alphabetically
 2013-08-21 17:10:07 -07:00
Lifu Tang
0edf8ecbd6 am 25518c3b: Sort "Location services" alphabetically 
* commit '25518c3b45827537b2b2c2b35fdc86bc8bd60502':
  Sort "Location services" alphabetically
 2013-08-21 17:06:44 -07:00
Lifu Tang
25518c3b45 Sort "Location services" alphabetically 
* Sort "Location services" items by title

* Throttle the rate of loading status messages

Change-Id: Iecb039a4ab94a810e11ef3e426e4a4b5c8c75c37
 2013-08-21 16:52:14 -07:00
Baligh Uddin
293ed7bd4c Import translations. DO NOT MERGE 
Change-Id: I2c72ecd95f32cca154a87fee61ce55634e95f3e5
Auto-generated-cl: translation import
 2013-08-21 16:15:15 -07:00
Baligh Uddin
0e71d6fee4 Import translations. DO NOT MERGE 
Change-Id: I1f4834979c234fd3a3b2238bc4e3e5da68d033db
Auto-generated-cl: translation import
 2013-08-21 16:08:45 -07:00
Baligh Uddin
f23da91e52 Import translations. DO NOT MERGE 
Change-Id: Iac08e7012b0da2da09077d0eaeda93b42473d14f
Auto-generated-cl: translation import
 2013-08-21 16:04:35 -07:00
Baligh Uddin
bf65bf49cb Import translations. DO NOT MERGE 
Change-Id: Idc054aa50da72b31b8c75270bff2739ef541af01
Auto-generated-cl: translation import
 2013-08-21 16:03:04 -07:00
Alan Viverette
cd63a19c61 am b46f9f42: am e873aeb3: Update caption preferences to use SubtitleView 
* commit 'b46f9f42f707ec1ebd4783013fe6e0d122721fd0':
  Update caption preferences to use SubtitleView
 2013-08-21 14:16:32 -07:00
Alan Viverette
b46f9f42f7 am e873aeb3: Update caption preferences to use SubtitleView 
* commit 'e873aeb3a659ac970609cebb5ec2f460afd1206a':
  Update caption preferences to use SubtitleView
 2013-08-21 14:12:28 -07:00
Alan Viverette
e873aeb3a6 Update caption preferences to use SubtitleView 
Change-Id: I02230669c5e7be36006e04bb7110446265f122d9
 2013-08-21 13:58:07 -07:00
Romain Guy
46bd0af5ca am 24fcbb69: am 821496bf: Add Deuteranomaly color set to overdraw debugging 
* commit '24fcbb693abbaec5e3757f9feca7d7c3866dce7c':
  Add Deuteranomaly color set to overdraw debugging
 2013-08-21 12:02:36 -07:00
Romain Guy
24fcbb693a am 821496bf: Add Deuteranomaly color set to overdraw debugging 
* commit '821496bf4ac2dc6dada222606525115e8600288c':
  Add Deuteranomaly color set to overdraw debugging
 2013-08-21 12:00:09 -07:00
Romain Guy
821496bf4a Add Deuteranomaly color set to overdraw debugging 
Change-Id: I27e48f54653f24383ab85c0e500fdd79cec28cc3
 2013-08-21 11:54:29 -07:00
David Christie
f6b0d63203 am 4bc8e50b: am ae95da41: Merge "Switch location Settings and Power widget to use new Settings api." into klp-dev 
* commit '4bc8e50bee995255e1c6d78fe2095f1552a35988':
  Switch location Settings and Power widget to use new Settings api.
 2013-08-21 10:50:30 -07:00
David Christie
4bc8e50bee am ae95da41: Merge "Switch location Settings and Power widget to use new Settings api." into klp-dev 
* commit 'ae95da417ce5c88127ae806994491a49885066ab':
  Switch location Settings and Power widget to use new Settings api.
 2013-08-21 10:45:08 -07:00
David Christie
ae95da417c Merge "Switch location Settings and Power widget to use new Settings api." into klp-dev 2013-08-21 17:40:56 +00:00
Tom O'Neill
bfbc8c6818 am 12c7f185: am 9facc23c: Merge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev 
* commit '12c7f185e30d760eb3788ae4de49b5f37b22d258':
  Move UPDATE_INTENT to SettingsInjectorService
 2013-08-21 07:57:57 -07:00
Tom O'Neill
12c7f185e3 am 9facc23c: Merge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev 
* commit '9facc23cd8341d579c44af51a2be87effee8618e':
  Move UPDATE_INTENT to SettingsInjectorService
 2013-08-21 07:55:42 -07:00
Tom O'Neill
9facc23cd8 Merge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev 2013-08-21 14:53:19 +00:00
Alan Viverette
ef691ea435 am 16ad2566: am bffd631a: Allow the framework to recycle ApnPreference views 
* commit '16ad25665e77d538bca40e572e10c90856d3e3d6':
  Allow the framework to recycle ApnPreference views
 2013-08-20 19:04:03 -07:00
Jim Miller
ef3e701b78 Add setting to disable keyguard widgets 
This allows disabling keyguard widgets through Settings.
On new devices, the setting is turned off by default.  If the
user currently has widgets in keyguard, then we keep them
and re-enable the setting.

Change-Id: I25f0756ac72227e13dcb491694b3ec3c2bf1d293
 2013-08-20 19:03:30 -07:00
Alan Viverette
16ad25665e am bffd631a: Allow the framework to recycle ApnPreference views 
* commit 'bffd631a2ab08c4313ae6405b9a8803bc98b629b':
  Allow the framework to recycle ApnPreference views
 2013-08-20 19:00:32 -07:00
Alan Viverette
bffd631a2a Allow the framework to recycle ApnPreference views 
BUG: 10079104
Change-Id: Iaa4f155da12a141f16300076cc820d47e0c5779a
 2013-08-20 18:14:33 -07:00
Alan Viverette
f5aeec011a am 97659084: am 35bac199: Merge "Fix background and line wrapping in CaptionTextView" into klp-dev 
* commit '976590843aa26bd37501abbfe9d2a98da695c04f':
  Fix background and line wrapping in CaptionTextView
 2013-08-20 16:52:58 -07:00
Alan Viverette
976590843a am 35bac199: Merge "Fix background and line wrapping in CaptionTextView" into klp-dev 
* commit '35bac199324d07dd6cf16e3bd50df1feca8e9030':
  Fix background and line wrapping in CaptionTextView
 2013-08-20 16:50:04 -07:00
Alan Viverette
35bac19932 Merge "Fix background and line wrapping in CaptionTextView" into klp-dev 2013-08-20 23:46:20 +00:00
Amith Yamasani
d760a61936 Fix custom restrictions launch mechanism 
Instead of showing a separate entry for launching custom restrictions,
launch it directly when clicking on the settings icon.

Bug: 10388399
Change-Id: I327d6d4c2b9840ce5ba140746568c5561a1a8936
 2013-08-20 16:26:48 -07:00
Alan Viverette
c30f124c91 Fix background and line wrapping in CaptionTextView 
Also fixes where two style names were accidentally switched,
makes the font sizes larger, and cleans up the CaptionTextView
styling APIs in preparation for moving it into the framework.

BUG: 10396663
Change-Id: I00999723a67bce2659d913b70dd4420ed32f955c
 2013-08-20 15:58:38 -07:00
David Christie
512183ea8e Switch location Settings and Power widget to use new Settings api. 
Change-Id: I06b7a2e21876a18d9ad42fda2a6c6d4c7b6add48
 2013-08-20 15:24:21 -07:00
Amith Yamasani
05139a26f4 am 8551bcf5: am 0f5578ce: Merge "Select max timeout, if it\'s in the timeout list" into klp-dev 
* commit '8551bcf59c9555d9ed993e05712cc74b764c7f60':
  Select max timeout, if it's in the timeout list
 2013-08-20 13:37:51 -07:00
Amith Yamasani
8551bcf59c am 0f5578ce: Merge "Select max timeout, if it\'s in the timeout list" into klp-dev 
* commit '0f5578ce2ddfc19eab36e843728470e8119026b5':
  Select max timeout, if it's in the timeout list
 2013-08-20 13:35:29 -07:00
Amith Yamasani
0f5578ce2d Merge "Select max timeout, if it's in the timeout list" into klp-dev 2013-08-20 20:33:24 +00:00
Maggie Benthall
f48206e37e Fix NPE in SecuritySettings.onResume() 
when DISALLOW_CONFIG_CREDENTIALS is true.

Bug: 10405192
Change-Id: Id364ba3cd86151b504158bc253559d0da5e26273
 2013-08-20 11:03:05 -04:00
Lifu Tang
41935ba6ba am 96dd39ba: am d3dbc6e3: Launches the Location setting as fragment 
* commit '96dd39badd1d82e1db360b77849ee26198a7d1c9':
  Launches the Location setting as fragment
 2013-08-19 19:04:04 -07:00
Lifu Tang
96dd39badd am d3dbc6e3: Launches the Location setting as fragment 
* commit 'd3dbc6e3a187b9de69b83915400425032d287dec':
  Launches the Location setting as fragment
 2013-08-19 19:01:08 -07:00
Lifu Tang
d3dbc6e3a1 Launches the Location setting as fragment 
Change-Id: I0fb04a346236676ce9483a0c4d1fc3b2b590b08c
 2013-08-19 18:42:56 -07:00
Lifu Tang
c0fc7457fc am 2e45637a: am b9ab196b: Sort recent apps, show message when no recent apps 
* commit '2e45637aeb775832b71a69fb26c5b6b754688960':
  Sort recent apps, show message when no recent apps
 2013-08-19 18:35:52 -07:00
Lifu Tang
2e45637aeb am b9ab196b: Sort recent apps, show message when no recent apps 
* commit 'b9ab196bb520fed9b23aa9a259fab08084646c2c':
  Sort recent apps, show message when no recent apps
 2013-08-19 18:33:08 -07:00
Lifu Tang
b9ab196bb5 Sort recent apps, show message when no recent apps 
Change-Id: I70bb1913435b46fc87aec10075e43f98ef07ef62
 2013-08-19 17:56:14 -07:00
Lifu Tang
f90b70378b am 0acf3cfc: am dbd2f759: Merge "Supress Location button when coming from Location" into klp-dev 
* commit '0acf3cfc8c55bac60295eb3f7e9ee6345186eb3c':
  Supress Location button when coming from Location
 2013-08-19 14:38:56 -07:00