PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,368 Commits 1 Branch 0 Tags
f02db01ba6c255cffee5a334cd1b0ee7e01f116c
Commit Graph

13368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
3d6ca11349 am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev 
* commit '72a7afb0935264586c821062279d39d8338b1e3d':
  Put fragment in specific activity's whitelist
 2013-12-03 11:35:14 -08:00
Amith Yamasani
72a7afb093 Merge "Put fragment in specific activity's whitelist" into klp-dev 2013-12-03 19:33:21 +00:00
Lance Chang
5796dad9a4 Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change 
Bug: 11923434
Change-Id: I34a353137338b0f8d55e2309f037c34922141181
 2013-12-03 19:16:12 +09:00
Geoff Mendal
01b6b40506 am c07afc7e: (-s ours) am 9d229638: (-s ours) am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE 
* commit 'c07afc7eab76cdbd5aeb21fc6a08481d9458b129':
  Import translations. DO NOT MERGE
 2013-12-02 23:31:56 +00:00
Geoff Mendal
da59631e93 am 0cf4329d: (-s ours) am 6bb8844a: (-s ours) am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE 
* commit '0cf4329dbedbae2a3511d2456ddf50de9c039033':
  Import translations. DO NOT MERGE
 2013-12-02 23:30:59 +00:00
Geoff Mendal
c07afc7eab am 9d229638: (-s ours) am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE 
* commit '9d229638eb78fc25a2699fde5ca2f50eeec57040':
  Import translations. DO NOT MERGE
 2013-12-02 20:51:47 +00:00
Geoff Mendal
9d229638eb am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE 
* commit 'd6ea675c11285c02a625d59a8d88270649da6a5f':
  Import translations. DO NOT MERGE
 2013-12-02 12:48:22 -08:00
Geoff Mendal
d6ea675c11 am f8e1829c: (-s ours) Import translations. DO NOT MERGE 
* commit 'f8e1829c99f1ad74131dad12e220b95a629cd9b5':
  Import translations. DO NOT MERGE
 2013-12-02 12:45:29 -08:00
Geoff Mendal
ddc4bf8dd1 Import translations. DO NOT MERGE 
Change-Id: Ia18b0553100026091fe8f0aaecb3b8c9992c5fc1
Auto-generated-cl: translation import
 2013-12-02 12:18:41 -08:00
Geoff Mendal
f8e1829c99 Import translations. DO NOT MERGE 
Change-Id: I64dae5dfac03e30738558bddc4d44867c2e2b52b
Auto-generated-cl: translation import
 2013-12-02 12:13:18 -08:00
Geoff Mendal
0cf4329dbe am 6bb8844a: (-s ours) am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE 
* commit '6bb8844acd5767999a03ae3217a79a7e3be8251b':
  Import translations. DO NOT MERGE
 2013-11-27 20:42:52 +00:00
Geoff Mendal
6bb8844acd am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE 
* commit 'fa1df42735a7d0ef98a2c1d69d9fbe41be9d73d9':
  Import translations. DO NOT MERGE
 2013-11-27 12:39:48 -08:00
Geoff Mendal
fa1df42735 am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE 
* commit 'b8fe3aa2abbf106bb1bb1d651cc59e425309d788':
  Import translations. DO NOT MERGE
 2013-11-27 12:36:00 -08:00
Geoff Mendal
d23a1b4563 Import translations. DO NOT MERGE 
Change-Id: Ide520d3a801bcfac862133b6a57e5061cc61f0c9
Auto-generated-cl: translation import
 2013-11-27 12:23:44 -08:00
Geoff Mendal
b8fe3aa2ab Import translations. DO NOT MERGE 
Change-Id: Ie6abf3e15ab0bdf9c7fcf7fef498a4c23298c653
Auto-generated-cl: translation import
 2013-11-27 12:18:28 -08:00
Lorenzo Colitti
2c89052892 am 5613086b: am 540d26e8: Merge "Dynamically update connectivity and IP address." 
* commit '5613086bdb5374fcab59a3b40bb29067b8f583c8':
  Dynamically update connectivity and IP address.
 2013-11-26 15:10:07 -08:00
Lorenzo Colitti
36410f0478 am d393e7cb: (-s ours) am 20ab234f: Merge "Cache preferences and services in status dialog." 
* commit 'd393e7cbab2fb1c94b6885ebd1452be333e7130f':
  Cache preferences and services in status dialog.
 2013-11-26 15:10:06 -08:00
William Luh
7640cf6db2 Merge "Add event logging for device admin." 2013-11-26 22:06:18 +00:00
Lorenzo Colitti
5613086bdb am 540d26e8: Merge "Dynamically update connectivity and IP address." 
* commit '540d26e8449159ebc2d84b8062f20ab4c6337f77':
  Dynamically update connectivity and IP address.
 2013-11-26 08:38:50 -08:00
Lorenzo Colitti
d393e7cbab am 20ab234f: Merge "Cache preferences and services in status dialog." 
* commit '20ab234f3d8ecdcbae2c998ded48ebf022ffa963':
  Cache preferences and services in status dialog.
 2013-11-26 08:38:49 -08:00
Ivan Kovac
14c81b48f7 Wrong referring to the resource - id/android:id 
We were referring to the resource defined as
@+android:id with R.id. which is wrong. This
fix changes the @+android:id/ to @+id/

Change-Id: Ifdca7347bff31311c9c07aecdb110946e4a239ed
 2013-11-26 12:42:24 +01:00
Lorenzo Colitti
540d26e844 Merge "Dynamically update connectivity and IP address." 2013-11-26 01:07:25 +00:00
Lorenzo Colitti
20ab234f3d Merge "Cache preferences and services in status dialog." 2013-11-26 01:06:38 +00:00
Geoff Mendal
aadd6e516a am 5f87bb02: (-s ours) am c2d1fdac: (-s ours) am d82e8f2b: (-s ours) Import translations. DO NOT MERGE 
* commit '5f87bb027ce5799ce88da15f88ca4b4f36f88007':
  Import translations. DO NOT MERGE
 2013-11-25 13:04:44 -08:00
Geoff Mendal
5f87bb027c am c2d1fdac: (-s ours) am d82e8f2b: (-s ours) Import translations. DO NOT MERGE 
* commit 'c2d1fdac9e7e914d4ecded6016c9056fa250d267':
  Import translations. DO NOT MERGE
 2013-11-25 12:58:30 -08:00
Geoff Mendal
c2d1fdac9e am d82e8f2b: (-s ours) Import translations. DO NOT MERGE 
* commit 'd82e8f2bec1421c660c786f89e75ffcc4a6fd11e':
  Import translations. DO NOT MERGE
 2013-11-25 12:55:11 -08:00
Geoff Mendal
f2ae37b3d4 Import translations. DO NOT MERGE 
Change-Id: I48e17ae0556e58091a408a23a393c9b05a87fcc8
Auto-generated-cl: translation import
 2013-11-25 11:37:02 -08:00
Geoff Mendal
d82e8f2bec Import translations. DO NOT MERGE 
Change-Id: I0a14a545804964011401d47a44bb6a3d0de94a08
Auto-generated-cl: translation import
 2013-11-25 11:32:22 -08:00
Amith Yamasani
a88bdd34f7 Put fragment in specific activity's whitelist 
Change-Id: I782dc8ec29e49a834832dc8357b3fdb12846e8a9
 2013-11-25 11:10:00 -08:00
Lorenzo Colitti
5448b25481 Dynamically update connectivity and IP address. 
The settings status page dynamically updates mobile network
status (in/out of service, signal strength, network type, etc.)
but not IP address and connectivity information. Dynamically
update that information as well, for consistency.

For consistency, also update the advanced wifi settings page.

[Cherry-pick of deb8f08ace]

Bug: 10232006
Change-Id: I3a292d8bd9e36ab16c37e107eefff4b37d884a4c
 2013-11-25 17:34:45 +09:00
Lorenzo Colitti
b088c8a7c7 Cache preferences and services in status dialog. 
Currently, the status dialog fetches the preferences and system
services that it uses to display connectivity information (e.g.,
IP and MAC addresses) only when the dialog is first opened. This
is fine because the connectivity information is only filled in
once and never updated.

In order to have this information update dynamically (like the
rest of the dialog), fetch and cache these objects in onCreate.
The next change will actually make this information update on
network changes.

[Cherry-pick of 6eb6a90821]

Bug: 10232006
Change-Id: Ib4072674543e517cf6935e3e03f35090e728090a
 2013-11-25 17:34:08 +09:00
The Android Open Source Project
b9b07c3ea4 am 6a1d96e7: am ca99cb71: Merge commit \'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e\' into HEAD 
* commit '6a1d96e710f155b148c60cecce5c6beae1d02db1':
 2013-11-23 12:29:50 -08:00
The Android Open Source Project
6a1d96e710 am ca99cb71: Merge commit \'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e\' into HEAD 
* commit 'ca99cb71eab502037120cdf68f854c882fcd9e57':
 2013-11-22 19:18:34 -08:00
William Luh
64e676a586 Add event logging for device admin. 
This allows us to gather metrics about unwanted device admin apps. User consent from Verify Apps is required.

Bug: 11253927
Change-Id: I449929772f63f426426f7726d3d21e7c1512e6ce
 2013-11-22 15:45:33 -08:00
The Android Open Source Project
ca99cb71ea Merge commit 'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e' into HEAD 2013-11-22 10:35:36 -08:00
Geoff Mendal
606d3c8b0c am 62d814f9: (-s ours) am 548614a4: (-s ours) am c3bd6087: (-s ours) Import translations. DO NOT MERGE 
* commit '62d814f9b449b054b33db9587bc9764267571c17':
  Import translations. DO NOT MERGE
 2013-11-21 14:12:21 -08:00
Geoff Mendal
62d814f9b4 am 548614a4: (-s ours) am c3bd6087: (-s ours) Import translations. DO NOT MERGE 
* commit '548614a4e6e0571d5cf06eb5514d0db8fc017d0b':
  Import translations. DO NOT MERGE
 2013-11-21 14:10:26 -08:00
Geoff Mendal
548614a4e6 am c3bd6087: (-s ours) Import translations. DO NOT MERGE 
* commit 'c3bd608799f2239dfa8d739b2732954e4fd658e5':
  Import translations. DO NOT MERGE
 2013-11-21 14:07:57 -08:00
Geoff Mendal
114cb35aba Import translations. DO NOT MERGE 
Change-Id: Id8eb6d33d1b4d8b5bb3149a0a47295a43cf73e38
Auto-generated-cl: translation import
 2013-11-21 12:45:53 -08:00
Geoff Mendal
c3bd608799 Import translations. DO NOT MERGE 
Change-Id: I8863a00a23acee9b961b5bf1a0f082ffe5c7b3a1
Auto-generated-cl: translation import
 2013-11-21 12:40:04 -08:00
Baligh Uddin
c384651a2b am e178a756: (-s ours) am cd0726f7: (-s ours) am f06ce4eb: (-s ours) Import translations. DO NOT MERGE 
* commit 'e178a756df4af2ac14b2123dbf76c8f788addbc7':
  Import translations. DO NOT MERGE
 2013-11-20 13:24:13 -08:00
Baligh Uddin
e178a756df am cd0726f7: (-s ours) am f06ce4eb: (-s ours) Import translations. DO NOT MERGE 
* commit 'cd0726f7d824759984a7024826fbfbcaba575400':
  Import translations. DO NOT MERGE
 2013-11-20 13:19:50 -08:00
Baligh Uddin
cd0726f7d8 am f06ce4eb: (-s ours) Import translations. DO NOT MERGE 
* commit 'f06ce4eb9668415c23b16dbd7d8c50702466f8c4':
  Import translations. DO NOT MERGE
 2013-11-20 13:15:25 -08:00
Baligh Uddin
0c54a094c7 Import translations. DO NOT MERGE 
Change-Id: I94cb4e4f70c7c1766fde7e6526d3d81fb48cbee6
Auto-generated-cl: translation import
 2013-11-20 11:33:22 -08:00
Baligh Uddin
f06ce4eb96 Import translations. DO NOT MERGE 
Change-Id: I5ef68d36b77bb0374026bdf5e1d2a909156be3d7
Auto-generated-cl: translation import
 2013-11-20 11:27:32 -08:00
Jeff Brown
8dd9b71f7c am 169e8a0c: am 017d2a18: am 130118d4: Add help url for remote display. 
* commit '169e8a0c2aee26731a847a46954d95a78161ecd8':
  Add help url for remote display.
 2013-11-18 19:13:24 -08:00
Jeff Brown
169e8a0c2a am 017d2a18: am 130118d4: Add help url for remote display. 
* commit '017d2a189ac758ad035182a886c4f4e578cee6f2':
  Add help url for remote display.
 2013-11-18 19:09:55 -08:00
Jeff Brown
017d2a189a am 130118d4: Add help url for remote display. 
* commit '130118d43628c058e3bf82f5d978d383f19390de':
  Add help url for remote display.
 2013-11-18 19:07:06 -08:00
Jeff Brown
130118d436 Add help url for remote display. 
Bug: 11736504
Change-Id: I83d278731cf853ff911ff1a8b82a942881cb4727
 2013-11-18 17:58:08 -08:00
Baligh Uddin
f63b4c5810 am f9ca318a: (-s ours) am 6d34b698: (-s ours) am 91c54aa8: (-s ours) Import translations. DO NOT MERGE 
* commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b':
  Import translations. DO NOT MERGE
 2013-11-18 11:21:32 -08:00