Commit Graph

4189 Commits

Author SHA1 Message Date
Baligh Uddin
34e85f841c Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-05 18:48:15 +00:00
Baligh Uddin
ce64877469 Import translations. DO NOT MERGE
Change-Id: I841d6ddb3797a3a84dc53f5139351232e6a6a5da
Auto-generated-cl: translation import
2013-04-05 11:10:03 -07:00
Baligh Uddin
92be13df55 Import translations. DO NOT MERGE
Change-Id: Ide4cc0e303747966dd29a5c849a2d9023b92e098
Auto-generated-cl: translation import
2013-04-05 11:07:06 -07:00
Kristian Monsen
704793f374 am 3c6c45f9: am a95604de: Merge "Adding developer toggle for using Chromium WebView." into jb-mr2-dev
* commit '3c6c45f931307af098e790e86b114c804655f42b':
  Adding developer toggle for using Chromium WebView.
2013-04-05 10:51:22 -07:00
Kristian Monsen
a95604de1a Merge "Adding developer toggle for using Chromium WebView." into jb-mr2-dev 2013-04-05 17:41:34 +00:00
Fabrice Di Meglio
8a34360c25 am 66fe9882: am e68959de: Merge "More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
* commit '66fe98823f7b38387034ed3bfc9a90d629a5a980':
  More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode
2013-04-04 11:06:49 -07:00
Fabrice Di Meglio
e68959de3a Merge "More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev 2013-04-04 17:59:50 +00:00
Baligh Uddin
29366f48ec Import translations. DO NOT MERGE
Change-Id: I3eddc5b7fbb017c3e3b4029a7cb93a87c9c11f06
Auto-generated-cl: translation import
2013-04-03 11:17:55 -07:00
Baligh Uddin
186e250ac7 Import translations. DO NOT MERGE
Change-Id: I5b8551dbf8daff54103023c68f8214b135dd07c1
Auto-generated-cl: translation import
2013-04-03 11:14:39 -07:00
Fabrice Di Meglio
f2a9717b93 More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode
- use setPaddingRelative() instead of setPadding()
- add missing android:textAlignment="viewStart"

Change-Id: I8b981fb64686067de5998e4e218b04126bf2b2f8
2013-04-02 18:36:43 -07:00
Baligh Uddin
1c541aec2b Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-01 19:37:24 +00:00
Baligh Uddin
a63f794e3d Merge "Import translations. DO NOT MERGE" 2013-04-01 19:36:05 +00:00
Amith Yamasani
5a02cbe2ec am b19daff9: am 2601cd91: Implement proper settings restrictions
* commit 'b19daff9cb6f04a71343f858a0c44415412b8049':
  Implement proper settings restrictions
2013-03-31 18:25:07 -07:00
Amith Yamasani
2601cd9142 Implement proper settings restrictions
Settings restrictions for limited users translate to user
restrictions specified in UserManager. Added required strings.
TODO: Add NFC restriction.

Change-Id: If1f81319131855f5dc1b27fe5bd54a4fef616d7f
2013-03-31 18:20:36 -07:00
Baligh Uddin
80c6d90fef Import translations. DO NOT MERGE
Change-Id: I709c77b2c45763a2090875189d88c65d28903030
Auto-generated-cl: translation import
2013-03-29 19:43:43 -07:00
Baligh Uddin
494fd572cc Import translations. DO NOT MERGE
Change-Id: I846ec473107cdeeb6573445d8faa60ab83fa6946
Auto-generated-cl: translation import
2013-03-29 19:41:06 -07:00
Amith Yamasani
377002fa1a am 26aca80e: am a7ff2a2d: Merge "Follow changes to RestrictionEntry API" into jb-mr2-dev
* commit '26aca80eb1813cfe69450383efd8442805b16da5':
  Follow changes to RestrictionEntry API
2013-03-29 18:56:30 -07:00
Amith Yamasani
a7ff2a2d22 Merge "Follow changes to RestrictionEntry API" into jb-mr2-dev 2013-03-30 01:48:38 +00:00
Amith Yamasani
6e4757f0a6 Follow changes to RestrictionEntry API
Implement custom restrictions activity.
Fixed some bugs.

Change-Id: I094a6ffcc41c2936f76a8731048d7cb712c1b857
2013-03-29 18:40:45 -07:00
Kenny Root
265398ecb3 am ab6a6645: Merge "Add KeyStore storage type to Settings UI" into jb-mr2-dev
* commit 'ab6a6645b01312816fe0688c76b5a26948252850':
  Add KeyStore storage type to Settings UI
2013-03-29 14:36:30 -07:00
Fabrice Di Meglio
a8a4373a09 am fee612df: Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
* commit 'fee612df197ab3da969dff39ecc3df95b931cfae':
  Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode
2013-03-29 14:36:01 -07:00
Irfan Sheriff
016a391ad7 am 0f41b49d: Add install support for WIFI UID
* commit '0f41b49d1f33e86ec4e7004f009c074b68a90be6':
  Add install support for WIFI UID
2013-03-29 14:35:32 -07:00
Kenny Root
ab6a6645b0 Merge "Add KeyStore storage type to Settings UI" into jb-mr2-dev 2013-03-29 21:24:48 +00:00
Kenny Root
028634b6af Add KeyStore storage type to Settings UI
Give the user an idea of what kind of credential storage is in use on
this device for keystore daemon.

(cherry picked from commit 39b56008be)

Change-Id: Id89a1e210b3627914f080b0925bd0d0585872dd2
2013-03-29 14:23:30 -07:00
Fabrice Di Meglio
fee612df19 Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev 2013-03-29 19:41:13 +00:00
Irfan Sheriff
0f41b49d1f Add install support for WIFI UID
Bug: 8472221
Change-Id: If203760fc960b4d8987d745e49ef1d4355c45adf
2013-03-29 11:40:16 -07:00
Fabrice Di Meglio
96d780ddf6 Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode
- title should be "viewStart"
- link speed should be also "viewStart"

Change-Id: Ic0389a1e4ddf1b1d6fc1fcbeba50074434fdb52d
2013-03-28 20:26:24 -07:00
Jared Duke
8dc6d08f3b Adding developer toggle for using Chromium WebView.
This is hidden by default, and only revealed in device configurations that contain the Chromium WebView implementation.

BUG=8383477

Change-Id: I8fbb0bb55776e384b9bfc4feb6a2d30eed114ece
2013-03-28 15:37:51 -07:00
Amith Yamasani
07aa7b8e18 am 0fb0d016: Merge "Split User settings into limited and trusted." into jb-mr2-dev
* commit '0fb0d016dd51b0d8b882d92de58f5c2ea28a9208':
  Split User settings into limited and trusted.
2013-03-27 12:36:52 -07:00
Amith Yamasani
0fb0d016dd Merge "Split User settings into limited and trusted." into jb-mr2-dev 2013-03-27 19:30:55 +00:00
Amith Yamasani
864e3b7c51 Split User settings into limited and trusted.
Also show avatars with the circular frame like on lockscreen.

Change-Id: I032d842555b2f50a07166460f9cfb1963366dbb1
2013-03-27 12:27:01 -07:00
Baligh Uddin
5a471cfd2c Merge "Import translations. DO NOT MERGE" 2013-03-27 17:42:47 +00:00
Baligh Uddin
c5a36d903b Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-27 17:41:56 +00:00
Baligh Uddin
49182a26e7 Import translations. DO NOT MERGE
Change-Id: I4cdb85276f2ff6e50f4978eaad3481a248a52fcb
Auto-generated-cl: translation import
2013-03-27 10:41:39 -07:00
Baligh Uddin
3ba60dcb8e Import translations. DO NOT MERGE
Change-Id: I7b83d0e661e36dfe47e342bf9e6086099c4b6be9
Auto-generated-cl: translation import
2013-03-27 10:38:59 -07:00
Jeff Sharkey
984415cc96 am f7ad8e39: Merge "Fix padding so TextViews are baseline aligned." into jb-mr2-dev
* commit 'f7ad8e39748087e4e33a511d1c439b72ebd979b9':
  Fix padding so TextViews are baseline aligned.
2013-03-27 09:51:27 -07:00
Jeff Sharkey
ca60dc7fcd Fix padding so TextViews are baseline aligned.
Also removed unused layout.

Change-Id: I1dd69c3766a58d389fb2fadcf04b23210af3d00a
2013-03-27 09:46:06 -07:00
Baligh Uddin
5fec9e5507 Import translations. DO NOT MERGE
Change-Id: I9a68ce9bb321f72d21f45500427ef6c7c05d3e82
Auto-generated-cl: translation import
2013-03-25 13:26:38 -07:00
Baligh Uddin
1b51d62a32 Import translations. DO NOT MERGE
Change-Id: I898d0fd6ce299f2ffb6cc38805baf566e83f501f
Auto-generated-cl: translation import
2013-03-25 13:22:50 -07:00
Baligh Uddin
9c65b1652e Import translations. DO NOT MERGE
Change-Id: Ieb6e68acb5825785163fd24b92568c97f3b66851
Auto-generated-cl: translation import
2013-03-22 11:40:40 -07:00
Baligh Uddin
fd906e28d8 Import translations. DO NOT MERGE
Change-Id: I2a3ca4e806acc10e961d5720761de5f9e608455a
Auto-generated-cl: translation import
2013-03-22 11:37:52 -07:00
Irfan Sheriff
4e77e3b7d3 am 358d1825: Fix build
* commit '358d1825a4f51b9d28b437cbf02df842a56a6d15':
  Fix build
2013-03-22 00:57:55 +00:00
Irfan Sheriff
358d1825a4 Fix build
Change-Id: Ic2eacc240e693cb523c9189c7bd62e1bf17fd85c
2013-03-21 17:49:31 -07:00
Irfan Sheriff
b3f78d9972 am 871bbbd0: Merge "Notify user that scans are still active" into jb-mr2-dev
* commit '871bbbd0d64bab970f7fba228af2779c1fcbcc46':
  Notify user that scans are still active
2013-03-22 00:19:51 +00:00
Irfan Sheriff
871bbbd0d6 Merge "Notify user that scans are still active" into jb-mr2-dev 2013-03-22 00:15:13 +00:00
Irfan Sheriff
d3863aa664 Notify user that scans are still active
Bug: 8141918
Change-Id: I115ce2ac57125b8ffbb34245dc25effd4b3bebb0
2013-03-21 17:09:43 -07:00
Daniel Sandler
da8690558b am 05f9c75a: Merge "Add some extra info to the notification list rows." into jb-mr2-dev
* commit '05f9c75a7b9793f5a712029aad365926aaddf4a8':
  Add some extra info to the notification list rows.
2013-03-21 22:06:41 +00:00
Daniel Sandler
05f9c75a7b Merge "Add some extra info to the notification list rows." into jb-mr2-dev 2013-03-21 22:02:43 +00:00
Amith Yamasani
92d125cbb1 am 8cb10bd8: Merge "Application restrictions UI" into jb-mr2-dev
* commit '8cb10bd8fc59ce510ae015e8280f99383cddf9c5':
  Application restrictions UI
2013-03-21 07:40:36 +00:00
Amith Yamasani
8cb10bd8fc Merge "Application restrictions UI" into jb-mr2-dev 2013-03-21 06:14:39 +00:00