PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,778 Commits 1 Branch 0 Tags
a38fac3b8d59ece24c8d2e7376c318b6e51f68d5
Commit Graph

10778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
52f3b7c391 Reconcile with jb-mr2-release - do not merge 
Change-Id: If34271bddb2819de365f53ba61b744b6598bda57
 2013-05-28 07:37:45 -07:00
Baligh Uddin
a72aa4e1f7 Import translations. DO NOT MERGE 
Change-Id: I609dc6aef43a669bf59f2fc352fefa1db2d8e844
Auto-generated-cl: translation import
 2013-05-27 12:01:18 -07:00
Baligh Uddin
44338bae31 Import translations. DO NOT MERGE 
Change-Id: I3808f0d486b1050f53c5f3d9129f758d66db68df
Auto-generated-cl: translation import
 2013-05-27 11:58:11 -07:00
The Android Automerger
f80c318799 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-26 05:55:43 -07:00
Russell Brenner
765f55f52a Improved logic for Skip warning message 
Use ConnectivityManager instead of TelephonyManager to determine
how device is connected.

Bug: 9118704
Change-Id: I5c1db90500591ca67e927976066a46e1f66e2e60
 2013-05-24 16:09:39 -07:00
Baligh Uddin
6eb937b9e9 am 5c20af4c: (-s ours) am 6fa5e627: Import translations. DO NOT MERGE 
* commit '5c20af4c7c45e3da2150937d222f85c80b0965b8':
  Import translations. DO NOT MERGE
 2013-05-23 09:32:47 -07:00
Baligh Uddin
5c20af4c7c am 6fa5e627: Import translations. DO NOT MERGE 
* commit '6fa5e627b8fd64af6e4ae286c46b3666b66f8d8a':
  Import translations. DO NOT MERGE
 2013-05-23 09:30:23 -07:00
Baligh Uddin
3c5354bbf7 Merge "Import translations. DO NOT MERGE" 2013-05-23 16:26:46 +00:00
The Android Open Source Project
624191ecd8 am 2dafd362: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '2dafd362c7052f1618b0d22d18043d99f4544ac0':
 2013-05-23 08:06:41 -07:00
The Android Open Source Project
2dafd362c7 Reconcile with jb-mr2-release - do not merge 
Change-Id: Ide88244c344b65f9c0c84b40e4ca76bccf67584c
 2013-05-23 08:05:45 -07:00
The Android Automerger
e874242f22 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-23 05:55:31 -07:00
Baligh Uddin
3317434180 Import translations. DO NOT MERGE 
Change-Id: I5c46faf0aa951cad097747f89fc4427e83bafa1a
Auto-generated-cl: translation import
 2013-05-23 00:35:21 -07:00
Baligh Uddin
6fa5e627b8 Import translations. DO NOT MERGE 
Change-Id: I42d8fcaccbdec16d54e85adcd73e4c455097715d
Auto-generated-cl: translation import
 2013-05-23 00:31:54 -07:00
Amith Yamasani
99f40d4758 am 73662629: am 21f008e1: Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev 
* commit '73662629957e03ef23cd1bc33640ce7d1e690e90':
  Update strings for clarity about restricted profiles
 2013-05-22 15:08:53 -07:00
Amith Yamasani
7366262995 am 21f008e1: Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev 
* commit '21f008e1f4e2d5e84fdab041d2ef31f305bbcf09':
  Update strings for clarity about restricted profiles
 2013-05-22 15:07:00 -07:00
Amith Yamasani
21f008e1f4 Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev 2013-05-22 22:04:59 +00:00
Alex Klyubin
20c94a627b am 1eb2064f: am 7229e29f: Merge "Ensure all active Device Admins are listed." into jb-mr2-dev 
* commit '1eb2064ff495b60bbf5db1a188adcad2e677742b':
  Ensure all active Device Admins are listed.
 2013-05-22 14:10:50 -07:00
Alex Klyubin
1eb2064ff4 am 7229e29f: Merge "Ensure all active Device Admins are listed." into jb-mr2-dev 
* commit '7229e29f1749ae10bd92b59ec3d663698a5045e7':
  Ensure all active Device Admins are listed.
 2013-05-22 14:09:10 -07:00
Alex Klyubin
7229e29f17 Merge "Ensure all active Device Admins are listed." into jb-mr2-dev 2013-05-22 21:06:32 +00:00
Dianne Hackborn
be6e37a7e8 am eeeccdc6: am 8274b677: Fix issue #9074296: Device Admins can activate in a way... 
* commit 'eeeccdc6a3ab5640233ff46dc8864c1235687f09':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-05-22 14:03:05 -07:00
Dianne Hackborn
eeeccdc6a3 am 8274b677: Fix issue #9074296: Device Admins can activate in a way... 
* commit '8274b6770219a469ab8a5254206d0d81bd5c96d3':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-05-22 14:01:26 -07:00
Amith Yamasani
7c4dfccda4 Update strings for clarity about restricted profiles 
Bug: 9051422
Bug: 9051178
Change-Id: I1b88286fdd0db27bb6980d0ebbc846370fd0082e
 2013-05-22 12:51:30 -07:00
Dianne Hackborn
8274b67702 Fix issue #9074296: Device Admins can activate in a way... 
...that makes it impossible to deactive/uninstall them

Don't allow device admins to directly launch the add UI if
they are malformed.

Change-Id: I0d3140222d8015f680e1f199bddae2221ee0e726
 2013-05-22 11:50:23 -07:00
Alex Klyubin
d14258e50e Ensure all active Device Admins are listed. 
Bug: 9074296
Change-Id: Ifb70c12ccea6628042b98a18186816887cb4477b
 2013-05-22 09:08:53 -07:00
The Android Open Source Project
38562ce3ae am ae006e70: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'ae006e7077c9937bd90d08f7eea7fb7e580b1d57':
 2013-05-22 07:27:38 -07:00
The Android Open Source Project
ae006e7077 Reconcile with jb-mr2-release - do not merge 
Change-Id: I2a202b7c38568ae9ca45a38cc01f08be05ab5d23
 2013-05-22 07:23:09 -07:00
The Android Automerger
26d3a95a08 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-22 05:55:35 -07:00
Amith Yamasani
d08167e169 am 18d44684: am 0b2781ae: Write restriction bundle right away for required apps. 
* commit '18d44684d3d384cc1eed114808c3870c7738e352':
  Write restriction bundle right away for required apps.
 2013-05-21 18:20:36 -07:00
Amith Yamasani
18d44684d3 am 0b2781ae: Write restriction bundle right away for required apps. 
* commit '0b2781ae537e6d3d27863080eea0a0a5fa6c83b8':
  Write restriction bundle right away for required apps.
 2013-05-21 18:16:50 -07:00
Amith Yamasani
0b2781ae53 Write restriction bundle right away for required apps. 
User shouldn't have to go tap on the settings icon for an app that is ON by default
in a restricted profile. This way apps can write some defaults to the restricted
profile when it is created.

The app entry is also automatically removed from the list if there are no visible
restrictions.

Bug: 9074051

Also fix an incorrect dialog label. Bug: 9068877

Change-Id: I2a7ddc31fe695f58611d2ba36a8bf541b7817b10
 2013-05-21 16:07:28 -07:00
The Android Open Source Project
73493ae256 am 7e18ed8c: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '7e18ed8c14ca2047a5f82f2eb8bcab93d673d730':
 2013-05-21 09:02:36 -07:00
The Android Open Source Project
7e18ed8c14 Reconcile with jb-mr2-release - do not merge 
Change-Id: I6a178af29be7f1d227b667ec84312f5d0c2fdadd
 2013-05-21 08:59:23 -07:00
The Android Automerger
baa0d18d73 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-21 07:47:00 -07:00
Przemyslaw Szczepaniak
6dcdfab906 Make TTS language setting track system language. 
TTS engine default locale is set independently from the system locale.
If TTS engine default locale is not set, it defaults to the system locale.
If user decides to set TTS locale, ability to default to the current system
locale is lost (until device is wiped).

This change makes settings wipe the TTS engine default locale value if user
selects language that is system language. This allows TTS to track system
language if user changes it.

If system language is not available in TTS, language field is set to
"language not selected" value.

This change require a small change in framework/base to make previously
private method public (TtsEngines.getDefaultLocale).

+ Selected language is displayed in language preference summary (matches
all other language preferences)
+ Removing and then adding "language" and 'install languages' preferences
looks glitchy, not they are disabled (grayed out) if unavailable.

Bug: 8613986
Change-Id: Ic4bde97ef7406adb64cc03efbe660275360ba3af
 2013-05-21 12:30:21 +00:00
Amith Yamasani
52d8db7fb2 am 966c2d3f: am b514a95c: am 4abe488a: Merge "No back icon in action bar of APN Settings" 
* commit '966c2d3fc61a1fed5c5e587c6ef29b2b68d01372':
  No back icon in action bar of APN Settings
 2013-05-20 18:26:12 -07:00
Amith Yamasani
966c2d3fc6 am b514a95c: am 4abe488a: Merge "No back icon in action bar of APN Settings" 
* commit 'b514a95ce7009a61532f00d4ac5ab73861d2b327':
  No back icon in action bar of APN Settings
 2013-05-20 18:24:23 -07:00
Dmitry Shmidt
304070968a Merge "Disable On/OFF switch before action" 2013-05-21 01:18:08 +00:00
Amith Yamasani
b514a95ce7 am 4abe488a: Merge "No back icon in action bar of APN Settings" 
* commit '4abe488a5f18d04513b294dce1f7f63d0c9cf3a0':
  No back icon in action bar of APN Settings
 2013-05-20 18:16:42 -07:00
Dianne Hackborn
62ef26c2cd Merge "Add wake lock app ops to UI." 2013-05-21 00:54:19 +00:00
Amith Yamasani
c46a41cd5a am 738c373f: am f88e6e5a: Don\'t mutate all instances of app icons in Settings 
* commit '738c373f3a27f30d631881c1633cca343e512e8f':
  Don't mutate all instances of app icons in Settings
 2013-05-20 17:40:52 -07:00
Amith Yamasani
738c373f3a am f88e6e5a: Don\'t mutate all instances of app icons in Settings 
* commit 'f88e6e5ae6a5a31d47677dcbd9be2b26c6615136':
  Don't mutate all instances of app icons in Settings
 2013-05-20 17:39:29 -07:00
Dmitry Shmidt
70c35ef071 Disable On/OFF switch before action 
Bug: 8715336

Change-Id: I3d4b05ae9dfe109af0b9b06340d52004b73ad0f4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-05-20 17:39:24 -07:00
Dianne Hackborn
ec74da60cd Add wake lock app ops to UI. 
Change-Id: Id2f23acee08fa2830d3edc30a70abf06226ae4eb
 2013-05-20 16:45:26 -07:00
Amith Yamasani
f88e6e5ae6 Don't mutate all instances of app icons in Settings 
When adding color filters to an app icon in User Settings, don't
modify the original drawable state. Get a mutable drawable.

Bug: 9054675
Change-Id: I6ea374cb801abef3f5b597fda2e84b4e67cfa9d0
 2013-05-20 16:05:22 -07:00
Baligh Uddin
405959f44a Merge "Import translations. DO NOT MERGE" 2013-05-20 19:59:33 +00:00
Eric Laurent
0c38f78040 Merge "Single volume control when config_useMasterVolume is true" 2013-05-20 19:13:46 +00:00
Baligh Uddin
6ebd40846a Import translations. DO NOT MERGE 
Change-Id: Ic02fef38ac538c74b0ae6fc5262ca2729b6b675d
Auto-generated-cl: translation import
 2013-05-20 11:38:20 -07:00
Amith Yamasani
4abe488a5f Merge "No back icon in action bar of APN Settings" 2013-05-20 18:07:21 +00:00
The Android Open Source Project
0c4d6ca03c am d82fa081: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'd82fa081f96985ceef99f523a83e2bb365b949b1':
 2013-05-20 08:26:23 -07:00
The Android Open Source Project
d82fa081f9 Reconcile with jb-mr2-release - do not merge 
Change-Id: I82e5359280f8eeb68b9ef61dc4acb3804d8f9106
 2013-05-20 08:20:38 -07:00