drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,994 Commits 1 Branch 0 Tags
Commit Graph

94994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
959256498a am 9de13839: am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit '9de1383960314eed43c4df1c0bcc82cd883bd76f':
  Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
 2013-02-21 14:29:33 -08:00
Dirk Dougherty
9de1383960 am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit 'd886d12854011894d9b5f4155179c11e571a1aee':
  Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
 2013-02-21 14:25:37 -08:00
Wink Saville
f7bf667d4a am b5a1ce2f: Merge "Allow three digit phone numbers" 
* commit 'b5a1ce2f5daa20b5c77113b8887e12dcc05590fc':
  Allow three digit phone numbers
 2013-02-21 14:21:12 -08:00
Dirk Dougherty
d886d12854 am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit 'efa92b0bbe906bfac15936e5ab3f75a206cf3d24':
  Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
 2013-02-21 14:21:02 -08:00
Dirk Dougherty
efa92b0bbe am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit 'f32cbc3d490845967e28b0995ac88187b197642c':
  Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
 2013-02-21 14:18:06 -08:00
Dirk Dougherty
f32cbc3d49 Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
bug: 8033647
bug: 8033688

Change-Id: Id7b5efd48f8e13ba8c8f4ab0e0f8e5dc736b1691
 2013-02-21 13:29:07 -08:00
Scott Main
09ee121c27 am 7c3e0dcc: am b5261bfe: am 36c14ef8: am 488c81ae: docs: add note about javascript interface to 4.2 overview 
* commit '7c3e0dcc7d395430e72b6786b715a530d8b5db4d':
  docs: add note about javascript interface to 4.2 overview
 2013-02-20 16:53:10 -08:00
Scott Main
7c3e0dcc7d am b5261bfe: am 36c14ef8: am 488c81ae: docs: add note about javascript interface to 4.2 overview 
* commit 'b5261bfe8f55617b8a91800bcc3ac41871bc5068':
  docs: add note about javascript interface to 4.2 overview
 2013-02-20 16:49:18 -08:00
Scott Main
b5261bfe8f am 36c14ef8: am 488c81ae: docs: add note about javascript interface to 4.2 overview 
* commit '36c14ef8c941133d3d35eee9afc76bd63b316ef6':
  docs: add note about javascript interface to 4.2 overview
 2013-02-20 16:47:36 -08:00
Scott Main
36c14ef8c9 am 488c81ae: docs: add note about javascript interface to 4.2 overview 
* commit '488c81aebb24b2cde7a0878b2d8bab88484544ca':
  docs: add note about javascript interface to 4.2 overview
 2013-02-20 16:44:34 -08:00
Scott Main
488c81aebb docs: add note about javascript interface to 4.2 overview 
Change-Id: I19454c481061b27197399d63abc466810b9e1ff8
 2013-02-20 16:10:32 -08:00
Scott Main
bedf5b35eb am c1fd3ca5: am ad7b70b6: am 41ae4d7e: am e61116b9: update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688 
* commit 'c1fd3ca5cc876110688ee32675e8cac7c5b5eae6':
  update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688
 2013-02-20 15:38:38 -08:00
Scott Main
c1fd3ca5cc am ad7b70b6: am 41ae4d7e: am e61116b9: update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688 
* commit 'ad7b70b63171e5e6ddd62c37d97437a5123f33bc':
  update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688
 2013-02-20 15:35:48 -08:00
Scott Main
ad7b70b631 am 41ae4d7e: am e61116b9: update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688 
* commit '41ae4d7e04188657054df8ffdc7710d7c829fbc4':
  update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688
 2013-02-20 15:33:36 -08:00
Scott Main
41ae4d7e04 am e61116b9: update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688 
* commit 'e61116b9a1f2d92fbda3d23d35a3742d0661c2be':
  update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688
 2013-02-20 15:30:04 -08:00
Wink Saville
b5a1ce2f5d Merge "Allow three digit phone numbers" 2013-02-20 23:04:32 +00:00
Scott Main
e61116b9a1 update dev console language for new site design. 
Language only; no screenshot changes.
bug: 8032875
bug: 8033647
bug: 8033688

Change-Id: Ia333846e89d025b1edc919a40cb2224b04deb9ab
 2013-02-20 13:30:35 -08:00
Scott Main
1998060f69 am 803a6b0d: am ed7713e1: am e5c4846d: am 9dbb0b35: docs: sanitize input for badge generator bug: 8002240 
* commit '803a6b0da037e6ae6eaf51712cde5545ab140dce':
  docs: sanitize input for badge generator bug: 8002240
 2013-02-19 12:03:42 -08:00
Scott Main
803a6b0da0 am ed7713e1: am e5c4846d: am 9dbb0b35: docs: sanitize input for badge generator bug: 8002240 
* commit 'ed7713e161bdfdaa87278fbd369b3dc3939f12c3':
  docs: sanitize input for badge generator bug: 8002240
 2013-02-19 12:01:22 -08:00
Scott Main
ed7713e161 am e5c4846d: am 9dbb0b35: docs: sanitize input for badge generator bug: 8002240 
* commit 'e5c4846db7f12938836f7bd821076f3dd2e59fc8':
  docs: sanitize input for badge generator bug: 8002240
 2013-02-19 11:58:56 -08:00
Scott Main
e5c4846db7 am 9dbb0b35: docs: sanitize input for badge generator bug: 8002240 
* commit '9dbb0b3597291a8305e0c451521eec9a5be2fb9b':
  docs: sanitize input for badge generator bug: 8002240
 2013-02-19 11:56:54 -08:00
Scott Main
9dbb0b3597 docs: sanitize input for badge generator 
bug: 8002240

Change-Id: Ic1429284fd1953fb6819110ecb47fcb3a79a9600
 2013-02-19 11:51:37 -08:00
Victoria Lease
5782c16d34 am c36303a6: Merge "Applying ChannelScrolling to remove calculateDragAngle" 
* commit 'c36303a66d1cb72f7216dc90ee7239b2b77a9815':
  Applying ChannelScrolling to remove calculateDragAngle
 2013-02-19 10:11:39 -08:00
Victoria Lease
c36303a66d Merge "Applying ChannelScrolling to remove calculateDragAngle" 2013-02-19 17:40:09 +00:00
kiwon
72034953bf Applying ChannelScrolling to remove calculateDragAngle 
To avoid angle calculation changed the logic to use virtual areas.
When try to drag or pan, check where the current touch point locates
and determine how to drag a page.

Change-Id: Id9bd08a69c4ac93ff385c8088e6c16bed5dc5f88
Signed-off-by: kiwon <kiwon98.lee@samsung.com>
 2013-02-18 14:30:58 +09:00
Irfan Sheriff
05913cc979 am c6ea41ef: Merge changes I8c5649c9,I79b43bf7,I83a01690,If5687eac,Ib9fd57c6,I7104250e 
* commit 'c6ea41efc93df12eeef7c59124bee83e8f3f7a41':
  Fix broken test.
  Track keys per config and allow cert push from apps
  eix enterprise config storage bugs
  Fix connectivitymanagertest
  Fix build
  Refactor enterprise config
 2013-02-15 15:55:43 -08:00
Irfan Sheriff
c6ea41efc9 Merge changes I8c5649c9,I79b43bf7,I83a01690,If5687eac,Ib9fd57c6,I7104250e 
* changes:
  Fix broken test.
  Track keys per config and allow cert push from apps
  eix enterprise config storage bugs
  Fix connectivitymanagertest
  Fix build
  Refactor enterprise config
 2013-02-15 23:42:28 +00:00
Wink Saville
1c2acdc6e8 Fix broken test. 
Change-Id: I8c5649c9b3d917cf13b94d49da44eaf510643df6
 2013-02-15 15:20:37 -08:00
Irfan Sheriff
b815edf3ab Track keys per config and allow cert push from apps 
Allow configuring keys for a configuration and update/delete
from wificonfigstore.

Change-Id: I79b43bf7ca58f7efc95f7dcc125fc84d7aa8c795
 2013-02-15 15:19:35 -08:00
Dirk Dougherty
5fce0c1fe3 am e91b0533: am ed0c6fe6: am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights. 
* commit 'e91b053369638f81e725a47a7491853b06aca5ae':
  Doc change: Edits for RTL in highlights.
 2013-02-15 15:11:25 -08:00
Dirk Dougherty
e91b053369 am ed0c6fe6: am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights. 
* commit 'ed0c6fe66ce836431ba999cb79fa0d1441e21997':
  Doc change: Edits for RTL in highlights.
 2013-02-15 15:08:33 -08:00
Dirk Dougherty
ed0c6fe66c am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights. 
* commit '531375f9bdca84a34a0ca5bdba34f44f0b34ed50':
  Doc change: Edits for RTL in highlights.
 2013-02-15 15:06:00 -08:00
Dirk Dougherty
531375f9bd am 34434bad: Doc change: Edits for RTL in highlights. 
* commit '34434badf6ca2fd04c088e2971d33ded39158d22':
  Doc change: Edits for RTL in highlights.
 2013-02-15 15:03:37 -08:00
Dirk Dougherty
34434badf6 Doc change: Edits for RTL in highlights. 
Change-Id: I4a01bbcaa1470dce571295a9e5e035a395c28c1a
 2013-02-15 15:00:43 -08:00
Irfan Sheriff
b07526fb1c eix enterprise config storage bugs 
Reading empty and not updating was resulting in retaining old values
in a config. Also, fix matching phase2 entries.

Additionally, allow configuring subset of enterprise fields. Necessary
since password cannot be read back from supplicant.

Change-Id: I83a01690a0cf7cad1457a674f50f1e3a1a0441b5
 2013-02-15 14:58:15 -08:00
Irfan Sheriff
46e0931080 Fix connectivitymanagertest 
Change-Id: If5687eacec0f502c39b102eb5cf7d9383f0ec056
 2013-02-15 14:55:15 -08:00
Irfan Sheriff
2f6778c038 Fix build 
Change-Id: Ib9fd57c641e3bd2001c7c802f35d97e0cb849b8a
 2013-02-15 14:52:33 -08:00
Irfan Sheriff
c72c5625c6 Refactor enterprise config 
Change-Id: I7104250e80317fce6164385701a7caffbcd14813
 2013-02-15 14:51:19 -08:00
Bin Zhu
a37fc575a4 Allow three digit phone numbers 
The comment for the PHONE pattern says:

"<digit><digit|sdd>+<digit>"

But the actual pattern requires that the string contains
more than that. A phone number should be allowed to be
three digits.

Change-Id: I86d2f3d634cd0c1654dad9814906f151055dc23a
 2013-02-15 11:54:41 +01:00
Kenny Root
dc7b3e3b6e am 9657ba0e: Merge "KeyStore: stop using state()" 
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '9657ba0edc8bab5a36c26bcd94366149aed63331':
  KeyStore: stop using state()
 2013-02-14 12:48:18 -08:00
Kenny Root
9657ba0edc Merge "KeyStore: stop using state()" 2013-02-14 20:18:09 +00:00
Dirk Dougherty
f16de3f3f6 am 0f4a378d: am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch. 
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '0f4a378dc7da59a4fe45c111c09f52696dbb6476':
  Doc change: add notice for iab v3 subscriptions launch.
 2013-02-14 12:09:16 -08:00
Dirk Dougherty
0f4a378dc7 am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch. 
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit 'da9ac596a171ff46a241f52a89015a0090e9ba18':
  Doc change: add notice for iab v3 subscriptions launch.
 2013-02-14 12:07:39 -08:00
Kenny Root
b9594ce9eb KeyStore: stop using state() 
Change-Id: I721974fd95f8d1ab06a3fd1bbb4c9b4d9d1d7752
 2013-02-14 12:06:51 -08:00
Dirk Dougherty
da9ac596a1 am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch. 
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '9a93e079791b7a94ca62a08963ff18951429700e':
  Doc change: add notice for iab v3 subscriptions launch.
 2013-02-14 12:05:49 -08:00
Dirk Dougherty
9a93e07979 am f857c51d: Doc change: add notice for iab v3 subscriptions launch. 
# Via Dirk Dougherty
* commit 'f857c51d77d2199cfb3351e0e1c93a55e8564dc4':
  Doc change: add notice for iab v3 subscriptions launch.
 2013-02-14 12:03:35 -08:00
Dirk Dougherty
f857c51d77 Doc change: add notice for iab v3 subscriptions launch. 
Change-Id: I3b1365cee219ab7fb8ac27cf333609986a947b3c
 2013-02-14 11:47:36 -08:00
quddusc
6b4d73c985 am cdcc2e58: am 68785da7: am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'cdcc2e58e914793ff2ee475e5a4c7fd91a3d526b':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:17:07 -08:00
quddusc
cdcc2e58e9 am 68785da7: am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '68785da7a052c75f73f3857ed97b74c3c03883c0':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:15:33 -08:00
quddusc
68785da7a0 am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '62bd23190bdf559c6297ddcc991d18449c2e9d48':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:14:37 -08:00