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

11641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
2fba8be9c0 am 4e54c2a1: Integrate remote display routes into screen cast settings UI. 
* commit '4e54c2a17765aed01ba23c9b0ec4d41e66c698b7':
  Integrate remote display routes into screen cast settings UI.
 2013-11-11 10:21:59 -08:00
Jeff Brown
4e54c2a177 Integrate remote display routes into screen cast settings UI. 
Merged remote display route selection into the existing wifi
display preference UI.  Moved the on/off toggle over to a menu item.

The preference page is now mainly implemented in terms of the
media router.  It only interacts with the display manager for the purpose
of pairing with new devices or making wifi display certification
controls available.

This means that the observed state is now completely consistent across
the system ui, settings, and applications that use the media router.

Bug: 11257292
Change-Id: I3705570812384fef4bfffeccaaccf7895d370d12
 2013-11-10 21:20:16 -08:00
Ed Heyl
7ebe4c6c20 am a27816dc: merge in release branch changes (no-op). 
* commit 'a27816dc2d72f5757ee5377ccd03798736c96fd8':
  Revert "Accessibility: filter touches to Enable button"
 2013-11-08 13:31:32 -08:00
Ed Heyl
a27816dc2d merge in release branch changes (no-op). 2013-11-08 13:23:52 -08:00
Robert Greenwalt
384bf72708 am 29b7a844: Merge "Add batch scan data to power stats." into klp-dev 
* commit '29b7a8446a36286bd4311ec2f52281fd1628a86e':
  Add batch scan data to power stats.
 2013-11-07 10:32:55 -08:00
Robert Greenwalt
29b7a8446a Merge "Add batch scan data to power stats." into klp-dev 2013-11-07 18:31:03 +00:00
The Android Automerger
84760b633b merge in klp-mr1-release history after reset to klp-dev 2013-11-07 06:01:28 -08:00
Baligh Uddin
f9be657ac2 am 7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '7d7164361e3e9cf9198fca4050fca81547053b04':
  Import translations. DO NOT MERGE
 2013-11-06 20:03:44 -08:00
Baligh Uddin
7d7164361e Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-07 04:00:05 +00:00
Kenny Root
8be30bb162 Revert "Accessibility: filter touches to Enable button" 
This reverts commit 94d4f23dcc.

Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f
 2013-11-06 15:14:16 -08:00
Kenny Root
279c1e15d2 am d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev 
* commit 'd0de39e716c7d93beeb83f9b442af437be651e55':
  Revert "Accessibility: filter touches to Enable button"
 2013-11-06 15:11:14 -08:00
Kenny Root
d0de39e716 Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev 2013-11-06 23:09:06 +00:00
Baligh Uddin
4a5e53aa02 Import translations. DO NOT MERGE 
Change-Id: I81129ec9d537a26df337e5f306b8897ce9fdc810
Auto-generated-cl: translation import
 2013-11-06 14:34:35 -08:00
Kenny Root
b974fa8034 Revert "Accessibility: filter touches to Enable button" 
This reverts commit 94d4f23dcc.

Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f
 2013-11-06 22:03:52 +00:00
Lifu Tang
5b68e4c8d0 am 741bc054: Merge "Shows LGAAYL when launching Location Settings" into klp-dev 
* commit '741bc054243576dcfff17bf3a807dc8732bca332':
  Shows LGAAYL when launching Location Settings
 2013-11-05 22:23:01 -08:00
Lifu Tang
741bc05424 Merge "Shows LGAAYL when launching Location Settings" into klp-dev 2013-11-06 06:20:56 +00:00
Geoffrey Borggaard
36ddea8c21 am 5b7111d0: Merge "Remove line break." into klp-dev 
* commit '5b7111d05db50d479290517b1b459dbcfc178a7f':
  Remove line break.
 2013-11-05 18:39:31 -08:00
Geoffrey Borggaard
5b7111d05d Merge "Remove line break." into klp-dev 2013-11-06 02:37:48 +00:00
Jason Monk
c85359ef11 am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev 
* commit '4e42c80872e3543247913afd270fe5b9950b2969':
  Add PAC UI to Wi-Fi Settings
 2013-11-05 18:22:58 -08:00
Jason Monk
4e42c80872 Merge "Add PAC UI to Wi-Fi Settings" into klp-dev 2013-11-06 02:20:50 +00:00
Baligh Uddin
e202393f79 am 1bfd3541: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '1bfd35410db22b1f4aabe4ad3f471bedb088584d':
  Import translations. DO NOT MERGE
 2013-11-05 15:15:23 -08:00
Baligh Uddin
1bfd35410d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-05 23:12:13 +00:00
Amith Yamasani
f7f6e4bfc6 am 060d5fd1: Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev 
* commit '060d5fd1727b087094e295481b2633deb33a6616':
  Adjust power control widget minWidth to occupy 4 cells.
 2013-11-05 13:54:00 -08:00
Amith Yamasani
060d5fd172 Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev 2013-11-05 21:51:43 +00:00
Jason Monk
070f3560d5 Add PAC UI to Wi-Fi Settings 
Now when a PAC URL is set it shows it in settings rather than the proxy
spinner set to None.  This should only be visible in EDU users as only EDU
has PAC.

Bug: 11528608
Change-Id: Ie4bad8ea935f0a8f1bb7877eb2be146e06d71c2d
 2013-11-05 14:39:44 -05:00
Geoffrey Borggaard
03c56a95d3 Remove line break. 
The "network may be monitored" message had an extra line break.
Bug: 11534572

Change-Id: I7a0e9845413f2e5787ca60ad9e2f8988eed207a6
 2013-11-05 13:10:49 -05:00
Kenny Root
18964c9063 am 8cc60da4: Merge "Accessibility: filter touches to Enable button" into klp-dev 
* commit '8cc60da4c91c38f7f37561ff3bbb128dcb7456d8':
  Accessibility: filter touches to Enable button
 2013-11-04 16:16:08 -08:00
Kenny Root
8cc60da4c9 Merge "Accessibility: filter touches to Enable button" into klp-dev 2013-11-05 00:12:19 +00:00
Baligh Uddin
734def9d81 Import translations. DO NOT MERGE 
Change-Id: Ibae16129afb209250dddbfa8415fc2c780703a94
Auto-generated-cl: translation import
 2013-11-04 15:23:56 -08:00
Lifu Tang
fe9420f7da Shows LGAAYL when launching Location Settings 
- Partial fix of b/10897468

Change-Id: Iec96909b87e71869c5a020ce848c6cf4fada3616
 2013-11-04 11:37:55 -08:00
Amith Yamasani
49f9a444f3 Adjust power control widget minWidth to occupy 4 cells. 
Bug: 10561000
Change-Id: I9a4312d956581059ea43077c5228e43e2bd1c7a5
 2013-11-01 17:17:08 -07:00
Baligh Uddin
8fe316cad4 am e2b0278f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e2b0278fa3ce9f04fdaa3ce690b8e1581a0dbe13':
  Import translations. DO NOT MERGE
 2013-11-01 07:47:57 -07:00
Baligh Uddin
e2b0278fa3 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-01 14:46:21 +00:00
Satoshi Kataoka
2cab134403 am aa4fa0ea: Fix a bug on updating enabled IMEs 
* commit 'aa4fa0ea0950ecd61af64a6bdeea109cfed64362':
  Fix a bug on updating enabled IMEs
 2013-10-31 15:07:11 -07:00
Satoshi Kataoka
aa4fa0ea09 Fix a bug on updating enabled IMEs 
Bug: 11354619
Change-Id: Ie33630b3dc150536bc0325ad6116ea5fdcf60740
 2013-11-01 07:00:13 +09:00
Baligh Uddin
ac093063b0 Import translations. DO NOT MERGE 
Change-Id: Ie376be991f9d022ac5b4f066c7946d44d4175c2e
Auto-generated-cl: translation import
 2013-10-30 11:23:02 -07:00
Chris Wren
455bf4d339 am 1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen. 
* commit '1630ef4fc5f4131d7d7ef823ba5afba3b5b3fa72':
  remove lockscreen widget checkbox when there's no lockscreen.
 2013-10-29 11:59:53 -07:00
Chris Wren
1630ef4fc5 remove lockscreen widget checkbox when there's no lockscreen. 
Bug: 11190345
Change-Id: I1b48e7a6a70226b103d8a6a27bd3374ff8349b3f
 2013-10-29 13:42:05 -04:00
Baligh Uddin
317352151b am b9687f3b: (-s ours) Import translations. DO NOT MERGE 
* commit 'b9687f3b4ef392dbeddeeeb9de9e0b5e51f44a2f':
  Import translations. DO NOT MERGE
 2013-10-28 20:44:53 -07:00
Baligh Uddin
b9687f3b4e Import translations. DO NOT MERGE 
Change-Id: I9f5f19d06f849f0142b1667c74d3d2456ad6fe27
Auto-generated-cl: translation import
 2013-10-28 15:19:24 -07:00
Jeff Sharkey
bd5cbb0400 am fd845410: Merge "remove primary condition check on storage format." into klp-dev 
* commit 'fd845410aa3b5b572e2d72bd7d97fb5b112fa3fd':
  remove primary condition check on storage format.
 2013-10-25 15:02:50 -07:00
Jeff Sharkey
fd845410aa Merge "remove primary condition check on storage format." into klp-dev 2013-10-25 22:00:07 +00:00
Pierre
93df01e3a7 remove primary condition check on storage format. 
this change seemed to have been introduced originally
via commit d2a6f28fa7
as a workaround to fix interoperability problem with MTP,
then commit 8218d3ba18
seemed to have address this problem.

therefore it looks like removing the original restriction
is in order to allow formating of the sd-card when not
primary storage.

Bug: 11352632
Change-Id: I0419135a607dac08c44a3f30a7ccdcad17c46437
Signed-off-by: Pierre <pierre@broadcom.com>
 2013-10-25 13:12:28 -07:00
Baligh Uddin
0728400a79 am 9271875c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '9271875c129d000a98a7a1fcd11f09041f26455c':
  Import translations. DO NOT MERGE
 2013-10-25 12:22:49 -07:00
Baligh Uddin
9271875c12 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-25 19:21:06 +00:00
Baligh Uddin
144cdee03c Import translations. DO NOT MERGE 
Change-Id: If2ea17bb82d79c6a722bfa2360db9dbee83d008d
Auto-generated-cl: translation import
 2013-10-25 11:40:25 -07:00
Zhihai Xu
c9c92647d1 am cb9d32e5: Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev 
* commit 'cb9d32e55f68446a3e696b0bd9f553f7d5d14dc4':
  need persist adding bluetooth MAP profile to profile list in case the settings process being killed
 2013-10-25 11:15:55 -07:00
Zhihai Xu
cb9d32e55f Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev 2013-10-25 18:12:48 +00:00
Wink Saville
01b7ae2960 am 83671ff8: Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev 
* commit '83671ff815f59a977b34297c94aa05b4b4e97d01':
  Display remaining attempts when using or changing SIM PIN
 2013-10-25 09:46:29 -07:00
Wink Saville
83671ff815 Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev 2013-10-25 16:41:09 +00:00