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
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
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
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
Lifu Tang
081a9162c9
Merge "Set switch to the correct enabling state" into lmp-dev
2014-08-19 02:08:36 +00: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
6e73e81ab7
am a4ab5a3a
: am 31584ec3
: Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev
...
* commit 'a4ab5a3a2b0924d55445a1c195336bd9e237d577':
Fixed a crash when rotating a saved networks dialog.
2014-08-18 20:15:04 +00:00
PauloftheWest
fe9c0e056c
am 480fcb24
: am 6a2b1a44
: Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev
...
* commit '480fcb2432c6a1d0615eacdf50b144ce5e435dae':
Fixed a bug were AdvanceWifiSettings would crash on resume.
2014-08-18 20:15:03 +00:00
PauloftheWest
a4ab5a3a2b
am 31584ec3
: Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev
...
* commit '31584ec3e99ded3dd96de06bcb1aa8e4dc408cce':
Fixed a crash when rotating a saved networks dialog.
2014-08-18 20:07:36 +00:00
PauloftheWest
480fcb2432
am 6a2b1a44
: Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev
...
* commit '6a2b1a44d2ed5bc0b5025ec62a51662850499d71':
Fixed a bug were AdvanceWifiSettings would crash on resume.
2014-08-18 20:07:35 +00:00
Lifu Tang
db0b7637fa
Dim the preference icons when its disabled
...
- Fix b/16956979
Change-Id: Idfa3fddf63746dea1db0c75dedab06b57aaf5de7
2014-08-18 11:22:13 -07:00
Alexandra Gherghina
518f3e0075
am 9db8f0aa
: am 0cad779d
: Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev
...
* commit '9db8f0aaf3f220208e50b088e4114ee41b0ff19c':
Switch to listening for USER_INITIALIZE broadcast in the Settings app.
2014-08-18 17:07:05 +00:00
Alexandra Gherghina
9db8f0aaf3
am 0cad779d
: Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev
...
* commit '0cad779d3e4d7ef361fa972e54879cd6791b467c':
Switch to listening for USER_INITIALIZE broadcast in the Settings app.
2014-08-18 16:56:17 +00:00
Alexandra Gherghina
13e00185b8
am 4b81ebf2
: am cd88c2f7
: Fix Account Settings crash
...
* commit '4b81ebf28557b8ed61ecdce96fcdef30c851ca4d':
Fix Account Settings crash
2014-08-18 16:44:28 +00:00
Alexandra Gherghina
4b81ebf285
am cd88c2f7
: Fix Account Settings crash
...
* commit 'cd88c2f7c30fe58e523e93469dd1fc7a121320f3':
Fix Account Settings crash
2014-08-18 16:39:54 +00:00
Alexandra Gherghina
cd88c2f7c3
Fix Account Settings crash
...
Bug: 17020198
Change-Id: I9d4a18381ebb0f57a0e9917c3b7579b0a7feeaf4
2014-08-18 14:34:13 +01:00
Baligh Uddin
1169cd85d2
am 1f4e0347
: (-s ours) am f14fa7ed
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '1f4e0347b903823a19417e57d0e398e6e9c5dda6':
Import translations. DO NOT MERGE
2014-08-17 14:24:12 +00:00
Baligh Uddin
1f4e0347b9
am f14fa7ed
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'f14fa7ed4e9c61543a10f081027489558c4bc104':
Import translations. DO NOT MERGE
2014-08-17 14:08:30 +00:00
Adam Lesinski
6f0b3aa9d9
am 82951de9
: am a9dc57c1
: Merge "Added Warning dialog when enabling usage access for app" into lmp-dev
...
* commit '82951de9fe1be4686e80ea61807140274deaff50':
Added Warning dialog when enabling usage access for app
2014-08-16 06:56:29 +00:00
Adam Lesinski
82951de9fe
am a9dc57c1
: Merge "Added Warning dialog when enabling usage access for app" into lmp-dev
...
* commit 'a9dc57c145c91eaa5b43510575eae3e425adc461':
Added Warning dialog when enabling usage access for app
2014-08-16 06:49:40 +00:00
Baligh Uddin
464114588d
am a07fddf1
: (-s ours) am 88ee936a
: (-s ours) am 2719eebf
: (-s ours) am b3b64705
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a07fddf1834f80872a83527dc5309d96fadb151d':
Import translations. DO NOT MERGE
2014-08-16 04:51:34 +00:00
Baligh Uddin
a07fddf183
am 88ee936a
: (-s ours) am 2719eebf
: (-s ours) am b3b64705
: (-s ours) Import translations. DO NOT MERGE
...
* commit '88ee936a94db3dcbecf7089183f740ab184c3907':
Import translations. DO NOT MERGE
2014-08-16 04:38:20 +00:00
Amith Yamasani
d05dd864d6
Merge "Update strings for guest removal affordance and dialog" into lmp-dev
2014-08-16 04:32:18 +00:00
Amith Yamasani
94c0181c8f
Update strings for guest removal affordance and dialog
...
Exit guest -> Remove guest
etc.
Bug: 16495144
Change-Id: Ieb44e886ea537682a6922046c0f63cef1456c6d8
2014-08-18 16:42:43 -07:00