PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,968 Commits 1 Branch 0 Tags
5ae5557e51b2bf98e6f9264d2418a0d6fa3cb221
Commit Graph

15968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PauloftheWest
5badff7622 Added a default Bluetooth icon for Bluetooth Preferences. 
Bug: 17139683
Change-Id: I7b68950685732a85319a0dca7bd77234d345dbb7
 2014-08-20 14:48:38 -07:00
PauloftheWest
98d0f8ca2d am d251fba2: Merge "Fixed a Bluetooth Scanning issue." into lmp-dev 
* commit 'd251fba2fe308ea6aa18002c92506fca9d53848d':
  Fixed a Bluetooth Scanning issue.
 2014-08-20 21:17:34 +00:00
vandwalle
1dfdcdb470 rename ScanResult.status -> autoJoinStatus 
This CL is dependent on Id9411c8097337b37ac1ce1a6ac8b28b4bda31ff3

Change-Id: Iec1a1e4718530f149051bd5de5235f0e0e4a438d
 2014-08-20 21:11:18 +00:00
Amith Yamasani
6879169fe9 am 23d8742d: Merge "Update string for profile owner addition warning" into lmp-dev 
* commit '23d8742df6719f3f20545fc345b9f1cc74c6165a':
  Update string for profile owner addition warning
 2014-08-20 21:08:26 +00:00
PauloftheWest
27bd00ba27 Entering Bluetooth in Settings will always initiate a scan. 
Bug: 17060518
Change-Id: I4ba13097f664b4a758ba714f423fa8b34af60ce6
 2014-08-20 13:23:49 -07:00
Jeff Davidson
8a983e438b Merge "Suppress WiFi Assistant card until future platform updates." into lmp-dev 2014-08-20 20:15:45 +00:00
PauloftheWest
0233d732eb am 2dc11d40: Merge "Fixed a Settings dialog crash." into lmp-dev 
* commit '2dc11d40c205432774d4e4bc7ce56407b99eaa3a':
  Fixed a Settings dialog crash.
 2014-08-20 20:12:08 +00:00
John Spurlock
1bc2ff2b30 am dc79528b: Merge "Settings: Remove needless dialogTitle attribute." into lmp-dev 
* commit 'dc79528bf660b9e431141e93a8c1c378af337b7a':
  Settings: Remove needless dialogTitle attribute.
 2014-08-20 19:53:04 +00:00
Amith Yamasani
23d8742df6 Merge "Update string for profile owner addition warning" into lmp-dev 2014-08-20 18:43:12 +00:00
Amith Yamasani
2e4489d6c3 Update string for profile owner addition warning 
Bug: 16207721
Change-Id: I561e0fc992f19339ab794dd7dffb9d650da141a0
 2014-08-20 13:43:13 -07:00
Jon Miranda
af1d4c7c15 am b96f55f0: am 735219be: Merge "Added a developer option to save attribute data." into lmp-dev 
* commit 'b96f55f0605db060db8cf4a13b3455f19b5a1ecd':
  Added a developer option to save attribute data.
 2014-08-20 15:38:08 +00:00
Jon Miranda
b96f55f060 am 735219be: Merge "Added a developer option to save attribute data." into lmp-dev 
* commit '735219be8f85bd1ad41ab91834e5a427bb2ae7fc':
  Added a developer option to save attribute data.
 2014-08-20 15:30:30 +00:00
Jessica Hummel
fc8cf67df6 Make string for work profile consistent with provisioning and framework strings. 
Change-Id: Id52937400a2664d25b40649767df5b6723886871
bug:16468412
 2014-08-20 15:45:53 +01:00
Jeff Brown
966b5fefb7 am 2cd05f71: am ff0e81eb: Declare CAST_SETTINGS activity. 
* commit '2cd05f71230bfdb04abc792e605b0d68befb01ce':
  Declare CAST_SETTINGS activity.
 2014-08-20 03:31:48 +00:00
Jeff Brown
2cd05f7123 am ff0e81eb: Declare CAST_SETTINGS activity. 
* commit 'ff0e81eb099dd7fe15c1d444e89a992b0f020a47':
  Declare CAST_SETTINGS activity.
 2014-08-20 03:19:32 +00:00
Jeff Brown
ff0e81eb09 Declare CAST_SETTINGS activity. 
Currently this is the same as the WIFI_DISPLAY_SETTINGS activity
although we may eventually split them apart.

Change-Id: I4c4482792abc3d3d22fb50ee9657b536374a618f
 2014-08-19 19:44:47 -07:00
Maurice Lam
5cb59e2df6 am 8904061e: am e62de59b: Merge "[WifiSetup] Change illustration aspect ratio" into lmp-dev 
* commit '8904061e66e52491cb0cecb4bb1ade418d254f63':
  [WifiSetup] Change illustration aspect ratio
 2014-08-20 02:44:34 +00:00
Maurice Lam
8904061e66 am e62de59b: Merge "[WifiSetup] Change illustration aspect ratio" into lmp-dev 
* commit 'e62de59b947144ded046778b4f4ea0cc4bba12df':
  [WifiSetup] Change illustration aspect ratio
 2014-08-20 02:22:21 +00:00
Jon Miranda
735219be8f Merge "Added a developer option to save attribute data." into lmp-dev 2014-08-20 01:43:56 +00:00
Maurice Lam
e62de59b94 Merge "[WifiSetup] Change illustration aspect ratio" into lmp-dev 2014-08-20 01:43:56 +00:00
Alan Viverette
5dc1fed4da am 86cd94a3: am aaa066b6: Add "experimental" subtitle to color correction and inversion 
* commit '86cd94a3ad2cb298227d81dc371a1e41d0a14b39':
  Add "experimental" subtitle to color correction and inversion
 2014-08-20 00:54:45 +00:00
Alan Viverette
86cd94a3ad am aaa066b6: Add "experimental" subtitle to color correction and inversion 
* commit 'aaa066b66d4c8acf8931e624cf81376ac35d358e':
  Add "experimental" subtitle to color correction and inversion
 2014-08-20 00:47:11 +00:00
Alan Viverette
aaa066b66d Add "experimental" subtitle to color correction and inversion 
BUG: 17112912
Change-Id: I84eaa94e755bfcfbdf014fae09d1b02ae5d2eb4a
 2014-08-19 17:37:16 -07:00
PauloftheWest
d251fba2fe Merge "Fixed a Bluetooth Scanning issue." into lmp-dev 2014-08-19 22:53:25 +00:00
Paul Lawrence
9e3117de83 am 17f213d7: am b7b686ca: Merge "Fix encryption strings" into lmp-dev 
* commit '17f213d781a394378c9e944d6fefee5dd56d7c25':
  Fix encryption strings
 2014-08-19 21:08:15 +00:00
Paul Lawrence
5b22e3d03b am 71894714: am d5a497b8: Merge "Change decryption strings" into lmp-dev 
* commit '71894714c920cc08aa15c1423d3f370cbcc2f409':
  Change decryption strings
 2014-08-19 21:08:12 +00:00
Paul Lawrence
17f213d781 am b7b686ca: Merge "Fix encryption strings" into lmp-dev 
* commit 'b7b686cadf6a07c74672d4e1c3aab30e7d24a545':
  Fix encryption strings
 2014-08-19 20:59:13 +00:00
Paul Lawrence
71894714c9 am d5a497b8: Merge "Change decryption strings" into lmp-dev 
* commit 'd5a497b8375444858fb17008a450d3bc26269d1c':
  Change decryption strings
 2014-08-19 20:59:12 +00:00
Maurice Lam
c73e339b3b [WifiSetup] Change illustration aspect ratio 
Change the aspect ratio of the illustration to 20:9 to align with UX
mocks.

Bug: 17111669
Change-Id: I37b2ca7624b7baf156830db53d2cea97a78e2dab
 2014-08-19 13:20:27 -07:00
Lorenzo Colitti
38dfe7d05b am d73fc0c8: am f1b786d8: Stop using LinkProperties for static configuration. 
* commit 'd73fc0c8d0d8b504662cf4fdf85adf88f5288ab2':
  Stop using LinkProperties for static configuration.
 2014-08-19 19:37:42 +00:00
Lorenzo Colitti
d73fc0c8d0 am f1b786d8: Stop using LinkProperties for static configuration. 
* commit 'f1b786d8a8dc894904c5edc6e375da0e7ddb7ed4':
  Stop using LinkProperties for static configuration.
 2014-08-19 19:29:01 +00:00
Julia Reynolds
9a49d7af25 am 51e8febf: am 7138ed74: Merge "Supress menu if screen ought to be hidden." into lmp-dev 
* commit '51e8febf8c4b522a9704b3ba9bb19a2f7f45a0f5':
  Supress menu if screen ought to be hidden.
 2014-08-19 19:02:52 +00:00
Lorenzo Colitti
f1b786d8a8 Stop using LinkProperties for static configuration. 
Bug: 16114392
Bug: 16893413
Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df
 2014-08-19 11:59:44 -07:00
Julia Reynolds
51e8febf8c am 7138ed74: Merge "Supress menu if screen ought to be hidden." into lmp-dev 
* commit '7138ed7404f22862ac7e2fdb29d71833dec9b1a3':
  Supress menu if screen ought to be hidden.
 2014-08-19 18:54:36 +00:00
Lifu Tang
868c7c450e am 6a86746f: am 72bd4d25: Merge "Dim the preference icons when its disabled" into lmp-dev 
* commit '6a86746f98b760728180931ef23956e97ae09e8b':
  Dim the preference icons when its disabled
 2014-08-19 17:41:12 +00:00
Lifu Tang
6a86746f98 am 72bd4d25: Merge "Dim the preference icons when its disabled" into lmp-dev 
* commit '72bd4d252dc7a706b661f2970396dc0211d7b4de':
  Dim the preference icons when its disabled
 2014-08-19 17:32:13 +00:00
Sander Alewijnse
1ac37a4199 Add extra to home settings starting intent. 
If intent contains a specific extra the picker will be
retricted to launchers that support managed profiles
no matter whether there are managed profiles present.

Bug:15099904
Change-Id: I31ab74afee7b5a790cb7aa621fff72f640fcedaf
 2014-08-19 18:09:26 +01:00
Amith Yamasani
6b3973fc1e am 408943e9: am d05dd864: Merge "Update strings for guest removal affordance and dialog" into lmp-dev 
* commit '408943e9aa708a1077197300a775e7dea677d037':
  Update strings for guest removal affordance and dialog
 2014-08-19 15:51:04 +00:00
Lifu Tang
72bd4d252d Merge "Dim the preference icons when its disabled" into lmp-dev 2014-08-19 15:47:37 +00:00
Amith Yamasani
408943e9aa am d05dd864: Merge "Update strings for guest removal affordance and dialog" into lmp-dev 
* commit 'd05dd864d6f26a1577cbcb25a43ddf9d3e638299':
  Update strings for guest removal affordance and dialog
 2014-08-19 15:43:40 +00:00
Lifu Tang
8d576dd26f am 47cdb727: am 081a9162: Merge "Set switch to the correct enabling state" into lmp-dev 
* commit '47cdb7276230b87a3a9ba75073a483fb7c531036':
  Set switch to the correct enabling state
 2014-08-19 04:36:14 +00:00
Lifu Tang
47cdb72762 am 081a9162: Merge "Set switch to the correct enabling state" into lmp-dev 
* commit '081a9162c959f9cbd0cbd76674501cdb47d516a7':
  Set switch to the correct enabling state
 2014-08-19 04:29:17 +00:00
PauloftheWest
2dc11d40c2 Merge "Fixed a Settings dialog crash." into lmp-dev 2014-08-19 02:43:23 +00:00
PauloftheWest
b58e2005ab Fixed a Settings dialog crash. 
+ Fixed a bug where Settings would crash when trying to open paired bluetooth
device settings after device orientation change.

Bug: 16972564
Change-Id: I0e93551ae7d8f21711d85093756fc33b62f59b24
 2014-08-20 11:44:36 -07:00
Lifu Tang
081a9162c9 Merge "Set switch to the correct enabling state" into lmp-dev 2014-08-19 02:08:36 +00:00
Baligh Uddin
9ee4596661 Import translations. DO NOT MERGE 
Change-Id: I01598edaa725d9a59747e892ba470ee1e876f8eb
Auto-generated-cl: translation import
 2014-08-18 18:59:06 -07:00
Jeff Davidson
978d2785fb Suppress WiFi Assistant card until future platform updates. 
This replaces the previous behavior of an increasing timeout. When the
user dismisses the WiFi Assistant card, either by opting out or
successfully configuring the assistant, the card is suppressed until
the next major platform upgrade (assuming the assistant is not enabled
at the time of the upgrade).

Bug: 16902858
Change-Id: I5373a7a743f21777b7b75a620b5a4e9004e57466
 2014-08-18 18:13:43 -07:00
Jon Miranda
0b65294a7a Added a developer option to save attribute data. 
After the checkbox for 'Enable view attribute inspection' is checked,
newly constructed Views will save their attribute data.

Change-Id: Ia6d150d0d9991a2341236a9d35055b811038c849
 2014-08-18 17:16:23 -07:00
Lifu Tang
b18e242366 Set switch to the correct enabling state 
- Fix b/16951708

Change-Id: I4f9a2a374a771fd353fca436a0d34644f9bc8320
 2014-08-18 16:46:48 -07:00
PauloftheWest
637f1b4e45 Fixed a Bluetooth Scanning issue. 
+ When refreshing Bluetooth devices, sometimes it took awhile for some
devices to come back up.  This is a fix.

Bug: 17049458
Change-Id: Id6233b38585e003e0432707663af4d06b0ce98c2
 2014-08-18 15:00:19 -07:00