10510 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robert Greenwalt	a1fa7cef5d	am 1faefa06: Merge "Fix one NPE in tethering setting" ... * commit '1faefa06a3a742123af8ea5be5bbfb730db16c7c': Fix one NPE in tethering setting	2013-08-15 07:17:11 -07:00
Robert Greenwalt	1faefa06a3	Merge "Fix one NPE in tethering setting"	2013-08-15 14:13:10 +00:00
Jianzheng Zhou	508c7c16ab	Fix one NPE in tethering setting ... Once we not declare BT feature, go Setting->more->tethering will trigger this NPE. Change-Id: I4736e7bade261475acda74e26250a81452018ffa Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>	2013-08-15 14:34:52 +08:00
Baligh Uddin	b4d720f9d7	am 9a53339d: (-s ours) am e211fd11: (-s ours) Import translations. DO NOT MERGE ... * commit '9a53339dd6ea5c683629a5fff8837e7e59581680': Import translations. DO NOT MERGE	2013-08-06 20:05:46 -07:00
Baligh Uddin	9a53339dd6	am e211fd11: (-s ours) Import translations. DO NOT MERGE ... * commit 'e211fd11c65c7db4e0225c774519604efa98889c': Import translations. DO NOT MERGE	2013-08-06 20:04:13 -07:00
Baligh Uddin	e211fd11c6	Import translations. DO NOT MERGE ... Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f Auto-generated-cl: translation import	2013-08-06 19:55:54 -07:00
Dianne Hackborn	9a4f4656d7	am a5ac281d: am 40557800: Fix issue #10190597: "Any permission restrictions" is displayed after a... ... * commit 'a5ac281db7103aef790a6141cd72fdbc22835552': Fix issue #10190597: "Any permission restrictions" is displayed after a...	2013-08-05 16:49:02 -07:00
Dianne Hackborn	a5ac281db7	am 40557800: Fix issue #10190597: "Any permission restrictions" is displayed after a... ... * commit '405578009471ab7908af26a813f7d2ef8c072a5c': Fix issue #10190597: "Any permission restrictions" is displayed after a...	2013-08-05 16:45:48 -07:00
Dianne Hackborn	4055780094	Fix issue #10190597: "Any permission restrictions" is displayed after a... ... ...newline in "Reset app preferences" dialog Change-Id: I3125155d992af0654175659294bfb2fb325ccb57	2013-08-05 16:23:58 -07:00
Dianne Hackborn	fc222b8d3a	am 8f00b771: Merge "Fix app ops details not displaying permissions under certain conditions." ... * commit '8f00b7711c48a102a70f9b7e6a563aa14b79f5a5': Fix app ops details not displaying permissions under certain conditions.	2013-08-05 11:15:43 -07:00
Dianne Hackborn	8f00b7711c	Merge "Fix app ops details not displaying permissions under certain conditions."	2013-08-05 18:11:11 +00:00
Danny Baumann	67e72d9e8a	Fix app ops details not displaying permissions under certain conditions. ... If there's a permission that is not granted, the loop is aborted instead of just skipping said permission. Change-Id: Icca567ebdd818f40ad6619f258c77590074d1deb	2013-08-05 14:30:33 +02:00
Dianne Hackborn	ad38b60b37	am 0a09b13c: am a6683e0f: Reset app preferences now resets all app ops. ... * commit '0a09b13c81bb0ebe556e46e3859a25805b2cbdcf': Reset app preferences now resets all app ops.	2013-08-02 19:32:14 -07:00
Dianne Hackborn	0a09b13c81	am a6683e0f: Reset app preferences now resets all app ops. ... * commit 'a6683e0f4af75005ab5a1742d30df4bee071f725': Reset app preferences now resets all app ops.	2013-08-02 19:30:09 -07:00
Dianne Hackborn	a6683e0f4a	Reset app preferences now resets all app ops. ... Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11	2013-08-02 19:20:48 -07:00
Jean-Baptiste Queru	a43e270164	am 4dce3456: am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge ... * commit '4dce3456c7c858d5cec053cfd8a7f8ff2babec1d': Completely remove app ops activity.	2013-08-02 17:44:48 -07:00
Jean-Baptiste Queru	4dce3456c7	am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge ... * commit '034b83e8668a0b26d1eccfc9fa433b8eae3e50a8': Completely remove app ops activity.	2013-08-02 17:39:03 -07:00
Jean-Baptiste Queru	034b83e866	Reconcile with AOSP jb-mr2-dev - do not merge	2013-08-02 14:48:27 -07:00
Dianne Hackborn	67c0500290	Completely remove app ops activity. ... Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a	2013-08-02 14:45:05 -07:00
Dianne Hackborn	45d4dce29e	am ca1b7458: Completely remove app ops activity. ... * commit 'ca1b7458244191214172009d21eae2d04b6992f9': Completely remove app ops activity.	2013-08-02 14:41:18 -07:00
Dianne Hackborn	ca1b745824	Completely remove app ops activity. ... Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a	2013-08-02 14:35:10 -07:00
Dave Burke	0b849a704b	am 1a32d477: am 136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev ... * commit '1a32d477934399ca5331863fe17651c1dbf165b8': Revert "Completely remove app ops activity."	2013-08-02 13:42:04 -07:00
Dave Burke	1a32d47793	am 136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev ... * commit '136059f118b580a3dc8f3023d1d19c8c56020a01': Revert "Completely remove app ops activity."	2013-08-02 13:39:13 -07:00
Dave Burke	136059f118	Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev	2013-08-02 20:36:33 +00:00
Dave Burke	db2c568894	Revert "Completely remove app ops activity." ... This reverts commit 1ad26e9c37. Change-Id: I58b5ea280ed0dbff00f7f6f98fbd41575cdd5222	2013-08-02 20:25:35 +00:00
Sascha Prueter	99d5938cf2	am df195650: am d346fce2: Merge "Completely remove app ops activity." into jb-mr2-dev ... * commit 'df195650191ba2d5a6090ff0721242b044b9b010': Completely remove app ops activity.	2013-08-01 14:01:13 -07:00
Sascha Prueter	df19565019	am d346fce2: Merge "Completely remove app ops activity." into jb-mr2-dev ... * commit 'd346fce2687237d30677b69e66c76ba6cba8622b': Completely remove app ops activity.	2013-08-01 13:58:23 -07:00
Sascha Prueter	d346fce268	Merge "Completely remove app ops activity." into jb-mr2-dev	2013-08-01 20:55:38 +00:00
Baligh Uddin	781458b374	am bdf28a18: (-s ours) am 0cb57011: (-s ours) Import translations. DO NOT MERGE ... * commit 'bdf28a1892e0116a8d6774d9c9d47033eb354368': Import translations. DO NOT MERGE	2013-07-30 09:19:30 -07:00
Baligh Uddin	bdf28a1892	am 0cb57011: (-s ours) Import translations. DO NOT MERGE ... * commit '0cb57011065dd06e5faba2f4d72bbb1d31a3c309': Import translations. DO NOT MERGE	2013-07-30 09:15:32 -07:00
Baligh Uddin	539552e17c	am 3ddbe519: (-s ours) Import translations. DO NOT MERGE ... * commit '3ddbe519f44292e33292a9aea08a5894456a3118': Import translations. DO NOT MERGE	2013-07-30 09:12:51 -07:00
Robert Greenwalt	5b7bf112f5	am 35a2d796: Merge "Fix "Add Network" show last selected WiFi AP Dialog" ... * commit '35a2d796e3afbd7c2572c16f5c8655d89078198b': Fix "Add Network" show last selected WiFi AP Dialog	2013-07-29 16:50:30 -07:00
Robert Greenwalt	35a2d796e3	Merge "Fix "Add Network" show last selected WiFi AP Dialog"	2013-07-29 23:43:33 +00:00
Baligh Uddin	3ddbe519f4	Import translations. DO NOT MERGE ... Change-Id: I0ca4e8fc4396ac28c5c6d7857a988a6191e36f2c Auto-generated-cl: translation import	2013-07-29 10:54:51 -07:00
Baligh Uddin	0cb5701106	Import translations. DO NOT MERGE ... Change-Id: I5ab9317a61cf7adb7c911ac19770e9ae7d4f935b Auto-generated-cl: translation import	2013-07-29 10:53:05 -07:00
Birdson_Chen	2dcf6083f7	Fix "Add Network" show last selected WiFi AP Dialog ... When user taps Wi-Fi add network button, the pop-up dialog is not empty (it shows last selected WiFi AP Dialog). The above is observed after the following steps: - Launch Settings application - Turn on Wi-Fi - Select any Wi-Fi Access Point which is not connected previously and change to portrait mode - Press Cancel from the pop-up and select Add Network icon in menu Because the "Rotation" operation will cause WifiDialog re-creating and the current settings of selected Wi-Fi Access Point is saved before WifiDialog destroyed. Then, the saved Wi-Fi Access Point is displayed when user tap on "Add Network". It need to clear the saved Wi-Fi Access Point when WifiDialog re-creating. Change-Id: I3e93943e5bee405329e309c3ec88a35ee9cafc43	2013-07-29 10:37:36 +08:00
Baligh Uddin	1d690c8a09	am 92ce2809: am 542960fb: Import translations. DO NOT MERGE ... * commit '92ce280985b206acfbfef896db745bc4464a4632': Import translations. DO NOT MERGE	2013-07-24 19:57:34 -07:00
Baligh Uddin	110a58ff5d	am 693abd31: Import translations. DO NOT MERGE ... * commit '693abd31368cd61266c6d055fbd6ead257eb12cd': Import translations. DO NOT MERGE	2013-07-24 19:54:17 -07:00
Baligh Uddin	92ce280985	am 542960fb: Import translations. DO NOT MERGE ... * commit '542960fbbb0c122d7f3a75fd2d5c4710118417ee': Import translations. DO NOT MERGE	2013-07-24 19:53:29 -07:00
Baligh Uddin	693abd3136	Import translations. DO NOT MERGE ... Change-Id: I8dd4886617b33c56d57ef050c560a91748b68113 Auto-generated-cl: translation import	2013-07-24 12:15:51 -07:00
Baligh Uddin	542960fbbb	Import translations. DO NOT MERGE ... Change-Id: Iddc12747b1f57abb0a10f452b551332e86d2ba3c Auto-generated-cl: translation import	2013-07-24 12:14:17 -07:00
Baligh Uddin	82c5153577	am 0d8bde94: am 6b939fe2: Import translations. DO NOT MERGE ... * commit '0d8bde94110681d3cc7288613c7e1204f436736c': Import translations. DO NOT MERGE	2013-07-23 10:02:05 -07:00
Baligh Uddin	7d77f1ac9e	am dd00b6b0: Import translations. DO NOT MERGE ... * commit 'dd00b6b013dbacadb9db552b74551c452c8981c7': Import translations. DO NOT MERGE	2013-07-23 10:02:05 -07:00
Baligh Uddin	0d8bde9411	am 6b939fe2: Import translations. DO NOT MERGE ... * commit '6b939fe2c8994acc3e304ec24639d07877a4b255': Import translations. DO NOT MERGE	2013-07-23 10:00:14 -07:00
Baligh Uddin	dd00b6b013	Import translations. DO NOT MERGE ... Change-Id: I8c68608b9494ea120e4620cfa3c0027298c0082a Auto-generated-cl: translation import	2013-07-22 11:10:07 -07:00
Baligh Uddin	6b939fe2c8	Import translations. DO NOT MERGE ... Change-Id: I2f0dc917cd2d67b4478f74d0e2dccec53eb9f921 Auto-generated-cl: translation import	2013-07-22 11:08:10 -07:00
Baligh Uddin	50212d6c55	am a4a2194a: am 68b87505: Import translations. DO NOT MERGE ... * commit 'a4a2194a2f4beb9f29a96249e4b3b2a4f9e80c96': Import translations. DO NOT MERGE	2013-07-19 15:18:54 -07:00
Baligh Uddin	a4a2194a2f	am 68b87505: Import translations. DO NOT MERGE ... * commit '68b87505548be6e6734d4cfe90c450b243950455': Import translations. DO NOT MERGE	2013-07-19 15:16:17 -07:00
Baligh Uddin	8d9e3eb05f	am 8180a3a8: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev ... * commit '8180a3a86a36a7b9ed463f2f162e82ac06a9f1c4': Import translations. DO NOT MERGE	2013-07-19 15:15:36 -07:00
Baligh Uddin	8180a3a86a	Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev	2013-07-19 22:14:12 +00:00